From d35cfbc580f475758d5055382b2a346034bfae8f Mon Sep 17 00:00:00 2001
From: Mike Vink <mike.vink@stater.nl>
Date: Mon, 22 May 2023 15:26:22 +0000
Subject: tmux fixes

---
 home.nix            | 14 ++++++++------
 shell-scripts/nixup |  0
 2 files changed, 8 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 shell-scripts/nixup

diff --git a/home.nix b/home.nix
index ed0750e..d44ae69 100644
--- a/home.nix
+++ b/home.nix
@@ -19,6 +19,7 @@
   home.sessionPath = [
     "${config.home.homeDirectory}/.krew/bin"
     "${config.home.homeDirectory}/.cargo/bin"
+    "${pkgs.ncurses}/bin"
   ];
 
   programs.starship.enable = false;
@@ -50,7 +51,7 @@
     extraConfig = ''
       set-option -g default-shell ${pkgs.bashInteractive}/bin/bash
       set -s set-clipboard on
-      set -g default-terminal "tmux-256color"
+      set -g default-terminal "xterm-256color"
       set-option -sa terminal-overrides ",xterm-256color:RGB"
       set-option -g focus-events on
       set-option -sg escape-time 10
@@ -65,10 +66,10 @@
 
       set-hook -g pane-focus-in 'run-shell "[[ \"$(tmux display-message -p #{pane_in_mode})\" -eq 0 ]] || tmux send-keys -X cancel"'
       bind-key -T copy-mode-vi C-w switch-client -T splits
-      bind-key -T splits j select-pane -t '{down-of}'
-      bind-key -T splits k select-pane -t '{up-of}'
-      bind-key -T splits h select-pane -t '{left-of}'
-      bind-key -T splits l select-pane -t '{right-of}'
+      bind-key -T splits j send -X cancel\; select-pane -t '{down-of}'
+      bind-key -T splits k send -X cancel\; select-pane -t '{up-of}'
+      bind-key -T splits h send -X cancel\; select-pane -t '{left-of}'
+      bind-key -T splits l send -X cancel\; select-pane -t '{right-of}'
     '';
   };
 
@@ -83,9 +84,10 @@
       [[ -f ~/.nix-profile/etc/profile.d/nix.sh ]] && . ~/.nix-profile/etc/profile.d/nix.sh
       # source some workspace specific stuff
       [[ -f ~/env.sh ]] && . ~/env.sh
+      export COLORTERM=truecolor
     '';
     shellAliases = {
-      k9s = "COLORTERM=truecolor k9s";
+      k9s = "k9s";
       k = "kubectl ";
       d = "docker ";
       ls = "ls --color=auto";
diff --git a/shell-scripts/nixup b/shell-scripts/nixup
old mode 100644
new mode 100755
-- 
cgit v1.2.3