added 'roles', sets of installed programs.

hosts/archlaptop-vm/default.nix

@@ -87,7 +87,7 @@ inputs.nixpkgs.lib.nixosSystem {
           };
         };
         imports = [
-          ../../modules/home-manager/terminal
+          ../../roles/terminal.nix
           ../../modules/home-manager/nvim
           ../../modules/home-manager/common.nix
           ../../modules/home-manager/email.nix

hosts/gabe-archlaptop.nix

@@ -34,7 +34,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
       home.username = "gabe";
       home.homeDirectory = /home/gabe;
       imports = [
-        ../modules/home-manager/terminal
+        ../roles/terminal.nix
         ../modules/home-manager/nvim
         ../modules/home-manager/common.nix
         ../modules/home-manager/syncthing.nix

hosts/gabe-gv-workstation.nix

@@ -37,7 +37,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
       home.username = "gabe";
       home.homeDirectory = /home/gabe;
       imports = [
-        ../modules/home-manager/terminal
+        ../roles/terminal.nix
         ../modules/home-manager/nvim
         ../modules/home-manager/common.nix
         ../modules/home-manager/syncthing.nix

hosts/workstation-vm/default.nix

@@ -88,7 +88,7 @@ inputs.nixpkgs.lib.nixosSystem {
           };
         };
         imports = [
-          ../../modules/home-manager/terminal
+          ../../roles/terminal.nix
           ../../modules/home-manager/nvim
           ../../modules/home-manager/common.nix
           inputs.nixvim.homeManagerModules.nixvim

modules/home-manager/terminal/zsh.nix

@@ -30,7 +30,7 @@
         #select first item when you press tab the first time.
         setopt MENU_COMPLETE
       ''
-      (lib.mkif (!config.programs.starship.enable) ''
+      (lib.mkIf (!config.programs.starship.enable) ''
         autoload -U promptinit
         promptinit
         autoload -U colors

roles/minimal-terminal.nix

@@ -4,14 +4,18 @@
   lib,
   ...
 }: {
+  imports = [
+    ../modules/home-manager/terminal/zsh.nix
+    ../modules/home-manager/terminal/git.nix
+    ../modules/home-manager/terminal/zellij
+    ../modules/home-manager/terminal/ssh-agent.nix
+    ../modules/home-manager/terminal/direnv.nix
+  ];
   home.packages = with pkgs; [
     sshfs
     just
     fd
     sd
-    tre-command
-    diskonaut
-    hyperfine
     curl
   ];
 
@@ -37,25 +41,11 @@
     sshmnt = "sshfs -o idmap=user,compression=no,reconnect,follow_symlinks,dir_cache=yes,ServerAliveInterval=15";
   };
 
-  imports = [
-    ./nushell
-    ./zsh.nix
-    ./git.nix
-    ./starship.nix
-    ./voice.nix
-    ./zellij
-    ./tiny-irc.nix
-    ./ssh-agent.nix
-    ./direnv
-  ];
-
   programs = {
     yazi.enable = true;
-    zoxide.enable = true;
     fzf.enable = true;
     ripgrep.enable = true;
     bat.enable = true;
-    tealdeer.enable = true;
     btop.enable = true;
     man.enable = true;
   };

roles/terminal.nix

@@ -0,0 +1,38 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    ./minimal-terminal.nix
+    ../modules/home-manager/terminal/nushell
+    ../modules/home-manager/terminal/starship.nix
+    ../modules/home-manager/terminal/voice.nix
+    ../modules/home-manager/terminal/tiny-irc.nix
+  ];
+  home.packages = with pkgs; [
+    tre-command
+    diskonaut
+    hyperfine
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+  };
+
+  home.sessionVariables = {
+    PIPENV_VENV_IN_PROJECT = 1;
+    POETRY_VIRTUALENVS_IN_PROJECT = 1;
+  };
+
+  home.shellAliases = {
+    # doc2pdf = "loffice --convert-to-pdf --headless *.docx";
+  };
+
+  programs = {
+    zoxide.enable = true;
+    tealdeer.enable = true;
+  };
+}