From c6be703e8b0010f2320591d080acbd77a9be3d4f Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 9 Nov 2023 16:55:01 -0600 Subject: [PATCH] Tmux stuff --- modules/home-manager/common.nix | 6 +-- modules/home-manager/tmux.nix | 5 +-- modules/home-manager/wezterm.nix | 67 +++++++++++++++----------------- 3 files changed, 36 insertions(+), 42 deletions(-) diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index 1073a19..46debea 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -90,9 +90,9 @@ # using good ol' fzf until skim sucks less out of the box I guess enable = true; enableFishIntegration = true; - defaultCommand = "fd --type f"; - defaultOptions = ["--height 40%"]; - fileWidgetOptions = ["--preview 'head {}'"]; + # defaultCommand = "fd --type f"; + # defaultOptions = ["--height 40%"]; + # fileWidgetOptions = ["--preview 'head {}'"]; }; programs.nix-index = { diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix index adc0190..baf04d5 100644 --- a/modules/home-manager/tmux.nix +++ b/modules/home-manager/tmux.nix @@ -11,6 +11,7 @@ unbind C-b set -g prefix C-s + # enable tmux to support helix colors set -g default-terminal "tmux-256color" set -g terminal-overrides ",xterm-256color:RGB" @@ -43,9 +44,7 @@ bind -n C-t new-window # tab nav is the default p and n binds - # window switcher is the default w bind - - bind s run "tmux split-window -l 12 'tmuxswitcher'" # session switcher + # window and session switcher is the default w bind set -g mouse on set -g escape-time 0 diff --git a/modules/home-manager/wezterm.nix b/modules/home-manager/wezterm.nix index 379aab5..913af08 100644 --- a/modules/home-manager/wezterm.nix +++ b/modules/home-manager/wezterm.nix @@ -152,11 +152,6 @@ } config.keys = { - { - key = 'j', - mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Down' - }, { key = 'Insert', mods = 'SHIFT', @@ -172,40 +167,40 @@ mods = 'CTRL|SHIFT', action = wezterm.action.SpawnTab'CurrentPaneDomain' }, - { - key = 'h', - mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Left' - }, - { - key = 'l', - mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Right' - }, - { - key = 'k', - mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Up' - }, - { - key = 'j', - mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Down' - }, + -- { + -- key = 'h', + -- mods = 'CTRL', + -- action = wezterm.action.ActivatePaneDirection'Left' + -- }, + -- { + -- key = 'l', + -- mods = 'CTRL', + -- action = wezterm.action.ActivatePaneDirection'Right' + -- }, + -- { + -- key = 'k', + -- mods = 'CTRL', + -- action = wezterm.action.ActivatePaneDirection'Up' + -- }, + -- { + -- key = 'j', + -- mods = 'CTRL', + -- action = wezterm.action.ActivatePaneDirection'Down' + -- }, + -- { + -- key = 'j', + -- mods = 'CTRL|SHIFT', + -- action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} + -- }, + -- { + -- key = 'l', + -- mods = 'CTRL|SHIFT', + -- action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} + -- }, { key = 'p', mods = 'CTRL|SHIFT', - action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} - }, - { - key = 'j', - mods = 'CTRL|SHIFT', - action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} - }, - { - key = 'l', - mods = 'CTRL|SHIFT', - action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} + action = wezterm.action.ActivateCommandPalette }, { key = 'l',