cleanup nas I think or something

systems/x86_64-linux/jallen-nas/default.nix

@@ -12,9 +12,7 @@
   imports = [
     ./boot.nix
     ./apps.nix
-    ./ups.nix
     ./users.nix
-    ./samba.nix
     ./services.nix
     ./sops.nix
   ];
@@ -85,6 +83,7 @@
     # ###################################################
 
     network = {
+      hostName = "jallen-nas";
       ipv4 = {
         address = "10.0.1.3/24";
         method = "manual";
@@ -131,14 +130,61 @@
     };
 
     # ###################################################
-    # #                     User                      # #
+    # #                    Power                      # #
     # ###################################################
 
-    user = {
-      name = "admin";
-      linger = true;
+    power.ups.enable = true;
+
+    # ###################################################
+    # #                    Samba                      # #
+    # ###################################################
+    
+    samba = {
+      enable = true;
+      hostsAllow = "10.0.1.";
+      enableTimeMachine = true;
+      timeMachinePath = "/media/nas/main/timemachine";
+
+      shares = {
+        "3d_printer" = {
+          public = true;
+          sharePath = "/media/nas/main/3d_printer";
+        };
+        Backup = {
+          public = true;
+          sharePath = "/media/nas/main/backup";
+        };
+        Documents = {
+          public = true;
+          sharePath = "/media/nas/main/documents";
+        };
+        isos = {
+          public = true;
+          sharePath = "/media/nas/main/isos";
+        };
+        TimeMachine = {
+          public = false;
+          sharePath = "/media/nas/main/timemachine";
+          enableTimeMachine = true;
+          timeMachineMaxSize = "1T";
+        };
+        app_data = {
+          public = true;
+          sharePath = "/media/nas/main/ssd_app_data";
+        };
+        nix-config = {
+          public = true;
+          sharePath = "/home/matt/nix-config";
+        };
+      };
     };
 
+    # ###################################################
+    # #                   Security                    # #
+    # ###################################################
+
+    security.tpm.enable = true;
+
     # ###################################################
     # #                   Services                    # #
     # ###################################################
@@ -146,6 +192,24 @@
     services = {
       grafana.enable = true;
     };
+
+    # ###################################################
+    # #                     User                      # #
+    # ###################################################
+
+    user = {
+      name = "admin";
+      hashedPasswordFile = config.sops.secrets."jallen-nas/admin_password".path;
+      linger = true;
+      extraGroups = [
+        "nix-apps"
+        "jallen-nas"
+        "grafana"
+        "traefik"
+        "62900"
+        "1001"
+      ];
+    };
   };
 
   # ###################################################
@@ -158,10 +222,6 @@
     mountPoint = "/media/nas/main";
   };
 
-  security.tpm2 = {
-    enable = true;
-  };
-
   # Configure environment
   environment = {
     systemPackages = with pkgs; [
@@ -174,6 +234,7 @@
       efibootmgr
       ffmpeg
       ipset
+      keyutils
       llama-cpp
       networkmanagerapplet
       nut