Update nixpkgs 2025-12-10-02-03

configuration/common/programs.nix

@@ -7,9 +7,6 @@
     gptfdisk
     parted
     grow-last-partition-and-filesystem
-    pciutils
-    lshw
-    ethtool
 
     # Normal usage
     htop

flake.lock

@@ -650,11 +650,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1765472234,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "lastModified": 1765186076,
+        "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
         "type": "github"
       },
       "original": {

hosts/carbon/ds-lite-ncfttb.nix

@@ -8,7 +8,7 @@
     tunnelInterfaceName = "ds-lite-ncfttb";
     lanInterfaces = [
       {
-        name = "enp2s0";
+        name = "net-heimnetz";
         sla_id = 201;
         prefix_len = 64;
       }

hosts/carbon/net-dsl.nix

@@ -3,9 +3,17 @@
 {
 
   ## DSL-Uplink
+  networking.vlans."enp1s0.10" = {
+    id = 10;
+    interface = "enp1s0";
+  };
   networking.vlans."enp3s0.10" = {
     id = 10;
     interface = "enp3s0";
   };
+  networking.bridges."net-dsl".interfaces = [
+    "enp1s0.10"
+    "enp3s0.10"
+  ];
 
 }

hosts/carbon/net-heimnetz.nix

@@ -3,16 +3,24 @@
 {
 
   ## Heimnetz
-  networking.interfaces."enp2s0".ipv6.addresses = [
+  networking.vlans."enp1s0.201" = {
+    id = 201;
+    interface = "enp1s0";
+  };
+  networking.bridges."net-heimnetz".interfaces = [
+    "enp1s0.201"
+    "enp2s0"
+  ];
+  networking.interfaces."net-heimnetz".ipv6.addresses = [
     { address = "fe80::1"; prefixLength = 64; }
     { address = "fd00:152:152:4::1"; prefixLength = 64; }
   ];
-  networking.interfaces."enp2s0".ipv4.addresses = [
+  networking.interfaces."net-heimnetz".ipv4.addresses = [
     { address = "10.152.4.1"; prefixLength = 24; }
   ];
 
   services.radvd.config = ''
-    interface enp2s0 {
+    interface net-heimnetz {
       AdvSendAdvert on;
       MaxRtrAdvInterval 30;
       prefix ::/64 {
@@ -27,7 +35,7 @@
   services.kea.dhcp4 = {
     settings = {
       interfaces-config = {
-        interfaces = [ "enp2s0" ];
+        interfaces = [ "net-heimnetz" ];
       };
       subnet4 = [
         # Heimnetz

hosts/carbon/ppp-ncfttb.nix

@@ -6,7 +6,7 @@
     enable = true;
     peers.ncfttb = {
       config = ''
-        plugin pppoe.so enp3s0.10
+        plugin pppoe.so net-dsl
         user "''${PPPD_NETCOLOGNE_USERNAME}"
         ifname ppp-ncfttb
         persist

hosts/krypton/configuration.nix

@@ -13,10 +13,6 @@
     ];
 
   profiles.clerie.desktop.enable = true;
-  profiles.clerie.desktop.users = [
-    "clerie"
-  ];
-
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;

profiles/desktop/default.nix

@@ -6,11 +6,6 @@ with lib;
 
   options.profiles.clerie.desktop = {
     enable = mkEnableOption "clerie Desktop Config";
-    users = mkOption {
-      type = with types; listOf str;
-      default = [];
-      description = "Names of users that are considered desktop users and therefore get special permissions";
-    };
   };
 
   imports = [

profiles/desktop/networking.nix

@@ -2,13 +2,9 @@
 
 with lib;
 
-let
+{
 
-  cfg = config.profiles.clerie.desktop;
-
-in {
-
-  config = mkIf cfg.enable {
+  config = mkIf config.profiles.clerie.desktop.enable {
 
     networking.networkmanager.settings = {
       connectivity = {
@@ -19,8 +15,6 @@ in {
       };
     };
 
-    users.groups.networkmanager.members = cfg.users;
-
   };
 
 }