diff --git a/lib/modules/valhalla.nix b/lib/modules/valhalla.nix
index ae88a3eb..086eb458 100644
--- a/lib/modules/valhalla.nix
+++ b/lib/modules/valhalla.nix
@@ -8,7 +8,9 @@
     imports = [
       ./hardware.nix
       ./i18n.nix
+      ./os.nix
       ./packages/git.nix
+      ./packages/rclone.nix
       ./partition.nix
       ./software.nix
       ./users.nix
diff --git a/profiles/Generic/config.nix b/profiles/Generic/config.nix
index a53beb00..710a4a7a 100644
--- a/profiles/Generic/config.nix
+++ b/profiles/Generic/config.nix
@@ -44,7 +44,10 @@
               "wheel"
               "nix-users"
             ];
+          };
+        };
 
+        linux.users.manuel = {
             defaultShell = "fish";
 
             rclone = {
@@ -58,7 +61,6 @@
                 };
               };
             };
-          };
         };
 
         timeZone = "Europe/Zurich";