move servers to nixos-23.11

NyCodeGHG · Nov 29, 2023 · dc8db4b · dc8db4b
1 parent dc416c5
commit dc8db4b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-db-rest.url = "github:NyCodeGHG/nixpkgs/nixos/db-rest";
 
     home-manager = {
@@ -94,7 +95,7 @@
 
       flake = {
         lib = {
-          nixosSystem = nixpkgs.lib.makeOverridable ({ modules ? [ ], baseModules ? [ ] }:
+          nixosSystem = nixpkgs: nixpkgs.lib.makeOverridable ({ modules ? [ ], baseModules ? [ ] }:
             nixpkgs.lib.nixosSystem {
               specialArgs = {
                 inherit inputs;
@@ -137,11 +138,20 @@
 
         nixosConfigurations =
           let
-            systems = [ "artemis" "delphi" "minimal" "insane" ];
-            systemFromName = name: self.lib.nixosSystem {
+            systems = [ "minimal" "insane" ];
+            systemFromName = name: self.lib.nixosSystem inputs.nixpkgs {
               modules = [ ./hosts/${name}/configuration.nix ];
             };
-          in builtins.listToAttrs (builtins.map (system: { name = system; value = systemFromName system; }) systems);
+          in builtins.listToAttrs (builtins.map (system: { name = system; value = systemFromName system; }) systems) // {
+
+          artemis = self.lib.nixosSystem inputs.nixpkgs-stable {
+            modules = [ ./hosts/artemis/configuration.nix ];
+          };
+
+          delphi = self.lib.nixosSystem inputs.nixpkgs-stable {
+            modules = [ ./hosts/delphi/configuration.nix ];
+          };
+        };
 
         homeManagerModules = {
           config = import ./config/home-manager;

diff --git a/hosts/artemis/applications/matrix/default.nix b/hosts/artemis/applications/matrix/default.nix
@@ -102,9 +102,7 @@ in
     ensureUsers = [
       {
         name = "matrix-synapse";
-        ensurePermissions = {
-          "DATABASE \"matrix-synapse\"" = "ALL PRIVILEGES";
-        };
+        ensureDBOwnership = true;
       }
     ];
     ensureDatabases = [ "matrix-synapse" ];

diff --git a/hosts/artemis/applications/pgrok.nix b/hosts/artemis/applications/pgrok.nix
@@ -48,9 +48,7 @@
     ensureUsers = [
       {
         name = "pgrok";
-        ensurePermissions = {
-          "DATABASE pgrok" = "ALL PRIVILEGES";
-        };
+        ensureDBOwnership = true;
       }
     ];
   };

diff --git a/modules/nixos/applications/authentik.nix b/modules/nixos/applications/authentik.nix
@@ -219,9 +219,7 @@ in
           ensureUsers = [
             {
               name = "authentik";
-              ensurePermissions = {
-                "DATABASE authentik" = "ALL PRIVILEGES";
-              };
+              ensureDBOwnership = true;
             }
           ];
         };