Combine shell definition expressions

Add emacs vterm package

flake.nix

@@ -188,7 +188,8 @@
                 username = user;
                 homeDirectory = "/home/${user}";
               in {
-                imports = [ ./hosts/${hostName}/home.nix ] ++ homeModules;
+                imports = [ ./hosts/${hostName}/home.nix ./home/default.nix ]
+                  ++ homeModules;
                 home = { inherit username homeDirectory stateVersion; };
                 programs.home-manager.enable = true;
                 xdg.userDirs = {

home/bash.nix

@@ -1,16 +0,0 @@
-{ ... }: {
-  programs = {
-    bash.enable = true;
-    readline = {
-      enable = true;
-      includeSystemConfig = true;
-      extraConfig = ''
-        set completion-ignore-case On
-      '';
-    };
-    direnv.enableBashIntegration = true;
-    fzf.enableBashIntegration = true;
-    keychain.enableBashIntegration = true;
-    starship.enableBashIntegration = true;
-  };
-}

home/default.nix

@@ -1,10 +1,9 @@
-{ ... }:
+{ config, pkgs, catppuccin-themes, ... }:
 
 {
   imports = [
     ./accounts.nix
     ./alacritty.nix
-    ./bash.nix
     ./emacs.nix
     ./firefox.nix
     ./fzf.nix
@@ -15,7 +14,61 @@
     ./starship.nix
     ./tmux.nix
     ./zathura.nix
-    ./zsh.nix
     ./hyprland/default.nix
   ];
+  home.packages = with pkgs; [ dig silver-searcher gnumake rink ];
+  programs = {
+    bash.enable = true;
+    readline = {
+      enable = true;
+      includeSystemConfig = true;
+      extraConfig = ''
+        set completion-ignore-case On
+      '';
+    };
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+      enableBashIntegration = true;
+      enableZshIntegration = true;
+    };
+    zsh = {
+      enable = true;
+      enableAutosuggestions = true;
+      enableCompletion = true;
+      syntaxHighlighting.enable = true;
+      enableVteIntegration = true;
+      autocd = true;
+      dotDir = ".config/zsh";
+      historySubstringSearch.enable = true;
+      history.path = "${config.xdg.dataHome}/zsh/history";
+      initExtraFirst = ''
+        source ${catppuccin-themes.zsh}
+      '';
+      initExtra = ''
+        xdg-query-program () {
+          FILETYPE=$(xdg-mime query filetype $@)
+          DEFAULT=$(xdg-mime query default $FILETYPE)
+          echo "$FILETYPE -> $DEFAULT"
+        }
+      '';
+      oh-my-zsh = {
+        enable = true;
+        plugins = [
+          # Productivity
+          "aliases"
+          "colored-man-pages"
+          "command-not-found"
+          "extract"
+          # Build tools
+          "git"
+          "gitignore"
+          # Misc
+          "lol"
+          "rand-quote"
+        ];
+        theme = "";
+      };
+    };
+  };
 }

home/emacs.nix

@@ -24,6 +24,7 @@ in {
     packages = with pkgs; [
       # Emacs dependencies
       emacsPackages.mu4e
+      emacsPackages.vterm
       coreutils
       gnutls
       ripgrep

home/fzf.nix

@@ -3,6 +3,8 @@
 {
   programs.fzf = {
     enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
     colors = {
       fg = "#cad3f5";
       bg = "#24273a";

home/ssh.nix

@@ -32,6 +32,8 @@
       enable = true;
       extraFlags = [ "--quiet" "--noask" "--ignore-missing" ];
       keys = [ "id_rsa" "id_ed25519" ];
+      enableBashIntegration = true;
+      enableZshIntegration = true;
       enableXsessionIntegration = true;
     };
   };

home/starship.nix

@@ -3,6 +3,8 @@
 {
   programs.starship = {
     enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
     settings = {
       inherit (builtins.fromTOML (builtins.readFile catppuccin-themes.starship))
         palettes;

home/zsh.nix

@@ -1,51 +0,0 @@
-{ config, pkgs, catppuccin-themes, ... }: {
-  home.packages = with pkgs; [ dig silver-searcher gnumake ];
-  programs = {
-    zsh = {
-      enable = true;
-      enableAutosuggestions = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      enableVteIntegration = true;
-      autocd = true;
-      dotDir = ".config/zsh";
-      historySubstringSearch.enable = true;
-      history.path = "${config.xdg.dataHome}/zsh/history";
-      initExtraFirst = ''
-        source ${catppuccin-themes.zsh}
-      '';
-      initExtra = ''
-        xdg-query-program () {
-          FILETYPE=$(xdg-mime query filetype $@)
-          DEFAULT=$(xdg-mime query default $FILETYPE)
-          echo "$FILETYPE -> $DEFAULT"
-        }
-      '';
-      oh-my-zsh = {
-        enable = true;
-        plugins = [
-          # Productivity
-          "aliases"
-          "colored-man-pages"
-          "command-not-found"
-          "extract"
-          # Build tools
-          "git"
-          "gitignore"
-          # Misc
-          "lol"
-          "rand-quote"
-        ];
-        theme = "";
-      };
-    };
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-      enableZshIntegration = true;
-    };
-    fzf.enableZshIntegration = true;
-    keychain.enableZshIntegration = true;
-    starship.enableZshIntegration = true;
-  };
-}