diff --git a/flake.lock b/flake.lock index 2172af4..edbe36d 100644 --- a/flake.lock +++ b/flake.lock @@ -213,11 +213,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement" }, "locked": { - "lastModified": 1715144933, - "narHash": "sha256-SWiw7Xl6vnr0rjWT3udjSGtT4PHkwg3offCMUqhLFAU=", + "lastModified": 1715145530, + "narHash": "sha256-CnBbrXDNvYsXj8+TB+W28xX9e91qltvLq6ZoY4QVxrQ=", "owner": "RingOfStorms", "repo": "nvim", - "rev": "ecdf25794562cd47ef7ca143af93c4f6b7d4ae9e", + "rev": "6ed90eafb4b4d009d58dd11987021dab7e5b75d6", "type": "github" }, "original": { diff --git a/users/josh/home_manager/tmux/tmux-reset.conf b/users/josh/home_manager/tmux/tmux-reset.conf index 58953c6..751657a 100644 --- a/users/josh/home_manager/tmux/tmux-reset.conf +++ b/users/josh/home_manager/tmux/tmux-reset.conf @@ -8,10 +8,8 @@ bind -r n next-window bind -r & kill-window bind -r c new-window -c "#{pane_current_path}" bind ',' command-prompt "rename-window %%" -# Defaults are % and " which is weird and I cannot seem to remember them so using my normal | and \ -bind -r "\\" split-window -v -c "#{pane_current_path}" -bind -r "|" split-window -h -c "#{pane_current_path}" -# bind "'" command-prompt -T window-target -p index { select-window it ":%%" } +bind "\|" split-window -h -c "#{pane_current_path}" +bind "\\" split-window -v -c "#{pane_current_path}" bind w choose-tree -Zw bind -r 1 select-window -t:1 bind -r 2 select-window -t:2 @@ -35,9 +33,8 @@ bind -r down select-pane -D bind -r up select-pane -U bind -r right select-pane -R bind -r x kill-pane -bind z resize-pane -Z -# custom -bind e select-layout tiled +bind -r space resize-pane -Z +bind S select-layout tiled bind -r h select-pane -L bind -r j select-pane -D bind -r k select-pane -U @@ -52,13 +49,13 @@ bind -r ( switch-client -p bind C command-prompt -p "session name:" "new-session -s '%%'" # Tmux util -bind X source-file ~/.config/tmux/tmux.conf bind : command-prompt bind C-D detach + # ========== # My options set-option -g terminal-overrides ',xterm-256color:RGB' set -g detach-on-destroy off set -g renumber-windows on set -g status-position top -set -sg escape-time 10 +set -sg escape-time 0 diff --git a/users/josh/home_manager/tmux/tmux.nix b/users/josh/home_manager/tmux/tmux.nix index 8dcb8ae..507441a 100644 --- a/users/josh/home_manager/tmux/tmux.nix +++ b/users/josh/home_manager/tmux/tmux.nix @@ -18,21 +18,12 @@ in baseIndex = 1; mouse = true; keyMode = "vi"; - newSession = true; shell = "${pkgs.zsh}/bin/zsh"; terminal = "screen-256color"; aggressiveResize = true; + sensibleOnTop = false; plugins = [ - tmux.yank - # tmux.tmux-thumbs - # { - # plugin = tmux.fzf-tmux-url; - # extraConfig = '' - # set -g @fzf-url-fzf-options '-p 60%,30% --prompt = " " - -border-label=" Open URL "' - # set -g @fzf-url-history-limit '2000' - # ''; - # } { plugin = tmux.catppuccin.overrideAttrs (_: { src = pkgs.fetchFromGitHub {