home-manager: fill the gap between envs

5 files changed, 34 insertions, 16 deletions

diff --git a/.zshrc b/.zshrc
index 1356d14..668ae7c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -206,6 +206,10 @@ zstyle ':completion:*' ignore-parents parent pwd ..
 autoload -U zcalc
 autoload zed
 
+
+bindkey -e
+
+
 # Enable history completion
 autoload history-search-end
 zle -N history-beginning-search-backward-end history-search-end
@@ -288,9 +292,6 @@ HISTSIZE=1000000
 SAVEHIST=1000000
 
 
-bindkey -e
-
-
 function 256colors() {
     local code
     for code in {0..255}; do
diff --git a/home-manager/config/tmux/tmux.conf b/home-manager/config/tmux/tmux.conf
index f6cfca8..b93f6d6 100644
--- a/home-manager/config/tmux/tmux.conf
+++ b/home-manager/config/tmux/tmux.conf
@@ -15,7 +15,6 @@ set-option -g focus-events on
 
 # TERMINAL FEATURES {{{2
 set-option -ga terminal-overrides ',tmux-256color:Tc'
-set-option -ga terminal-overrides ',alacritty:RGB'
 
 # APPEARANCE {{{2
 set-option -g status-justify left
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 7da79e7..e01feea 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -4,6 +4,8 @@ let
   homeDirectory = specialArgs.env.homeDirectory;
   clipboardCopyCommand = specialArgs.env.gui.clipboard.copyCommand;
   requiresWlClipboard = clipboardCopyCommand == "wl-copy";
+  terminalApp = specialArgs.env.gui.terminalApp;
+  useNixManagedZsh = specialArgs.env.useNixManagedZsh;
 in
 {
   home.username = username;
@@ -91,7 +93,7 @@ in
     aggressiveResize = true;
     baseIndex = 1;
     clock24 = true;
-    escapeTime = 0;
+    escapeTime = 5;
     historyLimit = 50000;
     mouse = false;
     prefix = "C-t";
@@ -100,14 +102,26 @@ in
     extraConfig =
       let
         commonConfig = builtins.readFile ./config/tmux/tmux.conf;
-        extraConfig = if clipboardCopyCommand != null then
-          ''
-            bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "${clipboardCopyCommand}"
-          ''
-        else
-          "";
+        clipboardConfig = if clipboardCopyCommand != null then
+                            ''
+                              bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "${clipboardCopyCommand}"
+                            ''
+                          else
+                            "";
+        terminalConfig = if terminalApp == "alacritty" then
+                           ''
+                             set-option -ga terminal-overrides ',alacritty:RGB'
+                           ''
+                         else
+                           "";
+        shellConfig = if useNixManagedZsh then
+                        ''
+                          set-option -g default-shell ${homeDirectory}/.nix-profile/bin/zsh
+                        ''
+                      else
+                        "";
       in
-      commonConfig + extraConfig;
+      commonConfig + clipboardConfig + terminalConfig + shellConfig;
   };
 
   programs.zsh = {
diff --git a/mitamae/node.hotaru.json b/mitamae/node.hotaru.json
index 0885bed..46b196d 100644
--- a/mitamae/node.hotaru.json
+++ b/mitamae/node.hotaru.json
@@ -10,8 +10,10 @@
       "gui": {
         "clipboard": {
           "copyCommand": null
-        }
-      }
+        },
+        "terminalApp": "windowsTerminal"
+      },
+      "useNixManagedZsh": true
     }
   }
 }
diff --git a/mitamae/node.pc168.json b/mitamae/node.pc168.json
index dfd3544..1e0f682 100644
--- a/mitamae/node.pc168.json
+++ b/mitamae/node.pc168.json
@@ -10,8 +10,10 @@
       "gui": {
         "clipboard": {
           "copyCommand": "pbcopy"
-        }
-      }
+        },
+        "terminalApp": "alacritty"
+      },
+      "useNixManagedZsh": false
     }
   }
 }