Remove distinction between home-manager files

flake.nix

@@ -31,30 +31,60 @@
         stylix.nixosModules.stylix
         home-manager.nixosModules.home-manager
         ./laptop.nix
-        ./modules/starship
+        ./bat
-        ./modules/fonts
+        ./dunst
-        ./modules/stylix
+        ./editorconfig
-        ./modules/htop
+        ./fcitx5
-        ./modules/dual-function-keys
+        ./feh
-        ./modules/tlp
+        ./fish
-        ./modules/osu
+        ./git
-        ./modules/srb2
+        ./gpg-agent
-        ./modules/mullvad
+        ./gpg
-        ./modules/pipewire
+        ./gtk
-        ./modules/networking
+        ./hyprland
-        ./modules/virtualization
+        ./kitty
-        ./modules/xserver
+        ./librewolf
-        ./modules/systemd
+        ./mozc
-        ./modules/vnstat
+        ./mpd
-        ./modules/locale
+        ./mpv
-        ./modules/firejail
+        ./ncmpcpp
-        ./modules/timezone
+        ./neovim
-        ./modules/nix
+        ./qutebrowser
-        ./modules/npm
+        ./ranger
-        ./modules/home-manager
+        ./rofi
-        ./modules/user
+        ./swaylock
-        ./modules/piper
+        ./thunar
-        ./modules/packages
+        ./tig
+        ./udiskie
+        ./waybar
+        ./xcursor
+        ./xdg-user-dirs
+        ./xresources
+        ./zathura
+        ./starship
+        ./fonts
+        ./stylix
+        ./htop
+        ./dual-function-keys
+        ./tlp
+        ./osu
+        ./srb2
+        ./mullvad
+        ./pipewire
+        ./networking
+        ./virtualization
+        ./xserver
+        ./systemd
+        ./vnstat
+        ./locale
+        ./firejail
+        ./timezone
+        ./nix
+        ./npm
+        ./home-manager
+        ./user
+        ./piper
+        ./packages
         {
           boot.loader.systemd-boot.enable = true;
           boot.loader.efi.canTouchEfiVariables = true;

home-manager/default.nix

@@ -1,34 +1,9 @@
 {
-  imports = [
+  home-manager = {
-    ./bat
+    useGlobalPkgs = true;
-    ./dunst
+
-    ./editorconfig
+    sharedModules = [{
-    ./fcitx5
+      home.stateVersion = "22.11";
-    ./feh
+    }];
-    ./fish
+  };
-    ./git
-    ./gpg-agent
-    ./gpg
-    ./gtk
-    ./hyprland
-    ./kitty
-    ./librewolf
-    ./mozc
-    ./mpd
-    ./mpv
-    ./ncmpcpp
-    ./neovim
-    ./qutebrowser
-    ./ranger
-    ./rofi
-    ./swaylock
-    ./thunar
-    ./tig
-    ./udiskie
-    ./waybar
-    ./xcursor
-    ./xdg-user-dirs
-    ./xresources
-    ./zathura
-  ];
 }

modules/home-manager/default.nix

@@ -1,9 +0,0 @@
-{
-  home-manager = {
-    useGlobalPkgs = true;
-
-    sharedModules = [{
-      home.stateVersion = "22.11";
-    }];
-  };
-}