Create a separate config file for desktops

profiles/machines/manuel/defaults.nix

@@ -1,6 +1,5 @@
 { ... }: {
   imports = [
-    ../../users/manuel/config.nix
+    ../../users/manuel/desktop.nix
-    ../../../lib/modules/valhalla.nix
   ];
 }

profiles/users/manuel/config.nix

@@ -3,14 +3,6 @@
 
   config = {
     valhalla = {
-      programs = {
-        nextcloud.enable = true;
-      };
-
-      linux.programs = {
-        rclone.enable = true;
-      };
-
       users.manuel = {
         displayName = "Manuel Thalmann";
         mailAddress = "m@nuth.ch";
@@ -31,42 +23,6 @@
           "wheel"
           "nix-users"
         ];
-
-        programs = {
-          rclone = {
-            configurations = {
-              nextcloud = {
-                dirName = "Nextcloud";
-              };
-
-              proton = {
-                dirName = "Proton";
-                cacheDuration = "2w";
-              };
-            };
-          };
-        };
-      };
-
-      windows.users.manuel = {
-        programs = {
-          nextcloud = {
-            folderSyncs = let
-              localPath = "C:/tools/RetroArch-Win64";
-              remotePath = "/Saved Games/RetroArch";
-            in [
-              {
-                remotePath = "${remotePath}/Saves";
-                localPath = "${localPath}/saves";
-                virtualFiles = false;
-              }
-              {
-                remotePath = "${remotePath}/System";
-                localPath = "${localPath}/system";
-              }
-            ];
-          };
-        };
       };
     };
   };

profiles/users/manuel/desktop.nix

@@ -0,0 +1,51 @@
+{ ... }: {
+  imports = [ ./config.nix ];
+
+  config = {
+    valhalla = {
+      programs = {
+        nextcloud.enable = true;
+      };
+
+      linux.programs = {
+        rclone.enable = true;
+      };
+
+      linux.users.manuel.programs = {
+        rclone = {
+          configurations = {
+            nextcloud = {
+              dirName = "Nextcloud";
+            };
+
+            proton = {
+              dirName = "Proton";
+              cacheDuration = "2w";
+            };
+          };
+        };
+      };
+
+      windows.users.manuel = {
+        programs = {
+          nextcloud = {
+            folderSyncs = let
+              localPath = "C:/tools/RetroArch-Win64";
+              remotePath = "/Saved Games/RetroArch";
+            in [
+              {
+                remotePath = "${remotePath}/Saves";
+                localPath = "${localPath}/saves";
+                virtualFiles = false;
+              }
+              {
+                remotePath = "${remotePath}/System";
+                localPath = "${localPath}/system";
+              }
+            ];
+          };
+        };
+      };
+    };
+  };
+}