From ceb4bf3cde0619449fcfb51c819c0b12177e704d Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sun, 3 Nov 2024 10:33:32 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20refactor(home):=20Reorganize=20m?= =?UTF-8?q?odules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of having separate folders for each program with a default.nix inside, moved modules into programs/services/xorg respectively. Xdg was moved to the root home folder as it makes the most sense there. --- home/default.nix | 28 +++---------------- .../default.nix => programs/amfora.nix} | 0 home/{bat/default.nix => programs/bat.nix} | 0 home/{btop/default.nix => programs/btop.nix} | 0 home/{cava/default.nix => programs/cava.nix} | 0 home/{curl/default.nix => programs/curl.nix} | 0 home/programs/default.nix | 26 +++++++++++++++++ home/{eza/default.nix => programs/eza.nix} | 0 home/{fish/default.nix => programs/fish.nix} | 0 home/{gh/default.nix => programs/gh.nix} | 0 .../default.nix => programs/hyfetch.nix} | 0 .../default.nix => programs/lazygit.nix} | 0 home/{less/default.nix => programs/less.nix} | 0 home/{man/default.nix => programs/man.nix} | 0 .../default.nix => programs/ncmpcpp.nix} | 0 .../default.nix => programs/neofetch.nix} | 0 .../default.nix => programs/starship.nix} | 0 home/{tmux/default.nix => programs/tmux.nix} | 0 .../default.nix => programs/topgrade.nix} | 0 .../default.nix => programs/wezterm.nix} | 0 home/{wget/default.nix => programs/wget.nix} | 0 .../default.nix => programs/zathura.nix} | 0 .../default.nix => programs/zoxide.nix} | 0 home/services/default.nix | 6 ++++ .../default.nix => services/syncthing.nix} | 0 home/{xdg/default.nix => xdg.nix} | 0 home/xorg/default.nix | 6 ++++ .../default.nix => xorg/xsession.nix} | 0 28 files changed, 42 insertions(+), 24 deletions(-) rename home/{amfora/default.nix => programs/amfora.nix} (100%) rename home/{bat/default.nix => programs/bat.nix} (100%) rename home/{btop/default.nix => programs/btop.nix} (100%) rename home/{cava/default.nix => programs/cava.nix} (100%) rename home/{curl/default.nix => programs/curl.nix} (100%) create mode 100644 home/programs/default.nix rename home/{eza/default.nix => programs/eza.nix} (100%) rename home/{fish/default.nix => programs/fish.nix} (100%) rename home/{gh/default.nix => programs/gh.nix} (100%) rename home/{hyfetch/default.nix => programs/hyfetch.nix} (100%) rename home/{lazygit/default.nix => programs/lazygit.nix} (100%) rename home/{less/default.nix => programs/less.nix} (100%) rename home/{man/default.nix => programs/man.nix} (100%) rename home/{ncmpcpp/default.nix => programs/ncmpcpp.nix} (100%) rename home/{neofetch/default.nix => programs/neofetch.nix} (100%) rename home/{starship/default.nix => programs/starship.nix} (100%) rename home/{tmux/default.nix => programs/tmux.nix} (100%) rename home/{topgrade/default.nix => programs/topgrade.nix} (100%) rename home/{wezterm/default.nix => programs/wezterm.nix} (100%) rename home/{wget/default.nix => programs/wget.nix} (100%) rename home/{zathura/default.nix => programs/zathura.nix} (100%) rename home/{zoxide/default.nix => programs/zoxide.nix} (100%) create mode 100644 home/services/default.nix rename home/{syncthing/default.nix => services/syncthing.nix} (100%) rename home/{xdg/default.nix => xdg.nix} (100%) create mode 100644 home/xorg/default.nix rename home/{xsession/default.nix => xorg/xsession.nix} (100%) diff --git a/home/default.nix b/home/default.nix index ff34150..1c178e6 100644 --- a/home/default.nix +++ b/home/default.nix @@ -45,30 +45,10 @@ fonts.fontconfig.defaultFonts.monospace = [ "Maple Mono NF" ]; imports = [ - ./amfora - ./bat - ./btop - ./cava - ./curl - ./eza - ./fish - ./gh - ./hyfetch - ./lazygit - ./less - ./man - ./ncmpcpp - ./neofetch - ./starship - ./syncthing - ./tmux - ./topgrade - ./wget - ./wezterm - ./xdg - ./xsession - ./zathura - ./zoxide + ./programs + ./services + ./xdg.nix + ./xorg ]; # This value determines the Home Manager release that your configuration is diff --git a/home/amfora/default.nix b/home/programs/amfora.nix similarity index 100% rename from home/amfora/default.nix rename to home/programs/amfora.nix diff --git a/home/bat/default.nix b/home/programs/bat.nix similarity index 100% rename from home/bat/default.nix rename to home/programs/bat.nix diff --git a/home/btop/default.nix b/home/programs/btop.nix similarity index 100% rename from home/btop/default.nix rename to home/programs/btop.nix diff --git a/home/cava/default.nix b/home/programs/cava.nix similarity index 100% rename from home/cava/default.nix rename to home/programs/cava.nix diff --git a/home/curl/default.nix b/home/programs/curl.nix similarity index 100% rename from home/curl/default.nix rename to home/programs/curl.nix diff --git a/home/programs/default.nix b/home/programs/default.nix new file mode 100644 index 0000000..469a8c1 --- /dev/null +++ b/home/programs/default.nix @@ -0,0 +1,26 @@ +{ ... }: +{ + imports = [ + ./amfora.nix + ./bat.nix + ./btop.nix + ./cava.nix + ./curl.nix + ./eza.nix + ./fish.nix + ./gh.nix + ./hyfetch.nix + ./lazygit.nix + ./less.nix + ./man.nix + ./ncmpcpp.nix + ./neofetch.nix + ./starship.nix + ./tmux.nix + ./topgrade.nix + ./wget.nix + ./wezterm.nix + ./zathura.nix + ./zoxide.nix + ]; +} diff --git a/home/eza/default.nix b/home/programs/eza.nix similarity index 100% rename from home/eza/default.nix rename to home/programs/eza.nix diff --git a/home/fish/default.nix b/home/programs/fish.nix similarity index 100% rename from home/fish/default.nix rename to home/programs/fish.nix diff --git a/home/gh/default.nix b/home/programs/gh.nix similarity index 100% rename from home/gh/default.nix rename to home/programs/gh.nix diff --git a/home/hyfetch/default.nix b/home/programs/hyfetch.nix similarity index 100% rename from home/hyfetch/default.nix rename to home/programs/hyfetch.nix diff --git a/home/lazygit/default.nix b/home/programs/lazygit.nix similarity index 100% rename from home/lazygit/default.nix rename to home/programs/lazygit.nix diff --git a/home/less/default.nix b/home/programs/less.nix similarity index 100% rename from home/less/default.nix rename to home/programs/less.nix diff --git a/home/man/default.nix b/home/programs/man.nix similarity index 100% rename from home/man/default.nix rename to home/programs/man.nix diff --git a/home/ncmpcpp/default.nix b/home/programs/ncmpcpp.nix similarity index 100% rename from home/ncmpcpp/default.nix rename to home/programs/ncmpcpp.nix diff --git a/home/neofetch/default.nix b/home/programs/neofetch.nix similarity index 100% rename from home/neofetch/default.nix rename to home/programs/neofetch.nix diff --git a/home/starship/default.nix b/home/programs/starship.nix similarity index 100% rename from home/starship/default.nix rename to home/programs/starship.nix diff --git a/home/tmux/default.nix b/home/programs/tmux.nix similarity index 100% rename from home/tmux/default.nix rename to home/programs/tmux.nix diff --git a/home/topgrade/default.nix b/home/programs/topgrade.nix similarity index 100% rename from home/topgrade/default.nix rename to home/programs/topgrade.nix diff --git a/home/wezterm/default.nix b/home/programs/wezterm.nix similarity index 100% rename from home/wezterm/default.nix rename to home/programs/wezterm.nix diff --git a/home/wget/default.nix b/home/programs/wget.nix similarity index 100% rename from home/wget/default.nix rename to home/programs/wget.nix diff --git a/home/zathura/default.nix b/home/programs/zathura.nix similarity index 100% rename from home/zathura/default.nix rename to home/programs/zathura.nix diff --git a/home/zoxide/default.nix b/home/programs/zoxide.nix similarity index 100% rename from home/zoxide/default.nix rename to home/programs/zoxide.nix diff --git a/home/services/default.nix b/home/services/default.nix new file mode 100644 index 0000000..22bd2ff --- /dev/null +++ b/home/services/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ + ./syncthing.nix + ]; +} diff --git a/home/syncthing/default.nix b/home/services/syncthing.nix similarity index 100% rename from home/syncthing/default.nix rename to home/services/syncthing.nix diff --git a/home/xdg/default.nix b/home/xdg.nix similarity index 100% rename from home/xdg/default.nix rename to home/xdg.nix diff --git a/home/xorg/default.nix b/home/xorg/default.nix new file mode 100644 index 0000000..8b8e882 --- /dev/null +++ b/home/xorg/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ + ./xsession.nix + ]; +} diff --git a/home/xsession/default.nix b/home/xorg/xsession.nix similarity index 100% rename from home/xsession/default.nix rename to home/xorg/xsession.nix