nas builds

systems/x86_64-linux/deck/sops.nix

@@ -1,6 +1,6 @@
-{ config, ... }:
+{ config, lib, namespace, ... }:
 let
-  user = "deck";
+  user = config.${namespace}.user.name;
 in
 {
   # Permission modes are in octal representation (same as chmod),
@@ -18,7 +18,7 @@ in
   # Either the group id or group name representation of the secret group
   # It is recommended to get the group name from `config.users.users.<?name>.group` to avoid misconfiguration
   sops = {
-    defaultSopsFile = ../../../secrets/steamdeck-secrets.yaml;
+    defaultSopsFile = (lib.snowfall.fs.get-file "secrets/steamdeck-secrets.yaml");
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
     # ------------------------------
@@ -33,7 +33,7 @@ in
       };
 
       "wifi" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
       };
 
       # ------------------------------
@@ -66,37 +66,37 @@ in
       # Secureboot keys
       # ------------------------------
       "secureboot/GUID" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 #        path = "/etc/secureboot/GUID";
         mode = "0600";
       };
       "secureboot/keys/db-key" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 #        path = "/etc/secureboot/keys/db/db.key";
         mode = "0600";
       };
       "secureboot/keys/db-pem" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 #        path = "/etc/secureboot/keys/db/db.pem";
         mode = "0600";
       };
       "secureboot/keys/KEK-key" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 #        path = "/etc/secureboot/keys/KEK/KEK.key";
         mode = "0600";
       };
       "secureboot/keys/KEK-pem" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 #        path = "/etc/secureboot/keys/KEK/KEK.pem";
         mode = "0600";
       };
       "secureboot/keys/PK-key" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 #        path = "/etc/secureboot/keys/PK/PK.key";
         mode = "0600";
       };
       "secureboot/keys/PK-pem" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 #        path = "/etc/secureboot/keys/PK/PK.pem";
         mode = "0600";
       };

systems/x86_64-linux/nas/apps/nextcloud/default.nix

@@ -6,14 +6,14 @@ let
   jwtSecretFile =  config.sops.secrets."jallen-nas/onlyoffice-key".path;
   nextcloudUserId = config.users.users.nix-apps.uid;
   nextcloudGroupId = config.users.groups.jallen-nas.gid;
-  nextcloudPackage = pkgs.stable.nextcloud31;
+  nextcloudPackage = pkgs.nextcloud31;
   hostAddress = settings.hostAddress;
   localAddress = "10.0.2.18";
   nextcloudPortExtHttp = 9988;
   nextcloudPortExtHttps = 9943;
   onlyofficePortExt = 9943;
 
-  systemPackages = with pkgs.stable; [
+  systemPackages = with pkgs; [
     cudaPackages.cudnn
     cudatoolkit
     ffmpeg

systems/x86_64-linux/nas/default.nix

@@ -27,10 +27,6 @@
     ./sops.nix
   ];
 
-  snowfallorg.users.admin.home.config = {
-    mjallen.sops.enable = true;
-  };
-
   powerManagement.cpuFreqGovernor = "powersave";
 
   ${namespace} = {
@@ -43,6 +39,9 @@
       nvidiaSettings = true;
       enableNvidiaDocker = true;
     };
+    user = {
+      name = "admin";
+    };
   };
 
   security.tpm2 = {