fix(nixos): apply fixes for 24.05 transition

truelecter · May 26, 2024 · 56d8c3e · 56d8c3e
1 parent b9de8d1
commit 56d8c3e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/cells/nixos/hosts/depsos/postgres.nix b/cells/nixos/hosts/depsos/postgres.nix
@@ -19,28 +19,28 @@
     ensureUsers = [
       {
         name = "pandora";
-        ensurePermissions = {
-          "DATABASE cqdata" = "ALL PRIVILEGES";
-        };
+        # ensurePermissions = {
+        #   "DATABASE cqdata" = "ALL PRIVILEGES";
+        # };
       }
       {
         name = "authentik";
-        ensurePermissions = {
-          "DATABASE authentik" = "ALL PRIVILEGES";
-        };
+        # ensurePermissions = {
+        #   "DATABASE authentik" = "ALL PRIVILEGES";
+        # };
       }
       {
         name = "truelecter";
-        ensurePermissions = {
-          "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-          "DATABASE cqdata" = "ALL PRIVILEGES";
-        };
+        # ensurePermissions = {
+        #   "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
+        #   "DATABASE cqdata" = "ALL PRIVILEGES";
+        # };
       }
       {
         name = "superuser";
-        ensurePermissions = {
-          "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-        };
+        # ensurePermissions = {
+        #   "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
+        # };
       }
     ];
     authentication = pkgs.lib.mkOverride 10 ''

diff --git a/cells/nixos/profiles/fs/zfs.nix b/cells/nixos/profiles/fs/zfs.nix
@@ -1,12 +1,16 @@
 {
   inputs,
   common,
-}: {lib, ...}: {
+}: {
+  lib,
+  pkgs,
+  ...
+}: {
   boot = {
     kernelParams = ["nohibernate"];
     zfs = {
-      enableUnstable = false;
       forceImportRoot = false;
+      package = pkgs.zfs_unstable;
     };
     supportedFilesystems = ["zfs"];
   };