Organise NixOS and Home Manager modules

home/opdavies/desktop.nix

@@ -6,13 +6,13 @@
 }:
 {
   imports = [
-    ./modules/alacritty.nix
-    ./modules/copyq.nix
-    ./modules/desktop/bluetuith.nix
-    ./modules/espanso.nix
-    ./modules/gtk.nix
-    ./modules/flameshot.nix
-    ./modules/gtk.nix
-    ./modules/mpv.nix
+    ../../modules/home-manager/alacritty.nix
+    ../../modules/home-manager/copyq.nix
+    ../../modules/home-manager/bluetuith.nix
+    ../../modules/home-manager/espanso.nix
+    ../../modules/home-manager/gtk.nix
+    ../../modules/home-manager/flameshot.nix
+    ../../modules/home-manager/gtk.nix
+    ../../modules/home-manager/mpv.nix
   ];
 }

lib/nixos/default.nix

@@ -41,7 +41,7 @@ inputs.nixpkgs.lib.nixosSystem {
       };
     }
 
-    (import ./modules/awesome.nix {
+    (import ../../modules/nixos/awesome.nix {
       inherit
         inputs
         pkgs
@@ -49,8 +49,8 @@ inputs.nixpkgs.lib.nixosSystem {
         username
         ;
     })
-    (import ./modules/autorandr.nix)
-    (import ./modules/gnome.nix)
+    (import ../../modules/nixos/autorandr.nix)
+    (import ../../modules/nixos/gnome.nix)
 
     configuration
     hardwareConfiguration

lib/shared/home-manager.nix

@@ -16,19 +16,19 @@
   programs.home-manager.enable = true;
 
   imports = [
-    (import ./modules/git.nix { inherit inputs pkgs; })
-    (import ./modules/neovim.nix { inherit inputs pkgs; })
-    ./modules/bat.nix
-    ./modules/bin.nix
-    ./modules/direnv.nix
-    ./modules/fzf.nix
-    ./modules/lsd.nix
-    ./modules/pet.nix
-    ./modules/phpactor.nix
-    ./modules/ripgrep.nix
-    ./modules/syncthing.nix
-    ./modules/tmux.nix
-    ./modules/zellij.nix
-    ./modules/zsh.nix
+    (import ../../modules/home-manager/git.nix { inherit inputs pkgs; })
+    (import ../../modules/home-manager/neovim.nix { inherit inputs pkgs; })
+    ../../modules/home-manager/bat.nix
+    ../../modules/home-manager/bin.nix
+    ../../modules/home-manager/direnv.nix
+    ../../modules/home-manager/fzf.nix
+    ../../modules/home-manager/lsd.nix
+    ../../modules/home-manager/pet.nix
+    ../../modules/home-manager/phpactor.nix
+    ../../modules/home-manager/ripgrep.nix
+    ../../modules/home-manager/syncthing.nix
+    ../../modules/home-manager/tmux.nix
+    ../../modules/home-manager/zellij.nix
+    ../../modules/home-manager/zsh.nix
   ];
 }

todo.txt

@@ -1,3 +1,4 @@
+Use nixosModules and homeManagerModules outputs in flake.nix to simplify importing modules
 Add immich for photo hosting
 Use nginx for jellyfin, immich and gitea
 Add gitea for local Git hosting