Flatten modules

flake-modules/packages.nix

@@ -10,7 +10,7 @@
         neovim = inputs'.nixvim.legacyPackages.makeNixvimWithModule {
           inherit pkgs;
 
-          module = import "${self}/modules/home-manager/coding/neovim/config";
+          module = import "${self}/modules/home-manager/neovim/config";
         };
       };
     };

modules/home-manager/browsers/firefox.nix

@@ -118,6 +118,24 @@ in
             privateDefault = "ddg";
           };
 
+          search.engines = {
+            # TODO: Drupal.org users.
+            # TODO: Mastodon.
+            # TODO: GitHub.
+            # TODO: Forgejo.
+            drupal_projects = {
+              name = "Drupal.org projects";
+              urls = [ { template = "https://www.drupal.org/project/{searchTerms}"; } ];
+              definedAliases = [ "@dp" ];
+            };
+
+            nixvim = {
+              name = "Nixvim options search";
+              urls = [ { template = "https://nix-community.github.io/nixvim/search/?query={searchTerms}"; } ];
+              definedAliases = [ "@nxv" ];
+            };
+          };
+
           settings = {
             "browser.search.isUS" = false;
             "browser.search.region" = "GB";

modules/home-manager/default.nix

@@ -1,31 +1,31 @@
 {
   imports = [
-    ./cli/bluetuith.nix
+    ./bluetuith.nix
-    ./cli/bookmarkthis.nix
+    ./bookmarkthis.nix
-    ./cli/dev-commit.nix
+    ./browsers/chromium.nix
-    ./cli/direnv.nix
+    ./browsers/firefox.nix
-    ./cli/fzf.nix
+    ./browsers/qutebrowser.nix
-    ./cli/git.nix
+    ./dev-commit.nix
-    ./cli/node.nix
+    ./direnv.nix
-    ./cli/notes.nix
+    ./flameshot.nix
-    ./cli/ranger.nix
+    ./fzf.nix
-    ./cli/starship.nix
+    ./git.nix
-    ./cli/sxhkd.nix
+    ./gnupg.nix
-    ./cli/tmux-sessionizer.nix
+    ./gtk.nix
-    ./cli/tmux.nix
+    ./media/handbrake.nix
-    ./cli/zsh
+    ./media/makemkv.nix
-    ./coding/neovim
+    ./media/mpv.nix
-    ./coding/phpactor
+    ./neovim
-    ./core/gnupg.nix
+    ./node.nix
-    ./desktop/browsers/chromium.nix
+    ./notes.nix
-    ./desktop/browsers/firefox.nix
+    ./phpactor
-    ./desktop/browsers/qutebrowser.nix
+    ./ranger.nix
-    ./desktop/flameshot.nix
+    ./redshift.nix
-    ./desktop/gtk.nix
+    ./screenkey.nix
-    ./desktop/media/handbrake.nix
+    ./starship.nix
-    ./desktop/media/makemkv.nix
+    ./sxhkd.nix
-    ./desktop/media/mpv.nix
+    ./tmux-sessionizer.nix
-    ./desktop/redshift.nix
+    ./tmux.nix
-    ./desktop/screenkey.nix
+    ./zsh
   ];
 }

modules/nixos/default.nix

@@ -1,28 +1,24 @@
 {
   imports = [
-    ./cli/docker.nix
+    ./avahi.nix
-    ./cli/kanata.nix
+    ./bluetooth.nix
-    ./cli/podman.nix
+    ./dconf.nix
-    ./cli/password-store.nix
+    ./docker.nix
-
+    ./dwm
-    ./core/avahi.nix
+    ./fonts.nix
-    ./core/bluetooth.nix
+    ./gitea-actions-runner.nix
-    ./core/gnupg.nix
+    ./gnupg.nix
-    ./core/openssh.nix
+    ./kanata.nix
-    ./core/pipewire.nix
+    ./media
-    ./core/xbanish.nix
-    ./core/zram.nix
-
-    ./desktop/dconf.nix
-    ./desktop/dwm
-    ./desktop/fonts.nix
-    ./desktop/media
-    ./desktop/st.nix
-    ./desktop/thunar.nix
-
-    ./homelab/gitea-actions-runner.nix
-
     ./nix-index.nix
     ./nixpad
+    ./openssh.nix
+    ./password-store.nix
+    ./pipewire.nix
+    ./podman.nix
+    ./st.nix
+    ./thunar.nix
+    ./xbanish.nix
+    ./zram.nix
   ];
 }