Use modules folder

hosts/desktop.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  theme = import ../theme;
+  theme = import ../modules/theme;
 in
 {
   services = {
@@ -15,7 +15,7 @@ in
             enable = true;
             theme = theme.gtkTheme pkgs;
           };
-          background = ../wallpapers/${theme.wallpaper};
+          background = ../modules/wallpapers/${theme.wallpaper};
         };
         defaultSession = "none+i3";
       };
@@ -54,7 +54,7 @@ in
       mplus-outline-fonts.osdnRelease
       noto-fonts
       (nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons
-      (pkgs.callPackage ../twemoji.nix {})
+      (pkgs.callPackage ../modules/twemoji {})
     ];
   };
 }

hosts/home.nix

@@ -1,25 +1,25 @@
 { config, pkgs, user, ... }:
 
 let
-  theme = import ../theme;
+  theme = import ../modules/theme;
 in
 {
   imports = [
-    ../neovim
+    ../modules/emacs
-    ../ranger.nix
+    ../modules/fcitx5
-    ../fcitx5
+    ../modules/firefox
-    ../picom.nix
+    ../modules/git
-    ../i3.nix
+    ../modules/i3
-    ../polybar
+    ../modules/neovim
-    ../rofi
+    ../modules/picom
-    ../git.nix
+    ../modules/polybar
-    ../terminal.nix
+    ../modules/ranger
-    ../startpage
+    ../modules/rofi
-    ../firefox.nix
+    ../modules/startpage
-    ../emacs
+    ../modules/terminal
   ];
 
-  home.file."./.background-image".source = ../wallpapers/${theme.wallpaper};
+  home.file."./.background-image".source = ../modules/wallpapers/${theme.wallpaper};
 
   programs.home-manager.enable = true;
 

modules/emacs/default.nix

@@ -11,7 +11,7 @@
       git clone --depth 1 https://github.com/doomemacs/doomemacs .emacs.d
     fi
     mkdir -p .doom.d
-    ln -sf ${config.home.homeDirectory}/${configDir}/emacs/.doom.d/* .doom.d
+    ln -sf ${config.home.homeDirectory}/${configDir}/modules/emacs/.doom.d/* .doom.d
   '';
   home.file = {
     ".emacs.d/everforest".source = pkgs.fetchFromGitHub {

modules/firefox/default.nix

@@ -1,7 +1,7 @@
 { pkgs, user, ... }:
 
 let
-  startpageDir = import ./startpage/dir.nix;
+  startpageDir = import ../startpage/dir.nix;
   startpage = "file:///home/${user}/${startpageDir}/index.html";
   firefox-csshacks = pkgs.fetchFromGitHub {
     owner = "MrOtherGuy";

modules/i3/default.nix

@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:
 
 let
-  theme = import ./theme;
+  theme = import ../theme;
   mod = "Mod4";
 in with theme.colors; {
   # Dependencies

modules/terminal/default.nix

@@ -1,7 +1,7 @@
 { ... }:
 
 let
-  theme = import ./theme;
+  theme = import ../theme;
 in
 {
   programs.kitty = {