WIP: router: wireguard: move wg0 to vars.ifs, streamline some things

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749178927,
+        "lastModified": 1748529677,
-        "narHash": "sha256-bXcEx1aZUNm5hMLVJeuofcOrZyOiapzvQ7K36HYK3YQ=",
+        "narHash": "sha256-MJEX3Skt5EAIs/aGHD8/aXXZPcceMMHheyIGSjvxZN0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "91287a0e9d42570754487b7e38c6697e15a9aab2",
+        "rev": "da282034f4d30e787b8a10722431e8b650a907ef",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748929857,
+        "lastModified": 1748370509,
-        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
+        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
+        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -27,8 +27,6 @@
   outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }:
   let
     hmModule = file: {
-      imports = [ home-manager.nixosModules.home-manager ];
-
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
@@ -51,6 +49,7 @@
           ./hosts/Yura-PC
           ./users/cazzzer
           # https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
+          home-manager.nixosModules.home-manager
           (hmModule ./home/cazzzer-pc.nix)
         ];
       };
@@ -63,6 +62,7 @@
           ./hosts/Yura-TPX13
           ./users/cazzzer
           # https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
+          home-manager.nixosModules.home-manager
           (hmModule ./home/cazzzer-laptop.nix)
         ];
       };
@@ -74,7 +74,6 @@
           ./hosts/hw-vm.nix
           ./hosts/vm
           ./users/cazzzer
-          (hmModule ./home/cazzzer-pc.nix)
         ];
       };
       router = nixpkgs.lib.nixosSystem {
@@ -85,7 +84,6 @@
           ./hosts/common.nix
           ./hosts/router
           ./users/cazzzer
-          (hmModule ./home/common.nix)
         ];
       };
     };
@@ -99,7 +97,6 @@
           ./hosts/hw-proxmox.nix
           ./hosts/vm
           ./users/cazzzer
-          (hmModule ./home/cazzzer-pc.nix)
         ];
         format = "proxmox";
       };
@@ -112,7 +109,6 @@
             ./hosts/hw-proxmox.nix
             ./hosts/vm
             ./users/cazzzer
-            (hmModule ./home/cazzzer-pc.nix)
           ];
         };
       in

home/cazzzer-laptop.nix

