Reorganize modules

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

users/common/default.nix

@@ -22,12 +22,12 @@ in
       imports = [
         inputs.impermanence.nixosModules.home-manager.impermanence
         inputs.stylix.homeManagerModules.stylix
-        ./configs/stylix.nix
-        ./configs/hyprland.nix
-        ./configs/git.nix
-        ./configs/zsh.nix
-        ./configs/kitty.nix
-        ./configs/firefox.nix
+        ./configs/stylix
+        ./configs/hyprland
+        ./configs/git
+        ./configs/zsh
+        ./configs/kitty
+        ./configs/firefox
       ];
 
       home = {
@@ -41,13 +41,8 @@ in
 
       systemd.user.startServices = "sd-switch";
     }];
-  };
 
-  systemd.tmpfiles.rules = [ "d /persist/home/ 0755 root root -" ] ++ lib.attrsets.mapAttrsToList (user: config:
-    "d /persist${config.home} 0700 ${user} users -"
-  ) normalUsers;
-
-  home-manager.users = lib.attrsets.mapAttrs' (user: config: lib.attrsets.nameValuePair
+    users = lib.attrsets.mapAttrs' (user: config: lib.attrsets.nameValuePair
     (user)
     (let
       init = pkgs.pkgs.writeShellScriptBin "hyprland-init" ''
@@ -92,5 +87,10 @@ in
 
       wayland.windowManager.hyprland.settings.exec-once = "${init}/bin/hyprland-init";
     })
+    ) normalUsers;
+  };
+
+  systemd.tmpfiles.rules = [ "d /persist/home/ 0755 root root -" ] ++ lib.attrsets.mapAttrsToList (user: config:
+    "d /persist${config.home} 0700 ${user} users -"
   ) normalUsers;
 }