diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix
index 68364dd..029d599 100755
--- a/systems/x86_64-linux/jallen-nas/default.nix
+++ b/systems/x86_64-linux/jallen-nas/default.nix
@@ -11,9 +11,9 @@
 {
   imports = [
     ./boot.nix
-#    ./apps.nix
+    ./apps.nix
     ./users.nix
-#    ./services.nix
+    ./services.nix
     ./sops.nix
   ];
 
@@ -54,8 +54,8 @@
     hardware = {
       disko = {
         enable = true;
-        enableSwap = false;
-        enableLuks = true;
+        enableSwap = true;
+        enableLuks = false;
       };
 
       nvidia = {
@@ -169,7 +169,7 @@
     # ###################################################
 
     samba = {
-      enable = false;
+      enable = true;
       hostsAllow = "10.0.1.";
       enableTimeMachine = true;
       timeMachinePath = "/media/nas/main/timemachine";
@@ -244,17 +244,21 @@
   # ###################################################
   # #                    Mounts                     # #
   # ###################################################
-#  fileSystems."/media/nas/main" = {
-#    label = "nas_pool";
-#    # device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1";
-#    fsType = "bcachefs";
-#    mountPoint = "/media/nas/main";
-#    options = [
-#    	"nofail"
-#    	"x-systemd.mount-timeout=0"
-#    	"x-systemd.device-timeout=0"
-#    ];
-#  };
+  fileSystems."/media/nas/main" = {
+    label = "nas_pool";
+    # device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1";
+    fsType = "bcachefs";
+    mountPoint = "/media/nas/main";
+    options = [
+        "noauto"
+    	"nofail"
+    	"x-systemd.mount-timeout=0"
+    	"x-systemd.device-timeout=0"
+    ];
+  };
+
+  boot.initrd.systemd.services."unlock-bcachefs-media-nas-main".enable = false;
+  systemd.services."unlock-bcachefs-media-nas-main".enable = false;
 
   # Configure environment
   environment = {