more organization, or maybe disorganization...

hosts/nas/configuration.nix

@@ -7,19 +7,14 @@ let
   user = "admin";
   password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
   hostname = "jallen-nas";
-  timezone = "America/Chicago";
 in
 {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../nas-samba/samba.nix
-      ../../nas-apps/nas-apps.nix
+      ../default.nix
     ];
 
-  # Enable nix flakes and nix-command tools
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   nas-apps = {
     jellyfin.enable = true;
 
@@ -44,6 +39,38 @@ in
     swag.enable = true;
   };
 
+  nas-samba = {
+    enable = true;
+    hostsAllow = "10.0.1.";
+    enableTimeMachine = true;
+    timeMachinePath = "/mnt/mainpool/TimeMachine";
+
+    shares = {
+      "3d_printer" = {
+        public = true;
+        sharePath = "/mnt/mainpool/3d_printer";
+      };
+      Backup = {
+        public = true;
+        sharePath = "/mnt/mainpool/Backup";
+      };
+      Documents = {
+        public = true;
+        sharePath = "/mnt/mainpool/Documents";
+      };
+      isos = {
+        public = true;
+        sharePath = "/mnt/mainpool/isos";
+      };
+      TimeMachine = {
+        public = true;
+        sharePath = "/mnt/mainpool/TimeMachine";
+        enableTimeMachine = true;
+        timeMachineMaxSize = "1T";
+      };
+    };
+  };
+
   # Configure bootloader with lanzaboot and secureboot
   boot = {
     loader = {
@@ -76,15 +103,6 @@ in
 
   # Hardware configs
   hardware = {
-    # Bluetooth
-    bluetooth.enable = true;
-
-    # Enable all firmware
-    enableAllFirmware = true;
-
-    # Disable pulse audio in favor of pipewire
-    pulseaudio.enable = false;
-    
     # Nvidia
     nvidia = {
       package = config.boot.kernelPackages.nvidiaPackages.beta;
@@ -123,11 +141,6 @@ in
 
   # Services configs
   services = {
-    openssh.enable = true;
-
-    # Enable firmware updates
-    fwupd.enable = true;
-    
     # Enable the X11 windowing system.
     xserver = {
       enable = true;
@@ -142,17 +155,6 @@ in
       };
       desktopManager.plasma5.enable = true;
     };
-    
-    # Enable CUPS to print documents.
-    printing.enable = true;
-    
-    # configure pipewire
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
 
     # Set to enable Flatpak
     flatpak.enable = false;
@@ -237,12 +239,6 @@ in
     };
   };
 
-  # Time config
-  time = {
-    # Set your time zone.
-    timeZone = timezone;
-  };
-
   # Configure environment
   environment = {
     # List packages installed in system profile. To search, run: