diff --git a/common/modules/bash/programs.nix b/common/modules/bash/programs.nix index e5143c2b..1007f491 100644 --- a/common/modules/bash/programs.nix +++ b/common/modules/bash/programs.nix @@ -1,3 +1,5 @@ +# Home-manager module + { pkgs, ... }: { programs = { fzf = { diff --git a/common/modules/tmux.nix b/common/modules/tmux.nix index 82a73c2c..569c1522 100644 --- a/common/modules/tmux.nix +++ b/common/modules/tmux.nix @@ -1,9 +1,12 @@ +# Home-manager module + { pkgs, ... }: { programs = { tmux = { enable = true; + mouse = true; keyMode = "vi"; - terminal = "screen-256color"; + terminal = "tmux-256color"; newSession = true; historyLimit = 30000; @@ -14,10 +17,11 @@ extraConfig = '' bind-key -n Home send Escape "OH" bind-key -n End send Escape "OF" - set -g mouse on - set -ga terminal-overrides ',xterm*:smcup@:rmcup@' bind -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M" bind -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M" + + set -ga terminal-overrides ',xterm*:smcup@:rmcup@' + set -ga terminal-overrides ",*256col*:Tc" ''; }; }; diff --git a/modules/alacritty.nix b/modules/alacritty.nix index 00877c48..fb763c68 100644 --- a/modules/alacritty.nix +++ b/modules/alacritty.nix @@ -1,11 +1,14 @@ # Home-manager module -{ lib, config, ... }: { +{ config, ... }: { programs.alacritty = { enable = true; settings = { env = { POKE = "true"; + + # fix wrong colors in tmux + TERM = "xterm-256color"; }; key_bindings = [