updates: nixpkgs, home-manager, plasma-manager, nixos-generators

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740432748,
-        "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
+        "lastModified": 1742957044,
+        "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
+        "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737057290,
-        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+        "lastModified": 1742568034,
+        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740367490,
-        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+        "lastModified": 1742669843,
+        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739557722,
-        "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=",
+        "lastModified": 1742765550,
+        "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522",
+        "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -54,8 +54,8 @@ in
     };
     # alias for nix shell with flake packages
     functions.add.body = ''
-      set -x packages 'nixpkgs#'(string join ' nixpkgs#' $argv)
-      nix shell $packages --command fish
+      set -x packages 'nixpkgs#'$argv
+      nix shell $packages
     '';
     interactiveShellInit = ''
       fastfetch

hosts/Yura-PC/default.nix

@@ -209,13 +209,35 @@
   # fonts.fontconfig.allowBitmaps = false;
   
   environment.systemPackages = with pkgs; [
-    darkman
     dust
-    efibootmgr
     eza
     fastfetch
     fd
+    helix
+    micro
+    ripgrep
+    starship
+    tealdeer
+  ] ++ [
+    efibootmgr
     ffmpeg
+    file
+    fq
+    gnumake
+    ijq
+    jq
+    ldns
+    mediainfo
+    rbw
+    restic
+    resticprofile
+    rclone
+    ripgrep-all
+    rustscan
+    whois
+    yt-dlp
+  ] ++ [
+    darkman
     host-spawn # for flatpaks
     kdePackages.filelight
     kdePackages.flatpak-kcm
@@ -223,8 +245,14 @@
     kdePackages.yakuake
     gcr
     gnome-keyring # config for this and some others
-    gnumake
-    helix
+    mpv
+    nextcloud-client
+    lxqt.pavucontrol-qt
+    pinentry
+    tela-circle-icon-theme
+    virt-viewer
+    waypipe
+  ] ++ [
     # jetbrains.rust-rover
     # jetbrains.goland
     jetbrains.clion
@@ -232,22 +260,7 @@
     jetbrains.pycharm-professional
     jetbrains.webstorm
     android-studio
-    mediainfo
-    micro
-    mpv
-    nextcloud-client
-    lxqt.pavucontrol-qt
-    pinentry
-    rbw
-    ripgrep
     rustup
-    starship
-    tealdeer
-    tela-circle-icon-theme
-    virt-viewer
-    waypipe
-    whois
-    yt-dlp
   ];
 
   # Some programs need SUID wrappers, can be configured further or are

hosts/router/default.nix

@@ -3,12 +3,8 @@ let
   domain = "cazzzer.com";
   ldomain = "l.${domain}";
   sysdomain = "sys.${domain}";
-  links = {
-    wanMAC = "bc:24:11:4f:c9:c4";
-    lanMAC = "bc:24:11:83:d8:de";
-    wanLL = "fe80::be24:11ff:fe4f:c9c4";
-    lanLL = "fe80::be24:11ff:fe83:d8de";
-  };
+
+  lanLL = "fe80::be24:11ff:fe83:d8de";
 
   mkIfConfig = {
     name_,
@@ -17,8 +13,6 @@ let
     p6_,  # /64
     ulaPrefix_,  # /64
     token? 1,
-    ip6Token_? "::${toString token}",
-    ulaToken_? "::${toString token}",
     }: rec {
       name = name_;
       domain = domain_;
@@ -30,14 +24,13 @@ let
       p6 = p6_;
       p6Size = 64;
       net6 = "${p6}::/${toString p6Size}";
-      ip6Token = ip6Token_;
+      ip6Token = "::${toString token}";
       addr6 = "${p6}${ip6Token}";
       addr6Sized = "${addr6}/${toString p6Size}";
       ulaPrefix = ulaPrefix_;
       ulaSize = 64;
       ulaNet = "${ulaPrefix}::/${toString ulaSize}";
-      ulaToken = ulaToken_;
-      ulaAddr = "${ulaPrefix}${ulaToken}";
+      ulaAddr = "${ulaPrefix}${ip6Token}";
       ulaAddrSized = "${ulaAddr}/${toString ulaSize}";
     };
 
