re-organize home-modules

flake.nix

@@ -89,7 +89,7 @@
         )
         inputs.plasma-manager.homeManagerModules.plasma-manager
         inputs.sops-nix.homeManagerModules.sops
-        ./home/jonas/home.nix
+        ./home/jonas.nix
       ];
 
       # Optionally use extraSpecialArgs

home/jonas.nix

@@ -4,21 +4,21 @@
   ...
 }: rec {
   imports = [
-    ./borg.nix
-    ./doom.nix
-    ./dunst
-    ./firefox.nix
-    ./hyprland
-    ./kitty
-    ./ranger
-    ./ssh.nix
-    ./themes/gtk
-    ./themes/qt
-    ./waybar
-    ./wlogout
-    ./wofi
-    ./yubikey.nix
-    ./zsh.nix
+    ../modules/home/borg.nix
+    ../modules/home/doom
+    ../modules/home/dunst
+    ../modules/home/firefox.nix
+    ../modules/home/hyprland
+    ../modules/home/kitty
+    ../modules/home/ranger
+    ../modules/home/ssh.nix
+    ../modules/home/themes/gtk
+    ../modules/home/themes/qt
+    ../modules/home/waybar
+    ../modules/home/wlogout
+    ../modules/home/wofi
+    ../modules/home/yubikey.nix
+    ../modules/home/zsh
   ];
 
   # Home Manager needs a bit of information about you and the paths it should

modules/home/doom/default.nix

@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./doom.nix
+  ];
+}

modules/home/doom/doom.nix

@@ -111,17 +111,17 @@ in {
     enable = true;
     configFile = {
       "doom-config/splash.png" = {
-        source = ./static/doom-config/splash.png;
+        source = ./static/splash.png;
       };
       "doom-config/config.el" = {
-        source = ./static/doom-config/config.el;
+        source = ./static/config.el;
       };
       "doom-config/init.el" = {
-        source = ./static/doom-config/init.el;
+        source = ./static/init.el;
         onChange = "${doom-setup} sync --force -e";
       };
       "doom-config/packages.el" = {
-        source = ./static/doom-config/packages.el;
+        source = ./static/packages.el;
         onChange = "${doom-setup} sync --force -u -e";
       };
       "doom-emacs" = {
@@ -136,7 +136,7 @@ in {
       emacs = {
         name = "Doom Emacs";
         genericName = "Text Editor";
-        icon = ./static/doom-config/icon.png;
+        icon = ./static/icon.png;
         exec = "${wrapped-emacs}/bin/emacs %F";
         terminal = false;
         categories = ["Application" "Development" "TextEditor"];
@@ -148,7 +148,7 @@ in {
       emacsclient = {
         name = "Doom Emacs (Client)";
         genericName = "Text Editor";
-        icon = ./static/doom-config/icon.png;
+        icon = ./static/icon.png;
         exec = ''
           sh -c "if [ -n \\"\\$*\\" ]; then exec ${wrapped-emacs}/bin/emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" \\"\\$@\\"; else exec emacsclient --alternate-editor= --create-frame; fi" sh %F
         '';

modules/home/hyprland/hyprland.nix

@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }: {
@@ -17,7 +16,7 @@
     enable = true;
     settings = {
       default = {
-        path = ../static/wallpaper/stones.jpg;
+        path = ../../../static/wallpaper/stones.jpg;
       };
     };
   };

modules/home/kitty/config.nix

@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }: {

modules/home/kitty/kitty.nix

@@ -1,6 +1,4 @@
 {
-  config,
-  pkgs,
   ...
 }: {
   programs.kitty.enable = true;

modules/home/ssh.nix

@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   ...
 }: let
   sshKeys = name: {

modules/home/yubikey.nix

@@ -9,7 +9,7 @@
     mutableTrust = false;
     publicKeys = [
       {
-        source = ./static/keys/my_pub.asc;
+        source = ../../static/keys/my_pub.asc;
         trust = "ultimate";
       }
     ];

modules/home/zsh/default.nix

@@ -0,0 +1,7 @@
+{
+  ...
+}: {
+  imports = [
+    ./zsh.nix
+  ];
+}

modules/home/zsh/zsh.nix

@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   ...
 }: let
   omz_custom = "${config.home.homeDirectory}/.config/omz_custom";