dumpyourvms, ryzensun: update wireguard peers

instead of nixos-flake, now nixos-unified

flake.lock

@@ -38,11 +38,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1718194053,
+        "lastModified": 1727447169,
-        "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1726153070,
+        "lastModified": 1727826117,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720174790,
+        "lastModified": 1728309617,
-        "narHash": "sha256-Nl6/5AzCg6yoU7OlJrOz8h4w2ENXZyj3AuCFXKxZ/W0=",
+        "narHash": "sha256-qEvJZivt+uaKDt53S4W0NGG2VgPwbSDeoMXRnoW+iJ4=",
         "ref": "refs/heads/main",
-        "rev": "db4fccbd58cb1411482cdd4ab275daccfe9c870b",
+        "rev": "27d180c69aaad9366f5f7e731a3205d3e96c37f2",
-        "revCount": 30,
+        "revCount": 37,
         "type": "git",
         "url": "https://git.pub.solar/teutat3s/invoiceplane-templates.git"
       },
@@ -262,11 +262,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727003835,
+        "lastModified": 1727999297,
-        "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
+        "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
+        "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1726817540,
+        "lastModified": 1727672109,
-        "narHash": "sha256-wAFpWuW9AKzvRHHJPYhrY+9LlYgAiWwLrB0W/8iPiic=",
+        "narHash": "sha256-xqlsvY2F09hjIjDbi5yJ7/8mB7TgPH3rNqdexbwGe/A=",
         "owner": "nix-community",
         "repo": "nix-direnv",
-        "rev": "41d7d45cae59b24cf0df1efb8881238ce0ed5906",
+        "rev": "83366760e5838047e5c330b583f60c616c0920be",
         "type": "github"
       },
       "original": {
@@ -316,28 +316,13 @@
         "type": "github"
       }
     },