@@ -50,7 +43,6 @@ let
       addr4 = "192.168.1.61";
       addr4Sized = "${addr4}/24";
       gw4 = "192.168.1.254";
-      gw6 = "fe80::e21f:2bff:fe96:e952";
     };
     lan = mkIfConfig {
       name_ = "lan";
@@ -70,9 +62,8 @@ let
       name_ = "${lan.name}.20";
       domain_ = "life.${ldomain}";
       p4_ = "${p4}.20";                  # .0/24
-      p6_ = "${pdFromWan}0";             # ::/64 managed by Att box
+      p6_ = "";                          # p6 not defined for lan20, managed by Att box
       ulaPrefix_ = "${ulaPrefix}:0020";  # ::/64
-      ip6Token_ = "::1:1";  # override ipv6 for lan20, since the Att box uses ::1 here
     };
     lan30 = mkIfConfig {
       name_ = "${lan.name}.30";
@@ -231,28 +222,25 @@ let
     matchConfig.Name = ifObj.name;
     networkConfig = {
       IPv4Forwarding = true;
-      IPv6SendRA = (ifObj.name != ifs.lan10.name);  # TODO: temporary test, remove
-      Address = [ ifObj.addr4Sized ifObj.addr6Sized ifObj.ulaAddrSized ];
+      IPv6SendRA = true;
+      Address = [ ifObj.addr4Sized ];
     };
-    ipv6Prefixes = [
-      {
+    ipv6Prefixes = lib.optionals (ifObj.p6 != "") [ {
         Prefix = ifObj.net6;
         Assign = true;
         # Token = [ "static::1" "eui64" ];
         Token = [ "static:${ifObj.ip6Token}" ];
-      }
-      {
+      } ]
+      ++
+      lib.optionals (ifObj.ulaPrefix != "") [ {
           Prefix = ifObj.ulaNet;
           Assign = true;
-          Token = [ "static:${ifObj.ulaToken}" ];
-      }
-    ];
+          Token = [ "static:${ifObj.ip6Token}" ];
+      } ];
     ipv6RoutePrefixes = [ { Route = "${ulaPrefix}::/48"; } ];
     ipv6SendRAConfig = {
-      # don't manage the att box subnet
-      # should work fine either way though
-      Managed = (ifObj.p6 != "${pdFromWan}0");
-      OtherInformation = (ifObj.p6 != "${pdFromWan}0");
+      Managed = (ifObj.p6 != "");
+      OtherInformation = (ifObj.p6 != "");
       EmitDNS = true;
       DNS = [ ifObj.ulaAddr ];
     };
@@ -323,10 +311,6 @@ in
     interface ${ifs.wan.name}
       ipv6rs
       dhcp6
-      duid
-      ipv6only
-      nohook resolv.conf, yp, hostname, ntp
-      option rapid_commit
 
       # this doesn't play well with networkd
       # ia_na
@@ -336,12 +320,12 @@ in
 
       # request the leases just for routing (so that the att box knows we're here)
       # actual ip assignments are static, based on $pdFromWan
-      ia_pd 1/${ifs.lan.net6} -
-      ia_pd 10/${ifs.lan10.net6} -
-      # ia_pd 20/${pdFromWan}d::/64 -  # for opnsense (legacy services)
-      ia_pd 30/${ifs.lan30.net6} -
-      ia_pd 40/${ifs.lan40.net6} -
-      ia_pd 50/${ifs.lan50.net6} -
+      ia_pd 1 -
+      ia_pd 2 -
+      ia_pd 3 -
+      ia_pd 4 -
+      ia_pd 5 -
+      # ia_pd 6 -
       # ia_pd 7 -
       # ia_pd 8 -
   '';
@@ -360,17 +344,17 @@ in
     # https://nixos.org/manual/nixos/stable/#sec-rename-ifs
     links = {
       "10-wan" = {
-        matchConfig.PermanentMACAddress = links.wanMAC;
+        matchConfig.PermanentMACAddress = "bc:24:11:4f:c9:c4";
         linkConfig.Name = ifs.wan.name;
       };
       "10-lan" = {
-        matchConfig.PermanentMACAddress = links.lanMAC;
+        matchConfig.PermanentMACAddress = "bc:24:11:83:d8:de";
         linkConfig.Name = ifs.lan.name;
       };
     };
 
     netdevs = {
-      # "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
+      "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
       "10-vlan20" = mkVlanDev { id = 20; name = ifs.lan20.name; };
       "10-vlan30" = mkVlanDev { id = 30; name = ifs.lan30.name; };
       "10-vlan40" = mkVlanDev { id = 40; name = ifs.lan40.name; };
@@ -388,78 +372,27 @@ in
           Address = [ ifs.wan.addr4Sized ];
           IPv6AcceptRA = false;
         };
-        routes = [
-          { Gateway = ifs.wan.gw4; }
-          { Gateway = ifs.wan.gw6; }
-        ];
+        routes = [ { Gateway = ifs.wan.gw4; } ];
         # make routing on this interface a dependency for network-online.target
         linkConfig.RequiredForOnline = "routable";
       };
       "20-lan" = (mkLanConfig ifs.lan) // {
         vlan = [
-          # ifs.lan10.name
+          ifs.lan10.name
           ifs.lan20.name
           ifs.lan30.name
           ifs.lan40.name
           ifs.lan50.name
         ];
       };
