From eea02abfcb3089362ae78adf8cfdf2faf6ec3d7c Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 7 Sep 2025 09:18:04 +0200 Subject: [PATCH] Simplification of home manager basic module --- instances/baldur/hm.nix | 2 +- instances/baldur/hm_tiziano.nix | 2 +- instances/freya/hm.nix | 2 +- instances/heimdall/hm.nix | 2 +- instances/loki/hm.nix | 2 +- instances/odin/hm.nix | 2 +- instances/odin/hm_tiziano.nix | 2 +- instances/sif/hm.nix | 2 +- instances/thor/hm.nix | 2 +- modules/hm/__basic.nix | 61 --------------------------------- modules/hm/combined/basics.nix | 25 ++++++++++++++ modules/hm/combined/minimal.nix | 43 +++++++++++++++++++++++ modules/hm/{exa.nix => eza.nix} | 0 13 files changed, 77 insertions(+), 70 deletions(-) delete mode 100644 modules/hm/__basic.nix create mode 100644 modules/hm/combined/basics.nix create mode 100644 modules/hm/combined/minimal.nix rename modules/hm/{exa.nix => eza.nix} (100%) diff --git a/instances/baldur/hm.nix b/instances/baldur/hm.nix index 162481c..da4d7e6 100644 --- a/instances/baldur/hm.nix +++ b/instances/baldur/hm.nix @@ -14,7 +14,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/minimal.nix # ../../modules/hm/development/cpp.nix # ../../modules/hm/development/data.nix diff --git a/instances/baldur/hm_tiziano.nix b/instances/baldur/hm_tiziano.nix index 0dc731c..c1c2726 100644 --- a/instances/baldur/hm_tiziano.nix +++ b/instances/baldur/hm_tiziano.nix @@ -12,7 +12,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/minimal.nix ../../modules/hm/shell_aliases.nix ]; diff --git a/instances/freya/hm.nix b/instances/freya/hm.nix index 779b76f..7ca5194 100644 --- a/instances/freya/hm.nix +++ b/instances/freya/hm.nix @@ -20,7 +20,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/minimal.nix ../../modules/hm/helix.nix ../../modules/hm/kitty.nix diff --git a/instances/heimdall/hm.nix b/instances/heimdall/hm.nix index 8a91331..add1703 100644 --- a/instances/heimdall/hm.nix +++ b/instances/heimdall/hm.nix @@ -20,7 +20,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/basics.nix ../../modules/hm/helix.nix ../../modules/hm/kitty.nix diff --git a/instances/loki/hm.nix b/instances/loki/hm.nix index 27e0ffc..39d4204 100644 --- a/instances/loki/hm.nix +++ b/instances/loki/hm.nix @@ -11,7 +11,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/basics.nix # ../../modules/hm/development/cpp.nix # ../../modules/hm/development/data.nix diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix index 9a5bb11..cdd6ecc 100644 --- a/instances/odin/hm.nix +++ b/instances/odin/hm.nix @@ -69,7 +69,7 @@ # }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/basics.nix # ../../modules/hm/development/cpp.nix # ../../modules/hm/development/data.nix diff --git a/instances/odin/hm_tiziano.nix b/instances/odin/hm_tiziano.nix index 898a8d8..f5c53fa 100644 --- a/instances/odin/hm_tiziano.nix +++ b/instances/odin/hm_tiziano.nix @@ -12,7 +12,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/basics.nix ../../modules/hm/syncthing_tiziano.nix diff --git a/instances/sif/hm.nix b/instances/sif/hm.nix index ae6d52a..2209618 100644 --- a/instances/sif/hm.nix +++ b/instances/sif/hm.nix @@ -64,7 +64,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/basics.nix # ../../modules/hm/development/cpp.nix # ../../modules/hm/development/database.nix diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index a0aa618..db580a7 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -68,7 +68,7 @@ }; imports = [ - ../../modules/hm/__basic.nix + ../../modules/hm/combined/basics.nix # ../../modules/hm/development/cpp.nix # ../../modules/hm/development/database.nix diff --git a/modules/hm/__basic.nix b/modules/hm/__basic.nix deleted file mode 100644 index cf194d6..0000000 --- a/modules/hm/__basic.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ pkgs, ... }: -{ - services.home-manager.autoExpire = { - enable = true; - frequency = "daily"; - timestamp = "-7 days"; - }; - - home = { - language.base = "it_IT.UTF-8"; - packages = builtins.attrValues { - inherit (pkgs) - fastfetch - file - mmv-go - pv - unrar - unzip - wget - zip - ; - }; - }; - - programs = { - bottom.enable = true; - ripgrep.enable = true; - fd = { enable = true; hidden = true; }; - }; - - imports = [ - ./configurations.nix - - ./bash.nix - # ./bat.nix - # ./bottom.nix - # ./broot.nix - # ./dircolors.nix - ./direnv.nix - # ./exa.nix - ./lsd.nix - ./fzf.nix - ./git.nix - ./gpg.nix - ./info.nix - # ./jq.nix - # ./joshuto.nix - ./keychain.nix - # ./lf.nix - ./man.nix - # ./ntfy.nix - ./shell_aliases.nix - ./ssh.nix - ./starship.nix - ./tmux.nix - ./yazi.nix - ./zellij.nix - ./zoxide.nix - ./zsh.nix - ]; -} diff --git a/modules/hm/combined/basics.nix b/modules/hm/combined/basics.nix new file mode 100644 index 0000000..cc5a228 --- /dev/null +++ b/modules/hm/combined/basics.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: { + imports = [ + ./minimal.nix + + ../direnv.nix + ../fzf.nix + ../info.nix + ../man.nix + ../starship.nix + ../tmux.nix + ../yazi.nix + ]; + + home = { + language.base = "it_IT.UTF-8"; + packages = builtins.attrValues { + inherit (pkgs) + fastfetch + pv + ; + }; + }; + +} + diff --git a/modules/hm/combined/minimal.nix b/modules/hm/combined/minimal.nix new file mode 100644 index 0000000..3f83455 --- /dev/null +++ b/modules/hm/combined/minimal.nix @@ -0,0 +1,43 @@ +{ pkgs, ... }: { + imports = [ + ../configurations.nix + + ../bash.nix + ../bottom.nix + ../git.nix + ../gpg.nix + ../keychain.nix + ../lsd.nix + ../shell_aliases.nix + ../ssh.nix + ../zellij.nix + ../zoxide.nix + ../zsh.nix + ]; + + home = { + language.base = "it_IT.UTF-8"; + packages = builtins.attrValues { + inherit (pkgs) + fastfetch + file + unrar + unzip + wget + zip + ; + }; + }; + + programs = { + ripgrep.enable = true; + fd = { enable = true; hidden = true; }; + }; + + services.home-manager.autoExpire = { + enable = true; + frequency = "daily"; + timestamp = "-7 days"; + }; +} + diff --git a/modules/hm/exa.nix b/modules/hm/eza.nix similarity index 100% rename from modules/hm/exa.nix rename to modules/hm/eza.nix