diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 5b07294..ac653a9 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,9 +1,3 @@ -# split panes using | and - -bind | split-window -h -bind - split-window -v -unbind '"' -unbind % - ############# ### THEME ### ############# @@ -19,39 +13,54 @@ set -g status-right-length 100 set -g status-right "#{E:@catppuccin_status_application}#{E:@catppuccin_status_session}" set -g status-left "" -get -g @catppuccin_pane_border_status "off" - ################ ### BINDINGS ### ################ -# r - RELOAD +## PREFIXED + +# r : RELOAD bind r source-file ~/.config/tmux/tmux.conf -# switch panes using Alt-arrow without prefix -bind -n M-Left select-pane -L -bind -n M-Right select-pane -R -bind -n M-Up select-pane -U -bind -n M-Down select-pane -D +# | : HORIZONTAL SPLIT +bind | split-window -h -unbind M-Left -unbind C-Left -unbind M-Right -unbind C-Right -unbind M-Up -unbind C-Up -unbind M-Down -unbind C-Down +# - : VERTICAL SPLIT +bind - split-window -v +# X : KILL PANE +bind X kill-pane + +# Alt-arrow : RESIZE 1 ROW bind M-Left resize-pane -L 1 \; switch-client -T prefix -bind C-Left resize-pane -L 5 \; switch-client -T prefix -bind M-Right resize-pane -R 1 \; switch-client -T prefix -bind C-Right resize-pane -R 5 \; switch-client -T prefix -bind M-Up resize-pane -U 1 \; switch-client -T prefix -bind C-Up resize-pane -U 5 \; switch-client -T prefix bind M-Down resize-pane -D 1 \; switch-client -T prefix -bind C-Down resize-pane -D 5 \; switch-client -T prefix +bind M-Up resize-pane -U 1 \; switch-client -T prefix +bind M-Right resize-pane -R 1 \; switch-client -T prefix +# C-arrow : RESIZE 5 ROWS +bind C-Left resize-pane -L 5 \; switch-client -T prefix +bind C-Down resize-pane -D 5 \; switch-client -T prefix +bind C-Up resize-pane -U 5 \; switch-client -T prefix +bind C-Right resize-pane -R 5 \; switch-client -T prefix + +bind M-m select-pane -l + +## UNPREFIXED + +# Alt-arrow : SWITCH PANES +bind -n M-Left select-pane -L +bind -n M-Down select-pane -D +bind -n M-Up select-pane -U +bind -n M-Right select-pane -R + +# Alt-hjkl : SWITCH PANES +bind -n M-h select-pane -L +bind -n M-j select-pane -D +bind -n M-k select-pane -U +bind -n M-l select-pane -R + +# Alt-z : FULL SCREEN +bind -n M-z resize-pane -Z ################ ### SETTINGS ### @@ -70,3 +79,22 @@ set -g visual-silence off setw -g monitor-activity off set -g bell-action none +## Vi mode copying + +# Enable Vi keybindings in copy mode +set-window-option -g mode-keys vi + +# Bind 'v' to start selection in copy mode +bind-key -T copy-mode-vi v send -X begin-selection + +# Bind 'y' to copy the selection to the system clipboard +bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel + +# Bind 'Y' to copy the entire buffer to the system clipboard +bind-key -T copy-mode-vi Y send -X copy-pipe-and-cancel + +################## +### LOCAL CONF ### +################## + +if-shell "[ -f ~/.config/tmux/local.tmux.conf ]" "source-file ~/.config/tmux/local.tmux.conf" diff --git a/.gitignore b/.gitignore index af4f2ca..78acf62 100644 --- a/.gitignore +++ b/.gitignore @@ -2,13 +2,18 @@ * # Except +!.config/hypr/* + +!.config/nvim/init.lua +!.config/nvim/lua/* + +!.config/tmux/* +.config/tmux/local.tmux.config + +!.config/waybar/* + !.gitignore +!.p10k.zsh !.zinit.zsh !.zshrc !.zstyle.zsh -!.config/hypr/* -!.config/nvim/init.lua -!.config/nvim/lua/* -!.config/tmux/* -!.config/waybar/* -!.p10k.zsh diff --git a/.zshrc b/.zshrc index 03aa1fb..7c4fc8b 100644 --- a/.zshrc +++ b/.zshrc @@ -34,10 +34,8 @@ export PATH=$N_PREFIX/bin:$PATH export SUDO_EDITOR="nvim" export EDITOR="nvim" export VISUAL="nvim" -export TERM="kitty" -export BROWSER="firefox" -HISTSIZE=1000 +HISTSIZE=10000 SAVEHIST=50000 HISTFILE=${XDG_STATE_HOME:-$HOME/.local/state}/.zsh_history @@ -46,4 +44,9 @@ HISTFILE=${XDG_STATE_HOME:-$HOME/.local/state}/.zsh_history ############### alias svim="sudo -E -s nvim" -alias config='/usr/bin/git --git-dir=$HOME/.git/ --work-tree=$HOME' +alias dots='/usr/bin/git --git-dir=$HOME/.git/ --work-tree=$HOME' +alias vim="nvim" +alias vi="nvim" +alias team="teamocil" + +[[ ! -f ~/.localrc.zsh ]] || source ~/.localrc.zsh diff --git a/.zstyle.zsh b/.zstyle.zsh index 8d234d5..d5eab4d 100644 --- a/.zstyle.zsh +++ b/.zstyle.zsh @@ -2,6 +2,8 @@ ### COMPLETIONS ### ################### +compctl -g '~/.teamocil/*(:t:r)' teamocil + # Specify the order of completers to use: # - `_expand`: Expand variables and globs. # - `_complete`: Standard completion.