-      # "30-vlan10" = mkLanConfig ifs.lan10;
-      "30-vlan20" = mkLanConfig ifs.lan20 // {
-        routes = [
-          {
-            # OPNsense subnet route
-            Destination = "${pdFromWan}d::/64";
-            Gateway = "fe80::1efd:8ff:fe71:954e";
-          }
-        ];
-      };
+      "30-vlan10" = mkLanConfig ifs.lan10;
+      "30-vlan20" = mkLanConfig ifs.lan20;
       "30-vlan30" = mkLanConfig ifs.lan30;
       "30-vlan40" = mkLanConfig ifs.lan40;
       "30-vlan50" = mkLanConfig ifs.lan50;
     };
   };
 
-  networking.interfaces = {
-#    ${ifs.lan10.name} = {
-#      ipv4.addresses = [ { address = ifs.lan10.addr4; prefixLength = ifs.lan10.p4Size; } ];
-#      ipv6.addresses = [
-#        {
-#          address = ifs.lan10.addr6;
-#          prefixLength = ifs.lan10.p6Size;
-#        }
-#        {
-#          address = ifs.lan10.ulaAddr;
-#          prefixLength = ifs.lan10.ulaSize;
-#        }
-#      ];
-#    };
-  };
-  networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
-
-  services.radvd.enable = false;
-  services.radvd.config = ''
-    interface ${ifs.lan10.name} {
-      RDNSS ${ifs.lan.ulaAddr} {
-      };
-      AdvSendAdvert on;
-      # MinRtrAdvInterval 3;
-      # MaxRtrAdvInterval 10;
-      AdvManagedFlag on;
-      # AdvOtherConfigFlag on;
-      prefix ${ifs.lan10.net6} {
-        AdvOnLink on;
-        AdvAutonomous on;
-      };
-      prefix ${ifs.lan10.ulaNet} {
-        AdvOnLink on;
-        AdvAutonomous on;
-      };
-      route ${ulaPrefix}::/48 {
-      };
-    };
-  '';
-
   networking.firewall.enable = false;
   networking.nftables.enable = true;
   networking.nftables.tables.firewall = {
@@ -474,11 +407,10 @@ in
           ${ifs.lan40.name},
           ${ifs.lan50.name},
       }
-      define OPNSENSE_P6 = ${pdFromWan}d::/64
       define RFC1918 = { 10.0.0.0/8, 172.12.0.0/12, 192.168.0.0/16 }
 
       define ALLOWED_TCP_PORTS = { ssh, https }
-      define ALLOWED_UDP_PORTS = { bootps, dhcpv6-server, domain }
+      define ALLOWED_UDP_PORTS = { domain }
 
       map port_forward_v4 {
           type inet_proto . inet_service : ipv4_addr . inet_service
@@ -489,8 +421,7 @@ in
       set port_forward_v6 {
           type inet_proto . ipv6_addr . inet_service
           elements = {
-              tcp . ${ifs.lan.p6}::11:1 . https,
-              tcp . ${ifs.lan.p6}:1cd5:56ff:feec:c74a . https,
+              tcp . ${ifs.lan.p6}::1 . https
           }
       }
 
@@ -500,9 +431,7 @@ in
           # Drop router adverts from self
           # peculiarity due to wan and lan20 being bridged
           # TODO: figure out a less jank way to do this
-          iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} icmpv6 type nd-router-advert log drop
-          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} log drop
-          # iifname $ZONE_LAN_IFS ip6 saddr ${links.wanLL} log drop
+          ip6 saddr ${lanLL} icmpv6 type nd-router-advert drop
 
           # Allow established and related connections
           # All icmp stuff should (theoretically) be handled by ct related
