From 60cad3b2d5e500ce568ec86e1c38b7e0f2ca569a Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Tue, 3 Sep 2024 23:11:28 +0200
Subject: [PATCH] Store user related options properly

---
 profiles/machines/manuel/Generic/config.nix | 47 ---------------------
 profiles/users/manuel/config.nix            | 43 +++++++++++++++++++
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/profiles/machines/manuel/Generic/config.nix b/profiles/machines/manuel/Generic/config.nix
index e43767d3..35e20838 100644
--- a/profiles/machines/manuel/Generic/config.nix
+++ b/profiles/machines/manuel/Generic/config.nix
@@ -35,53 +35,6 @@
           };
         };
 
-        users = {
-          manuel = {
-            displayName = "Manuel Thalmann";
-            mailAddress = "m@nuth.ch";
-          };
-        };
-
-        linux.users.manuel = {
-            defaultShell = "fish";
-
-            groups = [
-              "wheel"
-              "nix-users"
-            ];
-
-            rclone = {
-              configurations = {
-                nextcloud = {
-                  dirName = "Nextcloud";
-                };
-                proton = {
-                  dirName = "Proton";
-                };
-              };
-            };
-        };
-
-        windows.users.manuel = {
-          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";
-                }
-              ];
-          };
-        };
-
         timeZone = "Europe/Zurich";
         keyMap = "de_CH-latin1";
         keyboardLayout = "ch";
diff --git a/profiles/users/manuel/config.nix b/profiles/users/manuel/config.nix
index 10d6c856..7777ac06 100644
--- a/profiles/users/manuel/config.nix
+++ b/profiles/users/manuel/config.nix
@@ -6,6 +6,9 @@
   config = {
     valhalla = {
       users.manuel = {
+        displayName = "Manuel Thalmann";
+        mailAddress = "m@nuth.ch";
+
         oh-my-posh = {
           theme = {
             source = ./manuel.omp.json;
@@ -13,6 +16,46 @@
         };
       };
 
+      linux.users.manuel = {
+        defaultShell = "fish";
+
+        groups = [
+          "wheel"
+          "nix-users"
+        ];
+
+        rclone = {
+          configurations = {
+            nextcloud = {
+              dirName = "Nextcloud";
+            };
+            proton = {
+              dirName = "Proton";
+            };
+          };
+        };
+      };
+
+      windows.users.manuel = {
+        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";
+              }
+            ];
+        };
+      };
+
       partition = {
         os = {
           partitions = { };