update ettves & phaenn to nixos 23.11

2 files changed, 24 insertions, 21 deletions

diff --git a/flake.lock b/flake.lock
index 7f2b061..4d25d13 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1693611461,
-        "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
+        "lastModified": 1706830856,
+        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
+        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1693471703,
-        "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
+        "lastModified": 1706550542,
+        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
+        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
         "type": "github"
       },
       "original": {
@@ -109,16 +109,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "lastModified": 1706826059,
+        "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -134,11 +134,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1695811743,
-        "narHash": "sha256-QPgzfxmuma9hqtn5NEQudJKZS8CADxJWEby2t6pwP7I=",
+        "lastModified": 1699793581,
+        "narHash": "sha256-/NX6ad9PJX3rZW9x0frnagLEANekJuDakBfR9ngZwDk=",
         "ref": "refs/heads/main",
-        "rev": "8890cd313ce5dd17b4e723d90ce399cee5a3da8c",
-        "revCount": 12,
+        "rev": "98d1d7ebf3cf17e4282420f48846830df1a22b63",
+        "revCount": 24,
         "type": "git",
         "url": "ssh://git@gitlab.com/cocainefarm/k8s/secrets"
       },
diff --git a/flake.nix b/flake.nix
index 8622c7e..0f5721b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixinate.url = "github:maxaudron/nixinate";
 
@@ -21,7 +21,10 @@
           };
           mkSystem = modules: nixpkgs.lib.nixosSystem {
             inherit specialArgs system;
-            modules = modules ++ [ nixinate.nixosModules.default ];
+            modules = modules ++ (with self.nixosModules; [
+              nixinate.nixosModules.default
+              common users wireguard crypto
+            ]);
           };
         in
         {
@@ -29,11 +32,11 @@
           nixosConfigurations = with self.nixosModules; {
             # vultr-image = mkSystem [ common users image vultr ];
 
-            ettves = mkSystem [ (import ./machines/ettves) common users wireguard crypto kubernetes zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant palworld ];
-            phaenn = mkSystem [ (import ./machines/phaenn) common users wireguard crypto kubernetes zfs acme tlmp ];
-            fra01 = mkSystem [ (import ./machines/fra01) common users wireguard crypto kubernetes vultr bgp powerdns acme ];
-            nyc01 = mkSystem [ (import ./machines/nyc01) common users wireguard crypto kubernetes vultr bgp powerdns acme ];
-            sin01 = mkSystem [ (import ./machines/sin01) common users wireguard crypto kubernetes vultr bgp powerdns acme ];
+            ettves = mkSystem [ (import ./machines/ettves) kubernetes zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant palworld ];
+            phaenn = mkSystem [ (import ./machines/phaenn) kubernetes zfs acme tlmp ];
+            fra01 = mkSystem [ (import ./machines/fra01) vultr bgp powerdns acme garage ];
+            nyc01 = mkSystem [ (import ./machines/nyc01) vultr bgp powerdns acme garage ];
+            sin01 = mkSystem [ (import ./machines/sin01) vultr bgp powerdns acme garage ];
           };
         };
       systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];