@@ -511,24 +440,20 @@ in
 
           # However, that doesn't happen for router advertisements from what I can tell
           # TODO: more testing
-          # Allow ICMPv6 on local addrs
-          ip6 nexthdr icmpv6 ip6 saddr { fe80::/10, ${pdFromWan}0::/60 } accept
+          # Allow ICMPv6 on link local addrs
+          ip6 nexthdr icmpv6 ip6 saddr fe80::/10 accept
           ip6 nexthdr icmpv6 ip6 daddr fe80::/10 accept # TODO: not sure if necessary
 
           # Allow all traffic from loopback interface
           iif lo accept
 
           # Allow DHCPv6 client traffic
-          ip6 daddr { fe80::/10, ff02::/16 } th dport dhcpv6-server accept
+          ip6 daddr { fe80::/10, ff02::/16 } udp dport dhcpv6-server accept
 
           # WAN zone input rules
           iifname $ZONE_WAN_IFS jump zone_wan_input
           # LAN zone input rules
-          iifname $ZONE_LAN_IFS accept
           iifname $ZONE_LAN_IFS jump zone_lan_input
-          ip6 saddr $OPNSENSE_P6 jump zone_lan_input
-
-          log
       }
 
       chain forward {
@@ -541,7 +466,6 @@ in
           iifname $ZONE_WAN_IFS jump zone_wan_forward
           # LAN zone forward rules
           iifname $ZONE_LAN_IFS jump zone_lan_forward
-          ip6 saddr $OPNSENSE_P6 jump zone_lan_forward
       }
 
       chain zone_wan_input {
@@ -613,7 +537,7 @@ in
   services.kea.dhcp4.settings = {
     interfaces-config.interfaces = [
       ifs.lan.name
-      # ifs.lan10.name
+      ifs.lan10.name
       ifs.lan20.name
       ifs.lan30.name
       ifs.lan40.name
@@ -623,7 +547,7 @@ in
     ddns-qualifying-suffix = "4.default.${ldomain}";
     subnet4 = [
       ((mkDhcp4Subnet 1 ifs.lan) // reservations.lan.v4)
-      # (mkDhcp4Subnet 10 ifs.lan10)
+      (mkDhcp4Subnet 10 ifs.lan10)
       ((mkDhcp4Subnet 20 ifs.lan20) // reservations.lan20.v4)
       (mkDhcp4Subnet 30 ifs.lan30)
       (mkDhcp4Subnet 40 ifs.lan40)
@@ -635,7 +559,7 @@ in
   services.kea.dhcp6.settings = {
     interfaces-config.interfaces = [
       ifs.lan.name
-      # ifs.lan10.name
+      ifs.lan10.name
       # ifs.lan20.name  # Managed by Att box
       ifs.lan30.name
       ifs.lan40.name
@@ -646,7 +570,7 @@ in
     ddns-qualifying-suffix = "6.default.${ldomain}";
     subnet6 = [
       ((mkDhcp6Subnet 1 ifs.lan) // reservations.lan.v6)
-      # (mkDhcp6Subnet 10 ifs.lan10)
+      (mkDhcp6Subnet 10 ifs.lan10)
       (mkDhcp6Subnet 30 ifs.lan30)
       (mkDhcp6Subnet 40 ifs.lan40)
       (mkDhcp6Subnet 50 ifs.lan50)
@@ -694,7 +618,7 @@ in
       "@@||googleads.g.doubleclick.net"
     ]
       # Alpina DNS rewrites
-      ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p6}:1cd5:56ff:feec:c74a") alpinaDomains
+      ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p6}::11:1") alpinaDomains
       ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p4}.11") alpinaDomains;
   };