From 101c9d55c74c8f92de44f8a984e5fb1fb4df865a Mon Sep 17 00:00:00 2001 From: EinEtwas Date: Sat, 26 Oct 2024 18:33:41 +0200 Subject: [PATCH] refactor: modularize the rest of the home modules; move agenix to system modules --- home/default.nix | 17 ++++------------- home/essentials/default.nix | 8 ++++++++ home/{ => essentials}/git.nix | 0 home/{ => essentials}/keyring.nix | 0 home/{ => essentials}/ssh.nix | 0 home/{ => essentials}/zsh.nix | 0 home/misc_pkgs/default.nix | 6 ++++++ home/{ => misc_pkgs}/packages.nix | 0 home/{ => misc_pkgs}/spicetify.nix | 0 home/{ => utils}/blueman.nix | 0 home/{ => utils}/btop/default.nix | 3 ++- .../btop/themes/catppuccin_mocha.theme | 0 home/utils/default.nix | 9 +++++++++ home/{ => utils}/direnv.nix | 0 home/{ => utils}/easyeffects.nix | 0 home/{ => utils}/udiskie.nix | 0 {home => modules}/agenix.nix | 0 modules/default.nix | 1 + 18 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 home/essentials/default.nix rename home/{ => essentials}/git.nix (100%) rename home/{ => essentials}/keyring.nix (100%) rename home/{ => essentials}/ssh.nix (100%) rename home/{ => essentials}/zsh.nix (100%) create mode 100644 home/misc_pkgs/default.nix rename home/{ => misc_pkgs}/packages.nix (100%) rename home/{ => misc_pkgs}/spicetify.nix (100%) rename home/{ => utils}/blueman.nix (100%) rename home/{ => utils}/btop/default.nix (99%) rename home/{ => utils}/btop/themes/catppuccin_mocha.theme (100%) create mode 100644 home/utils/default.nix rename home/{ => utils}/direnv.nix (100%) rename home/{ => utils}/easyeffects.nix (100%) rename home/{ => utils}/udiskie.nix (100%) rename {home => modules}/agenix.nix (100%) diff --git a/home/default.nix b/home/default.nix index 22bf2aa..74fe327 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,7 +4,6 @@ inputs.home-manager.nixosModules.home-manager inputs.catppuccin.nixosModules.catppuccin inputs.spicetify-nix.nixosModules.default - ./agenix.nix ]; home-manager = { @@ -35,19 +34,11 @@ inputs.spicetify-nix.homeManagerModules.default inputs.nix-index-database.hmModules.nix-index inputs.agenix.homeManagerModules.age + ] ++ [ ./desktop - ./git.nix - ./btop - ./easyeffects.nix - ./packages.nix - ./alacritty.nix - ./zsh.nix - ./spicetify.nix - ./udiskie.nix - ./keyring.nix - ./ssh.nix - ./blueman.nix - ./direnv.nix + ./essentials + ./utils + ./misc_pkgs ]; home.pointerCursor = { diff --git a/home/essentials/default.nix b/home/essentials/default.nix new file mode 100644 index 0000000..242aa6c --- /dev/null +++ b/home/essentials/default.nix @@ -0,0 +1,8 @@ +{ age, config, ... }: { + imports = [ + ./git.nix + ./keyring.nix + ./ssh.nix + ./zsh.nix + ]; +} diff --git a/home/git.nix b/home/essentials/git.nix similarity index 100% rename from home/git.nix rename to home/essentials/git.nix diff --git a/home/keyring.nix b/home/essentials/keyring.nix similarity index 100% rename from home/keyring.nix rename to home/essentials/keyring.nix diff --git a/home/ssh.nix b/home/essentials/ssh.nix similarity index 100% rename from home/ssh.nix rename to home/essentials/ssh.nix diff --git a/home/zsh.nix b/home/essentials/zsh.nix similarity index 100% rename from home/zsh.nix rename to home/essentials/zsh.nix diff --git a/home/misc_pkgs/default.nix b/home/misc_pkgs/default.nix new file mode 100644 index 0000000..1fc6c2f --- /dev/null +++ b/home/misc_pkgs/default.nix @@ -0,0 +1,6 @@ +{ agenix, config, inputs, pkgs, spicetify-nix, ... }: { + imports = [ + ./packages.nix + ./spicetify.nix + ]; +} diff --git a/home/packages.nix b/home/misc_pkgs/packages.nix similarity index 100% rename from home/packages.nix rename to home/misc_pkgs/packages.nix diff --git a/home/spicetify.nix b/home/misc_pkgs/spicetify.nix similarity index 100% rename from home/spicetify.nix rename to home/misc_pkgs/spicetify.nix diff --git a/home/blueman.nix b/home/utils/blueman.nix similarity index 100% rename from home/blueman.nix rename to home/utils/blueman.nix diff --git a/home/btop/default.nix b/home/utils/btop/default.nix similarity index 99% rename from home/btop/default.nix rename to home/utils/btop/default.nix index 20fed9e..afde79c 100644 --- a/home/btop/default.nix +++ b/home/utils/btop/default.nix @@ -5,9 +5,10 @@ # replacement of htop/nmon programs.btop = { enable = true; + settings = { color_theme = "catppuccin_mocha"; theme_background = true; }; }; -} \ No newline at end of file +} diff --git a/home/btop/themes/catppuccin_mocha.theme b/home/utils/btop/themes/catppuccin_mocha.theme similarity index 100% rename from home/btop/themes/catppuccin_mocha.theme rename to home/utils/btop/themes/catppuccin_mocha.theme diff --git a/home/utils/default.nix b/home/utils/default.nix new file mode 100644 index 0000000..6c61496 --- /dev/null +++ b/home/utils/default.nix @@ -0,0 +1,9 @@ +{ services, ... }: { + imports = [ + ./btop + ./blueman.nix + ./direnv.nix + ./easyeffects.nix + ./udiskie.nix + ]; +} diff --git a/home/direnv.nix b/home/utils/direnv.nix similarity index 100% rename from home/direnv.nix rename to home/utils/direnv.nix diff --git a/home/easyeffects.nix b/home/utils/easyeffects.nix similarity index 100% rename from home/easyeffects.nix rename to home/utils/easyeffects.nix diff --git a/home/udiskie.nix b/home/utils/udiskie.nix similarity index 100% rename from home/udiskie.nix rename to home/utils/udiskie.nix diff --git a/home/agenix.nix b/modules/agenix.nix similarity index 100% rename from home/agenix.nix rename to modules/agenix.nix diff --git a/modules/default.nix b/modules/default.nix index 2ee3bd6..5387d22 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./agenix.nix ./configuration.nix ./hardware-configuration.nix ./fingerprint.nix