-    "nixos-flake": {
-      "locked": {
-        "lastModified": 1726266595,
-        "narHash": "sha256-r+mX2ZC/mQ7zlLPeF/HvLNN4VnXfoWxbc5StpKHKDHM=",
-        "owner": "srid",
-        "repo": "nixos-flake",
-        "rev": "ef4921f6af505ee41ccab57b65b99be9cef63886",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "nixos-flake",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727040444,
+        "lastModified": 1728056216,
-        "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
+        "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
+        "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
         "type": "github"
       },
       "original": {
@@ -348,11 +333,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726969270,
+        "lastModified": 1728193676,
-        "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
+        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
+        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
         "type": "github"
       },
       "original": {
@@ -364,14 +349,14 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1725233747,
+        "lastModified": 1727825735,
-        "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       }
     },
     "root": {
@@ -386,7 +371,6 @@
         "nix-darwin": "nix-darwin",
         "nix-direnv": "nix-direnv",
         "nixos-22-05": "nixos-22-05",
-        "nixos-flake": "nixos-flake",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "triton-vmtools": "triton-vmtools",
@@ -546,11 +530,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1726937504,
+        "lastModified": 1728018373,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -19,7 +19,6 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
-    nixos-flake.url = "github:srid/nixos-flake";
 
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
@@ -68,7 +67,6 @@
       ];
 
       imports = [
-        inputs.nixos-flake.flakeModule
         ./lib
         ./modules
         ./hosts

hosts/default.nix

@@ -2,14 +2,35 @@
   withSystem,
   self,
   inputs,
+  config,
   ...
 }:
 {
   flake = {
-    nixosConfigurations = {
+    nixosModules = {
-      dumpyourvms = self.nixos-flake.lib.mkLinuxSystem {
+      home-manager = {
-        nixpkgs.hostPlatform = "x86_64-linux";
         imports = [
+          inputs.home-manager.nixosModules.home-manager
+          ({
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.extraSpecialArgs = {
+              flake = {
+                inherit self inputs config;
+              };
+            };
+          })
+        ];
+      };
+    };
+    nixosConfigurations = {
+      dumpyourvms = self.inputs.nixpkgs.lib.nixosSystem {
+        specialArgs = {
+          flake = {
+            inherit self inputs config;
+          };
+        };
+        modules = [
           self.nixosModules.base
           ./dumpyourvms
           self.nixosModules.teutat3s
@@ -24,9 +45,13 @@
         ];
       };
 
-      ryzensun = self.nixos-flake.lib.mkLinuxSystem {
+      ryzensun = self.inputs.nixpkgs.lib.nixosSystem {
-        nixpkgs.hostPlatform = "x86_64-linux";
+        specialArgs = {
-        imports = [
+          flake = {
+            inherit self inputs config;
+          };
+        };
+        modules = [
           self.nixosModules.base
           ./ryzensun
           self.nixosModules.teutat3s
@@ -40,9 +65,13 @@
         ];
       };
 
-      fae = self.nixos-flake.lib.mkLinuxSystem {
+      fae = self.inputs.nixpkgs.lib.nixosSystem {
-        nixpkgs.hostPlatform = "aarch64-linux";
+        specialArgs = {
-        imports = [
+          flake = {
+            inherit self inputs config;
+          };
+        };
+        modules = [
           self.nixosModules.base
           inputs.nixos-hardware.nixosModules.raspberry-pi-4
           ./fae
@@ -52,9 +81,13 @@
         ];
       };
 
-      #powder = self.nixos-flake.lib.mkLinuxSystem {
+      #powder = self.inputs.nixpkgs.lib.nixosSystem {
-      #  nixpkgs.hostPlatform = "aarch64-linux";
+      #  specialArgs = {
-      #  imports = [
+      #    flake = {
+      #      inherit self inputs config;
+      #    };
+      #  };
+      #  modules = [
       #    self.nixosModules.base
       #    inputs.nixos-hardware.nixosModules.raspberry-pi-4
       #    ./powder
@@ -65,9 +98,13 @@
       #  ];
       #};
 
-      iso = self.nixos-flake.lib.mkLinuxSystem {
+      iso = self.inputs.nixpkgs.lib.nixosSystem {
-        nixpkgs.hostPlatform = "x86_64-linux";
+        specialArgs = {
-        imports = [
+          flake = {
+            inherit self inputs config;
+          };
+        };
+        modules = [
           "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
           self.nixosModules.base
           ./iso
@@ -75,10 +112,13 @@
         ];
       };
 
-      iso-arm = self.nixos-flake.lib.mkLinuxSystem {
+      iso-arm = self.inputs.nixpkgs.lib.nixosSystem {
-        nixpkgs.hostPlatform = "aarch64-linux";
+        specialArgs = {
-        nixpkgs.buildPlatform = "x86_64-linux";
+          flake = {
-        imports = [
+            inherit self inputs config;
+          };
+        };
+        modules = [
           "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
           self.nixosModules.base
           ./iso
@@ -86,9 +126,13 @@
         ];
       };
 
-      iso-graphical = self.nixos-flake.lib.mkLinuxSystem {
+      iso-graphical = self.inputs.nixpkgs.lib.nixosSystem {
-        nixpkgs.hostPlatform = "x86_64-linux";
+        specialArgs = {
-        imports = [
+          flake = {
+            inherit self inputs config;
+          };
+        };
+        modules = [
           "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
           self.nixosModules.base
           ./iso

hosts/dumpyourvms/hardware-configuration.nix

@@ -43,4 +43,6 @@
       size = 18432;
     }
   ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

hosts/dumpyourvms/networking.nix

@@ -176,16 +176,6 @@
             endpoint = "[2a01:4f8:172:1c25::1]:51820";
             persistentKeepalive = 15;
           }
-          {
-            # flora-6.pub.solar
-            publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
-            allowedIPs = [
-              "10.7.6.2/32"
-              "fd00:fae:fae:fae:fae:2::/96"
-            ];
-            endpoint = "80.71.153.210:51820";
-            persistentKeepalive = 15;
-          }
           {
             # metronom.pub.solar
             publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
@@ -215,7 +205,7 @@
               "10.7.6.5/32"
               "fd00:fae:fae:fae:fae:5::/96"
             ];
-            #endpoint = "80.244.242.5:51820";
+            #endpoint = "85.215.152.22:51820";
             endpoint = "[2a01:239:35d:f500::1]:51820";
             persistentKeepalive = 15;
           }

hosts/iso/default.nix

@@ -4,4 +4,5 @@
   isoImage.squashfsCompression = "gzip -Xcompression-level 1";
   systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
   networking.networkmanager.enable = false;
+  nixpkgs.hostPlatform = "x86_64-linux";
 }

hosts/ryzensun/hardware-configuration.nix

@@ -36,4 +36,6 @@
   };
 
   swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

hosts/ryzensun/networking.nix

@@ -85,16 +85,6 @@
             endpoint = "[2a01:4f8:172:1c25::1]:51820";
             persistentKeepalive = 15;
           }
-          {
-            # flora-6.pub.solar
-            publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
-            allowedIPs = [
-              "10.7.6.2/32"
-              "fd00:fae:fae:fae:fae:2::/96"
-            ];
-            endpoint = "80.71.153.210:51820";
-            persistentKeepalive = 15;
-          }
           {
             # metronom.pub.solar
             publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
@@ -117,6 +107,39 @@
             endpoint = "[2001:4d88:1ffa:26::5]:51820";
             persistentKeepalive = 15;
           }
+          {
+            # trinkgenossin.pub.solar
+            publicKey = "QWgHovHxtqiQhnHLouSWiT6GIoQDmuvnThYL5c/rvU4=";
+            allowedIPs = [
+              "10.7.6.5/32"
+              "fd00:fae:fae:fae:fae:5::/96"
+            ];
+            #endpoint = "85.215.152.22:51820";
+            endpoint = "[2a01:239:35d:f500::1]:51820";
+            persistentKeepalive = 15;
+          }
+          {
+            # delite.pub.solar
+            publicKey = "ZT2qGWgMPwHRUOZmTQHWCRX4m14YwOsiszjsA5bpc2k=";
+            allowedIPs = [
+              "10.7.6.6/32"
+              "fd00:fae:fae:fae:fae:6::/96"
+            ];
+            #endpoint = "80.244.242.5:51820";
+            endpoint = "[2a04:52c0:124:9d8c::2]:51820";
+            persistentKeepalive = 15;
+          }
+          {
+            # blue-shell.pub.solar
+            publicKey = "bcrIpWrKc1M+Hq4ds3aN1lTaKE26f2rvXhd+93QrzR8=";
+            allowedIPs = [
+              "10.7.6.7/32"
+              "fd00:fae:fae:fae:fae:7::/96"
+            ];
+            #endpoint = "80.244.242.5:51820";
+            endpoint = "[2a03:4000:43:24e::1]:51820";
+            persistentKeepalive = 15;
+          }
         ];
       };
       #wg1 = {