@@ -2,8 +2,7 @@
 
 {
   imports = [
-    ./common.nix
+    ./modules
-    ./common-desktop.nix
   ];
 
   programs.plasma = {

home/cazzzer-pc.nix

@@ -2,8 +2,7 @@
 
 {
   imports = [
-    ./common.nix
+    ./modules
-    ./common-desktop.nix
   ];
 
   programs.plasma.kwin.virtualDesktops.number = 2;

home/common-desktop.nix

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  imports = [
-    ./modules/starship.nix
-    ./modules/plasma.nix
-  ];
-
-  services.darkman = {
-    enable = true;
-    settings = {
-      lat = 37.3387;
-      lng = -121.8853;
-    };
-    lightModeScripts = {
-      plasma-color = "plasma-apply-colorscheme BreezeLight";
-    };
-    darkModeScripts = {
-      plasma-color = "plasma-apply-colorscheme BreezeDark";
-    };
-  };
-}

home/common.nix

@@ -1,32 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  username = "cazzzer";
-in
-{
-  imports = [
-    ./modules/fish.nix
-    ./modules/git.nix
-  ];
-
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  home.sessionVariables = {
-    EDITOR = "micro";
-    SHELL = "fish";
-  };
-
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.11"; # Please read the comment before changing.
-}

home/modules/default.nix

@@ -0,0 +1,83 @@
+{ config, lib, pkgs, ... }:
+let
+  username = "cazzzer";
+in
+{
+  imports = [
+    ./fish.nix
+    ./starship.nix
+    ./plasma.nix
+  ];
+
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+
+  home.sessionVariables = {
+    EDITOR = "micro";
+    SHELL = "fish";
+  };
+
+  services.darkman = {
+    enable = true;
+    settings = {
+      lat = 37.3387;
+      lng = -121.8853;
+    };
+    lightModeScripts = {
+      plasma-color = "plasma-apply-colorscheme BreezeLight";
+    };
+    darkModeScripts = {
+      plasma-color = "plasma-apply-colorscheme BreezeDark";
+    };
+  };
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "24.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  # home.packages = [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    # pkgs.hello
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  # ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  # home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  # };
+}

home/modules/git.nix

@@ -1,64 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  name = "Yuri Tatishchev";
-  email = "itatishch@gmail.com";
-  signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE02AhJIZtrtZ+5sZhna39LUUCEojQzmz2BDWguT9ZHG";
-in
-{
-  programs.git = {
-    enable = true;
-
-    userName = name;
-    userEmail = email;
-
-    signing = {
-      key = signingKey;
-      signByDefault = true;
-      format = "ssh";
-    };
-
-    aliases = {
-      co = "checkout";
-      s = "switch";
-    };
-
-    extraConfig = {
-      url = {
-        "https://gitea.cazzzer.com/" = {
-          insteadOf = "caztea:";
-        };
-        "https://github.com/" = {
-          insteadOf = "github:";
-        };
-      };
-
-      core = {
-        autocrlf = "input";
-        editor = "micro";
-      };
-
-      color = {
-        ui = true;
-      };
-
-      pull = {
-        ff = "only";
-      };
-
-      filter.lfs = {
-        clean = "git-lfs clean -- %f";
-        smudge = "git-lfs smudge -- %f";
-        process = "git-lfs filter-process";
-        required = true;
-      };
-
-      credential = {
-        helper = "libsecret";
-      };
-
-      merge = {
-        conflictStyle = "zdiff3";
-      };
-    };
-  };
-}

hosts/common-desktop.nix

@@ -114,7 +114,6 @@
     ripgrep-all
     rustscan
     whois
-    wireguard-tools
     yt-dlp
   ] ++ [
     bitwarden-desktop

hosts/router/default.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   vars = import ./vars.nix;
-  enableDesktop = true;
+  enableDesktop = false;
 in
 {
   imports =
@@ -39,11 +39,9 @@ in
   # Enable the KDE Plasma Desktop Environment.
   # Useful for debugging with wireshark.
   hardware.graphics.enable = true;
-  services.xserver.desktopManager.xfce.enable = enableDesktop;
+  services.displayManager.sddm.enable = enableDesktop;
-  services.xserver.desktopManager.xfce.enableWaylandSession = enableDesktop;
+  services.displayManager.sddm.wayland.enable = enableDesktop;
-  # services.displayManager.sddm.enable = enableDesktop;
+  services.desktopManager.plasma6.enable = enableDesktop;
-  # services.displayManager.sddm.wayland.enable = enableDesktop;
-  # services.desktopManager.plasma6.enable = enableDesktop;
   # No need for audio in VM
   services.pipewire.enable = false;
 
@@ -80,7 +78,6 @@ in
     transcrypt
     waypipe
     whois
-    wireguard-tools
   ];
 
   # This value determines the NixOS release from which the default

hosts/router/dns.nix

@@ -44,12 +44,10 @@ in
   services.adguardhome.mutableSettings = false;
   # https://github.com/AdguardTeam/Adguardhome/wiki/Configuration
   services.adguardhome.settings = {
-    querylog.interval = "168h"; # 7 days
     dns = {
       # Disable rate limit, default of 20 is too low
       # https://github.com/AdguardTeam/AdGuardHome/issues/6726
       ratelimit = 0;
-      enable_dnssec = true;
       bootstrap_dns = [ "1.1.1.1" "9.9.9.9" ];
       upstream_dns = [
         # Default upstreams

hosts/router/firewall.nix

@@ -47,15 +47,7 @@ in
       map port_forward {
           type inet_proto . inet_service : ipv4_addr . inet_service
           elements = {
-              tcp . 8006 : ${ifs.lan50.p4}.10 . 8006,
+              tcp . 8006 : ${ifs.lan50.p4}.10 . 8006
-              # opnsense vpn endpoints
-              # the plan is to maybe eventually move these to nixos
-              udp . 18596 : ${vars.extra.opnsense.addr4} . 18596,
-              udp . 48512 : ${vars.extra.opnsense.addr4} . 48512,
-              udp . 40993 : ${vars.extra.opnsense.addr4} . 40993,
-              udp . 45608 : ${vars.extra.opnsense.addr4} . 45608,
-              udp . 35848 : ${vars.extra.opnsense.addr4} . 35848,
-              udp . 48425 : ${vars.extra.opnsense.addr4} . 48425,
           }
       }
 
@@ -95,7 +87,7 @@ in
     content = ''
       ${nftIdentifiers}
       define ALLOWED_TCP_PORTS = { ssh }
-      define ALLOWED_UDP_PORTS = { ${toString vars.ifs.wg0.listenPort} }
+      define ALLOWED_UDP_PORTS = { 18596 }
       define ALLOWED_TCP_LAN_PORTS = { ssh, https }
       define ALLOWED_UDP_LAN_PORTS = { bootps, dhcpv6-server, domain, https }
       set port_forward_v6 {

hosts/router/ifconfig.nix

@@ -83,7 +83,7 @@ in
       ia_pd 30/${ifs.lan30.net6} -
       ia_pd 40/${ifs.lan40.net6} -
       ia_pd 50/${ifs.lan50.net6} -
-      ia_pd 100/${pdFromWan}9::/64 -  # for vpn stuff
+      ia_pd 100/${pdFromWan}8::/64 -  # for vpn stuff
       # ia_pd 8 -
 
       # the leases can be assigned to the interfaces,

hosts/router/private.nix

@@ -1,3 +1,2 @@
-U2FsdGVkX1/MGwxIMmhbZuPqJUZzex9v5tTuiOrEvDVldI7xY0edUy9Ii5udFLXt
+U2FsdGVkX1/98w32OE1ppwT0I5A3UOTKCLJfvk+TQdrbf0TLfYNZ9TC9n8cH2hC9
-AbxShsH43FH1ucgygKDlKTB/yXZWDoDVhjdgLFjaBtAt0xyAL9Doet844oDVhbbO
+ObKVuFlOLwHlzeBy7MXaLg==
-FqOwXHMd+PE23rgqiCscsA==

hosts/router/secrets/wireguard/wg0-peer-AsusS513-psk.age

@@ -0,0 +1,5 @@
+age-encryption.org/v1
+-> ssh-ed25519 D2MY/A YAk0egMScFdPo0uAZzITtgQyPAifDcVUfb957Zhz9Ec
+pAEM+7sbPE8rHBhRV7mTmH1w4mbfKFopMWbwu/3KHCw
+--- ykshsqEqKvCCE2kWIPAJPA/DFW7mu6+0x4MQhHgi1yU
+'<27>zƀ{g<>id\{<7B>E<EFBFBD><45><EFBFBD>tp<74>U<>g2QC3g<33><08>JG<4A>V1<56>6<>WG_E&<26>v<EFBFBD><76>)<29>&<26><><EFBFBD>ޑN"<22><><EFBFBD>n<EFBFBD>_T͒<54>

hosts/router/secrets/wireguard/wg0-peer-Yura-TPX13-psk.age

@@ -1,5 +1,6 @@
 age-encryption.org/v1
--> ssh-ed25519 D2MY/A cRVo1AetNYKsb28kGpe6mVpoCyfNcRibeBYhJuXbbEY
+-> ssh-ed25519 D2MY/A P88M0uj4ZphVo3WrRYDu+c7B0Dl7ncctbYkByYmU2wg
-k8XL4XEv4FM6sfU/TOFTg4vlKm61409No/TpCEjTnSk
+DV3Gn6TQ6iByAlNt0gg8kSZ2r0Gie/wcznZx9M+CC2g
---- mT9w1vnx2FrzWw+Zt1wV6UJ+mjHTizrUPVeaTisYQ74
+--- KhwGM50BVql02Jq0do2uhXMfgWPPDfbodzDRmZ9n0O4
-=<3D>q-So<><6F>pn<70><6E><EFBFBD><EFBFBD><EFBFBD>I<EFBFBD><49><EFBFBD>Z֠i<D6A0>'<27><><EFBFBD>"%M<><06><>C&
+r<EFBFBD><EFBFBD><EFBFBD>Զa<EFBFBD>yY/C<><43>J<EFBFBD>B<EFBFBD>X<EFBFBD>!<21>"F
+<EFBFBD>h<EFBFBD><EFBFBD><EFBFBD>(<28>L><3E>()<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>S;<3B>}}2ОO.<2E><13>hoqY<19>K"c<>E<EFBFBD><45>JM?-<2D>O

hosts/router/secrets/wireguard/wg0-private-key.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 D2MY/A Xg7XTl/qJqVqvXsHNKcoICq74DeOlquN1CEn1PwxlVY
+-> ssh-ed25519 D2MY/A tvRtTGWnaB0zxqZRba4/XpzwPa61RrnHCk4tT8OfnGQ
-FqmPdDgmuUrwZPLW56RhW8o1VXr5l2Xms6IVebpi7bA
+IX85Q5VKxQTl+MnhzwiuTnNMVkR9QrYo/1njrbZeBnQ
---- nLT/bC55EvoXK6f7DYbMhD3I8Z122bxeGVw1PCds2IM
+--- dmlPIL2T+RFhbO2iLDRa4BxxYSSUQdedV3TK83ooFdA
-!<><7F><05>Dl<44><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;<3B><>KXq8<71>4<EFBFBD><34><EFBFBD><EFBFBD>+b<><62>p_q4B<34><42>'8<>%<25>cI<63><49>D<EFBFBD>t<><0C><05>V~;v*<2A><>W<EFBFBD>-<2D>,[<5B>tݑ<74>
+<18>gE	7<><37>0`d<>V(o<>W<EFBFBD><57><EFBFBD>S@
<01>ۭ<EFBFBD><DBAD><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD><5A>ЃT<D083><54><EFBFBD><EFBFBD><14>U<EFBFBD><55>+*<2A>\Q<><51>[<5B><><EFBFBD><EFBFBD>x<><78>29<32>i5<69>k

hosts/router/vars.nix

@@ -53,9 +53,9 @@ rec {
   ifs = rec {
     wan = rec {
       name = "wan";
-      addr4 = private.wanAddr4;
+      addr4 = "192.168.1.61";
-      addr4Sized = "${addr4}/23";
+      addr4Sized = "${addr4}/24";
-      gw4 = private.wanGw4;
+      gw4 = "192.168.1.254";
     };
     lan = mkIfConfig {
       name_ = "lan";
@@ -104,12 +104,10 @@ rec {
       name_ = "wg0";
       domain_ = "wg0.${ldomain}";
       p4_ = "10.18.16";  # .0/24
-      p6_ = "${pdFromWan}9:0:6";  # ::/96
+      p6_ = "${pdFromWan}8:0:6";  # ::/96
       p6Size_ = 96;
       ulaPrefix_ = "${ulaPrefix}:0100:0:6";  # ::/96
       ulaSize_ = 96;
-    } // {
-      listenPort = 51944;
     };
   };
 

hosts/router/wireguard.nix

@@ -9,15 +9,28 @@ let
     "${ifObj.ulaPrefix}:${toString token}:0/112"
   ];
 
-  mkWg0Peer = token: publicKey: {
+  mkWg0Peer = token: publickey: {
     allowedIPs = peerIps wg0 token;
-    inherit publicKey;
+    inherit publickey;
     pskEnabled = true;
   };
 
   wg0Peers = {
-    "Yura-TPX13" = mkWg0Peer 100 "iFdsPYrpw7vsFYYJB4SOTa+wxxGVcmYp9CPxe0P9ewA=";
+    "Yura-TPX13" = {
-    "Yura-Pixel7Pro" = mkWg0Peer 101 "GPdXxjvnhsyufd2QX/qsR02dinUtPnnxrE66oGt/KyA=";
+      allowedIPs = peerIps wg0 3;
+      publicKey = "iJa5JmJbMHNlbEluNwoB2Q8LyrPAfb7S/mluanMcI08=";
+      pskEnabled = true;
+    };
+    "Yura-Pixel7Pro" = {
+      allowedIPs = [ "${wg0.p4}.4/32" "${wg0.p6}:4:0/112" ];
+      publicKey = "UjZlsukmAsX60Z5FnZwKCSu141Gjj74+hBVT3TRhwT4=";
+      pskEnabled = true;
+    };
+    "AsusS513" = {
+      allowedIPs = [ "${wg0.p4}.100/32" ];
+      publicKey = "XozJ7dHdJfkLORkCVxaB1VmvHEOAA285kRZcmzfPl38=";
+      pskEnabled = false;
+    };
   };
   peerSecretName = name: "wg0-peer-${name}-psk";
   secrets = config.secrix.services.systemd-networkd.secrets;
@@ -30,26 +43,20 @@ in
       value.encrypted.file = ./secrets/wireguard/${peerSecretName name}.age;
     };
     peerSecrets = lib.attrsets.mapAttrs' mapPeer pskPeers;
-
+  in
-    allSecrets = {
+  {
-      wg0-private-key.encrypted.file = ./secrets/wireguard/wg0-private-key.age;
+    wg0-private-key.encrypted.file = ./secrets/wireguard/wg0-private-key.age;
-    } // peerSecrets;
+  } // peerSecrets;
-
-    setSecretOwnership = name: value: value // {
-      decrypted.user = "systemd-network";
-      decrypted.group = "systemd-network";
-    };
-  in lib.attrsets.mapAttrs setSecretOwnership allSecrets;
 
   systemd.network.netdevs = {
     "10-wg0" = {
       netdevConfig = {
         Kind = "wireguard";
-        Name = wg0.name;
+        Name = "wg0";
       };
       wireguardConfig = {
         PrivateKeyFile = secrets.wg0-private-key.decrypted.path;
-        ListenPort = wg0.listenPort;
+        ListenPort = 18596;
       };
       wireguardPeers = map (peer: {
         AllowedIPs = lib.strings.concatStringsSep "," peer.value.allowedIPs;