Simplification of home manager basic module

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

instances/baldur/hm_tiziano.nix

@@ -12,7 +12,7 @@
   };
 
   imports = [
-    ../../modules/hm/__basic.nix
+    ../../modules/hm/combined/minimal.nix
 
     ../../modules/hm/shell_aliases.nix
   ];

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

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

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

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

instances/odin/hm_tiziano.nix

@@ -12,7 +12,7 @@
   };
 
   imports = [
-    ../../modules/hm/__basic.nix
+    ../../modules/hm/combined/basics.nix
 
     ../../modules/hm/syncthing_tiziano.nix
 

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

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

modules/hm/__basic.nix

@@ -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
-  ];
-}

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
+        ;
+    };
+  };
+
+}
+

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";
+  };
+}
+