move some apps to namespace

systems/x86_64-linux/desktop/default.nix

@@ -40,6 +40,7 @@ in
   ${namespace} = {
     hardware.disko.enable = false;
     bootloader.lanzaboote.enable = true;
+    impermanence.enable = true;
     desktop.gnome.enable = true;
     network = {
       hostName = "matt-nixos";

systems/x86_64-linux/nas/apps.nix

@@ -2,6 +2,7 @@
 {
   ${namespace} = {
     services = {
+      # Existing properly namespaced services
       immich.enable = true;
       jellyfin.enable = true;
       jellyseerr.enable = true;
@@ -11,93 +12,92 @@
       paperless.enable = true;
       traefik.enable = true;
       wyoming.enable = true;
+
+      # Newly migrated services
+      actual = {
+        enable = true;
+        port = 3333;
+        localAddress = "10.0.3.18";
+        dataDir = "/media/nas/main/nix-app-data/actual";
+        reverseProxy = {
+          enable = true;
+          host = "actual.mjallen.dev";
+          middlewares = [
+            "crowdsec"
+            "whitelist-geoblock"
+          ];
+        };
+      };
+
+      arrs = {
+        enable = true;
+        localAddress = "10.0.1.51";
+        downloadsDir = "/media/nas/main/ssd_app_data/downloads";
+        incompleteDownloadsDir = "/media/nas/main/ssd_app_data/downloads-incomplete";
+        moviesDir = "/media/nas/main/movies";
+        tvDir = "/media/nas/main/tv";
+        isosDir = "/media/nas/main/isos";
+        radarr = {
+          enable = true;
+          port = 7878;
+          dataDir = "/media/nas/main/nix-app-data/radarr";
+        };
+        sonarr = {
+          enable = true;
+          port = 8989;
+          dataDir = "/media/nas/main/nix-app-data/sonarr";
+        };
+        sabnzbd = {
+          enable = true;
+          port = 8280;
+          dataDir = "/media/nas/main/nix-app-data/sabnzbd";
+        };
+        deluge = {
+          enable = true;
+          port = 8112;
+        };
+        jackett = {
+          enable = true;
+          port = 9117;
+          dataDir = "/media/nas/main/nix-app-data/jackett";
+        };
+      };
+
+      crowdsec = {
+        enable = true;
+        port = 9898;
+        apiAddress = "10.0.1.3";
+        apiKey = "1daH89qmJ41r2Lpd9hvDw4sxtOAtBzaj3aKFOFqE";
+        dataDir = "/media/nas/main/nix-app-data/crowdsec";
+      };
+
+      gitea = {
+        enable = true;
+        httpPort = 3000;
+        sshPort = 2222;
+        localAddress = "10.0.4.18";
+        dataDir = "/media/nas/main/nix-app-data/gitea";
+        reverseProxy = {
+          enable = true;
+          host = "gitea.mjallen.dev";
+          middlewares = [
+            "crowdsec"
+            "whitelist-geoblock"
+          ];
+        };
+      };
+
+      free-games-claimer.enable = true;
+
+      manyfold.enable = true;
+
+      orca-slicer = {
+        enable = true;
+        httpPort = "3100";
+        httpsPort = "3101";
+      };
+
+      tdarr.enable = true;
     };
   };
-
-  nas-apps = {
-    actual = {
-      enable = true;
-      port = 3333;
-      localAddress = "10.0.3.18";
-      dataDir = "/media/nas/main/nix-app-data/actual";
-      reverseProxy = {
-        enable = true;
-        host = "actual.mjallen.dev";
-        middlewares = [
-          "crowdsec"
-          "whitelist-geoblock"
-        ];
-      };
-    };
-
-    arrs = {
-      enable = true;
-      localAddress = "10.0.1.51";
-      downloadsDir = "/media/nas/main/ssd_app_data/downloads";
-      incompleteDownloadsDir = "/media/nas/main/ssd_app_data/downloads-incomplete";
-      moviesDir = "/media/nas/main/movies";
-      tvDir = "/media/nas/main/tv";
-      isosDir = "/media/nas/main/isos";
-      radarr = {
-        enable = true;
-        port = 7878;
-        dataDir = "/media/nas/main/nix-app-data/radarr";
-      };
-      sonarr = {
-        enable = true;
-        port = 8989;
-        dataDir = "/media/nas/main/nix-app-data/sonarr";
-      };
-      sabnzbd = {
-        enable = true;
-        port = 8280;
-        dataDir = "/media/nas/main/nix-app-data/sabnzbd";
-      };
-      deluge = {
-        enable = true;
-        port = 8112;
-      };
-      jackett = {
-        enable = true;
-        port = 9117;
-        dataDir = "/media/nas/main/nix-app-data/jackett";
-      };
-    };
-
-    crowdsec = {
-      enable = true;
-      port = 9898;
-      apiAddress = "10.0.1.3";
-      apiKey = "1daH89qmJ41r2Lpd9hvDw4sxtOAtBzaj3aKFOFqE";
-      dataDir = "/media/nas/main/nix-app-data/crowdsec";
-    };
-
-    gitea = {
-      enable = true;
-      httpPort = 3000;
-      sshPort = 2222;
-      localAddress = "10.0.4.18";
-      dataDir = "/media/nas/main/nix-app-data/gitea";
-      reverseProxy = {
-        enable = true;
-        host = "gitea.mjallen.dev";
-        middlewares = [
-          "crowdsec"
-          "whitelist-geoblock"
-        ];
-      };
-    };
-
-    free-games-claimer.enable = true;
-
-    manyfold.enable = true;
-
-    orca-slicer = {
-      enable = true;
-      httpPort = "3100";
-      httpsPort = "3101";
-    };
-
-    tdarr.enable = true;
-  };
 }

systems/x86_64-linux/nuc/default.nix

@@ -17,10 +17,14 @@
 
   ${namespace} = {
     services.home-assistant.enable = true;
-    hardware.disko.enable = true;
+    hardware.disko = {
+      enable = true;
+      filesystem = "bcachefs";
+    };
+    impermanence.enable = true;
     network = {
       hostName = "nuc-nixos";
-      useNetworkd = true;
+      useNetworkd = false;
       ipv4 = {
         method = "manual";
         address = "10.0.1.4/24";