tmux: add ctrl-shift-movement

etc/tmux-1.conf

@@ -1,23 +0,0 @@
-set-option -g prefix C-a
-bind-key C-a last-window
-bind-key a send-prefix
-#set -g mode-mouse off
-#set -g mouse-resize-pane off
-#set -g mouse-select-pane off
-#set -g mouse-select-window off
-set -g base-index 1
-set -s escape-time 0
-setw -g aggressive-resize on
-setw -g monitor-activity on
-set -g visual-activity on
-set -g status-left ' #[fg=blue,bold]#h #S:#I.#P (#D) #[default]'
-set -g status-right '#T #[fg=yellow,bold]#(uptime | cut -d, -f4 | cut -d " " -f 4-7)#[default] #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default] '
-set -g status-fg '#EEEEEE'
-set -g status-bg '#333333'
-set -g set-titles on
-bind-key e set-window-option synchronize-panes on
-bind-key E set-window-option synchronize-panes off
-bind m set -g mode-mouse on \; set -g mouse-resize-pane on \; set -g mouse-select-pane on \; set -g mouse-select-window on \; display 'Mouse: ON'
-bind M set -g mode-mouse off \; set -g mouse-resize-pane off \; set -g mouse-select-pane off \; set -g mouse-select-window off \; display 'Mouse: OFF'
-bind + new-window -d -n tmux-zoom 'clear && echo TMUX ZOOM && read' \; swap-pane -s tmux-zoom.0 \; select-window -t tmux-zoom
-bind - last-window \; swap-pane -s tmux-zoom.0 \; kill-window -t tmux-zoom

etc/vimrc.local

@@ -1,52 +0,0 @@
-set guifont=Fira\ Code\ 11
-
-set encoding=utf-8
-
-set nocompatible
-colorscheme murphy
-syntax on
-set background=dark
-
-" Uncomment the following to have Vim jump to the last position when
-" reopening a file
-if has("autocmd")
-  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
-    \| exe "normal! g'\"" | endif
-endif
-
-" Uncomment the following to have Vim load indentation rules according to the
-" detected filetype. Per default Debian Vim only load filetype specific
-" plugins.
-if has("autocmd")
-  filetype indent on
-endif
-
-set showcmd		" Show (partial) command in status line.
-set showmatch		" Show matching brackets.
-set smartcase		" Do smart case matching
-set incsearch		" Incremental search
-set ww=b,s,<,>,[,]
-set sta
-set visualbell
-set mousemodel=popup_setpos
-
-highlight SpellErrors ctermfg=Red guifg=Red cterm=underline gui=underline term=reverse
-let spell_language_list = "americanxlg,american,americanmed+,english"
-let spell_insert_mode = 1
-let spell_executable = "ispell"
-let spell_auto_type = ""
-"let spell_auto_type = "tex,mail,text,html,sgml,otl,cvs,none"
-
-" other
-set shiftwidth=2
-set tabstop=8
-set softtabstop=2
-set expandtab
-filetype plugin indent on
-autocmd FileType yaml setl indentkeys-=<:>
-autocmd FileType yaml setlocal ts=8 sts=2 sw=2 expandtab
-
-set modeline
-set modelines=7
-
-" vim: syntax=vim

oh-my-zsh

@@ -1 +1 @@
-Subproject commit 1448d234d6d9c25f64a48b16379b34db28a36898
+Subproject commit 7dcabbe6826073ef6069c8a4b6f9a943f00d2df0

tmux/fragment/ctrl-shift-movement.conf

@@ -0,0 +1,33 @@
+
+# This fragmenet is meant to be used with a Vim plugin and provides unified movement
+# between Vim window/panes and tmux panes. It requires you install the following in
+# Vim to function correctly:
+#
+#   github.com/christoomey/vim-tmux-navigator
+#
+# Include it by adding the following snippet to your early (or late) tmux.conf:
+#
+#   source-file "$PSOXIZSH/tmux/fragment/ctrl-shift-movement.conf"
+
+### --- This uses Ctrl-Shift-<arrow> movement --- ###
+
+# Integration with vim-tmux-navigator & fzf
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+  | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \
+  | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'"
+bind -n C-S-Left run "($is_vim && tmux send-keys C-S-Left) \
+  || tmux select-pane -L"
+bind -n C-S-Down run "($is_vim && tmux send-keys C-S-Down) \
+  || ($is_fzf && tmux send-keys C-S-Down) \
+  || tmux select-pane -D"
+bind -n C-S-Up run "($is_vim && tmux send-keys C-S-Up) \
+  || ($is_fzf && tmux send-keys C-S-Up)  \
+  || tmux select-pane -U"
+bind -n C-S-Right run "($is_vim && tmux send-keys C-S-Right) \
+  || tmux select-pane -R"
+bind-key -T copy-mode-vi 'C-S-Left' select-pane -L
+bind-key -T copy-mode-vi 'C-S-Down' select-pane -D
+bind-key -T copy-mode-vi 'C-S-Up' select-pane -U
+bind-key -T copy-mode-vi 'C-S-Right' select-pane -R
+

tmux/plugins/tpm

@@ -1 +1 @@
-Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b
+Subproject commit b699a7e01c253ffb7818b02d62bce24190ec1019

tmux/tmux.conf

@@ -8,6 +8,10 @@ if "test -f ~/.config/tmux/early.conf" {
   source-file ~/.config/tmux/early.conf
 }
 
+if "test -f ~/.config/tmux/keys.conf" {
+  source-file ~/.config/tmux/keys.conf
+}
+
 set-option -g prefix C-a
 set-option -g set-titles on
 set-window-option -g automatic-rename on
@@ -16,6 +20,7 @@ bind-key a send-prefix
 set -g status-fg '#EEEEEE'
 set -g status-bg '#333333'
 set -g pane-border-status top
+set -g pane-border-format '╢#[fg=#AA2277,italics]#{session_group}#[default] #[fg=#337755,bold,normal]#P/#D #[default,italics,fg=yellow]#{pane_tty}#[default]╟'
 set -g display-panes-colour '#334400'
 set -g mouse off
 set -s escape-time 0
@@ -23,14 +28,21 @@ set -g visual-activity on
 set -g status-left-length 200
 set -g status-right-length 200
 set -g status-left '#{prefix_highlight} #[fg=blue,bold]#h #S:#I.#P (#D) #[default]'
-set -g status-right '#T #[fg=yellow,bold]#(uptime -p)#[default] #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default] '
+set -g status-right '#T #[fg=yellow,bold]#( awk "{print \$1/86400,\"days\"}" /proc/uptime )#[default] #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default] '
 set -g set-titles on
+
 setw -g aggressive-resize on
 setw -g monitor-activity on
+
 # The following three makes italics work in tmux
 set -g xterm-keys on
-set -g default-terminal "xterm-256color"
+set -g default-terminal "tmux-256color"
+
+# set 24bit color for terminal that support it
 set -as terminal-overrides ',xterm*:sitm=\E[3m'
+set -as terminal-overrides ",xterm*:Tc"
+set -as terminal-overrides ",alacritty*:Tc"
+set -as terminal-overrides ",tmux-*:Tc"
 
 # Refresh status line every 5 seconds
 set -g status-interval 5
@@ -43,8 +55,12 @@ bind-key e set-window-option synchronize-panes on
 bind-key E set-window-option synchronize-panes off
 bind m set -g mouse on \; display 'Mouse: ON'
 bind M set -g mouse off \; display 'Mouse: OFF'
-bind + new-window -d -n tmux-zoom 'clear && echo TMUX ZOOM && read' \; swap-pane -s tmux-zoom.0 \; select-window -t tmux-zoom
+bind + new-window -d -n tmux-zoom 'clear && echo TMUX ZOOM && read' \
-bind - last-window \; swap-pane -s tmux-zoom.0 \; kill-window -t tmux-zoom
+  \; swap-pane -s tmux-zoom.0 \
+  \; select-window -t tmux-zoom
+bind - last-window \
+  \; swap-pane -s tmux-zoom.0 \
+  \; kill-window -t tmux-zoom
 
 # prefix + / to search
 bind-key / copy-mode \; send-key ?
@@ -55,3 +71,4 @@ if "test -f ~/.config/tmux/late.conf" {
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run -b "$TMUX_PLUGINS/tpm/tpm"
+

vimrc

@@ -215,7 +215,7 @@ if has_key(plugs, 'vim-qf')
     let g:qf_auto_resize = 0
   endif
 endif
-  
+
 " ripgrep settings
 let g:rg_highlight = 'true'
 let g:rg_derive_root = 'true'
@@ -230,7 +230,7 @@ let g:rainbow_active = 1
 augroup PsoxFileAutos
   autocmd!
   autocmd FileType yaml setlocal indentkeys-=<:> ts=8 sts=2 sw=2 expandtab
-  autocmd FileType go   setlocal ts=8 sts=4 sw=4 noexpandtab 
+  autocmd FileType go   setlocal ts=4 sts=4 sw=4 noexpandtab
         \| autocmd BufWritePre <buffer> silent :call CocAction('format')
   " Tidy nerdtree windiw
   autocmd FileType nerdtree setlocal nocursorcolumn nonumber norelativenumber signcolumn=no
@@ -419,9 +419,9 @@ nnoremap <silent> <leader>N :call ToggleGutter()<CR>
 
 function! ToggleGutter() abort
   if &number
-    exec "set nonumber norelativenumber signcolumn=no"
+    exec "set nonumber norelativenumber signcolumn=no nolist"
   else
-    exec "set number relativenumber"
+    exec "set number relativenumber list"
     try | set signcolumn=auto | catch | set signcolumn=yes:1 | endtry
   endif
 endfunction

zsh-custom/plugins/zsh-completions

@@ -1 +1 @@
-Subproject commit bebaa6126ede6bda698a6788c6cf3fa02ff1679c
+Subproject commit acd4de5268ee23ffa3ec1f6f13a2ec91266e1564

zsh-custom/plugins/zsh-syntax-highlighting

@@ -1 +1 @@
-Subproject commit 1a9264bc661b3d52756916bf9ec3f41687d64db2
+Subproject commit caa749d030d22168445c4cb97befd406d2828db0

zshrc

@@ -31,7 +31,7 @@ path=( /bin /sbin /usr/bin /usr/sbin $path )
 
 # Set funtion paths
 foreach local p in ~/.local/share/zsh/functions ~/.config/zsh/functions $extra_fpath
-  [[ -d "$p" ]] && fpath=( "$p" $fpath ) 
+  [[ -d "$p" ]] && fpath=( "$p" $fpath )
 end
 
 [[ "$OS" != "Windows_NT" ]] && [[ -f /etc/profile ]] && source /etc/profile
@@ -78,14 +78,18 @@ plugins=(
   common-aliases
   colored-man-pages
 )
-( which git &>/dev/null ) && plugins+=( git git-extras git-flow-avh ) && [[ "$ZSH_THEME" == "stemmet" ]] && [ -z "$_STARSHIP_Y_" ] && plugins+=( git-prompt )
+
+( which git &>/dev/null ) &&
+  plugins+=( git git-extras git-flow-avh ) &&
+  [[ "$ZSH_THEME" == "stemmet" ]] &&
+  [ -z "$_STARSHIP_Y_" ] &&
+  plugins+=( git-prompt )
 ( which perl &>/dev/null ) && plugins+=( perl )
 ( which go &>/dev/null ) && plugins+=( golang )
 ( which oc &>/dev/null ) && plugins+=( oc )
 ( which rsync &>/dev/null ) && plugins+=( rsync )
 ( which aws &>/dev/null ) && plugins+=( aws )
-( which rust &>/dev/null ) && plugins+=( rust )
+( which cargo &>/dev/null ) && plugins+=( rust )
-( which cargo &>/dev/null ) && plugins+=( cargo )
 ( which jq &>/dev/null ) && plugins+=( jsontools )
 ( which encode64 &>/dev/null ) && plugins+=( encode64 )
 ( which docker-compose &>/dev/null ) && plugins+=( docker-compose )
@@ -100,12 +104,18 @@ plugins=(
 ( which code &>/dev/null ) && plugins+=( vscode )
 ( which strfile &>/dev/null ) && plugins+=( chucknorris )
 ( which kubectl &>/dev/null ) && plugins+=( kubectl )
+( which kubectx &>/dev/null ) && plugins+=( kubectx )
+( which chroma &>/dev/null ) && plugins+=( colorize )
+( which kate &>/dev/null ) && plugins+=( kate )
+( which zoxide &>/dev/null ) && plugins+=( zoxide )
 ( [[ -e /etc/arch-release ]] ) && plugins+=( archlinux )
+( [[ -e /etc/ubuntu-release ]] ) && plugins+=( ubuntu )
+( [[ -e /etc/debian-release ]] ) && plugins+=( debian )
 ( [[ -e /etc/suse-release ]] ) && plugins+=( suse )
 ( [[ "$(uname)" == "Darwin" ]] ) && plugins+=( macos )
-#( which vim &>/dev/null ) && plugins+=( vim-interaction )
+( which vim &>/dev/null ) && plugins+=( vim-interaction )
 ( which ssh &>/dev/null ) && [[ -d ~/.ssh ]] && plugins+=( ssh-agent )
-plugins+=( 
+plugins+=(
   zsh-completions
   zsh-autosuggestions
   zsh-navigation-tools
@@ -120,7 +130,7 @@ then
   export VIMHOME=~/.vim
 
   # Feature flag lua based Neovim config, until this is tested
-  # (and we figure out how to detect if we're running nvim or vim)
+  # (and we figure out how to detect if we are running nvim or vim)
   if [[ -n ${PSOXIZSH_EXPERIMENTAL_NEOVIM_LUA} ]]
   then
     export MYVIMRC=$PSOXIZSH/init.lua
@@ -137,7 +147,7 @@ if [[ -d ~/.ssh ]]
 then
   zstyle :omz:plugins:ssh-agent lifetime 36h
   zstyle :omz:plugins:ssh-agent agent-forwarding on
-  if [[ -e ~/.ssh/autoload ]] 
+  if [[ -e ~/.ssh/autoload ]]
   then
       zstyle :omz:plugins:ssh-agent identities $( cat ~/.ssh/autoload )
   fi
@@ -163,15 +173,22 @@ then
 
   [ -z "$TMUX_PATH" ] && TMUX_PATH=~/.config/tmux
 
-  # Bootstrap the user's plugin directory, if required
+  # Bootstrap the users plugin directory, if required
-  [ -d "$TMUX_PATH/plugins" ] || { mkdir -vp "$TMUX_PATH/plugins" && cp -r "$PSOXIZSH/tmux/plugins" "$TMUX_PATH/plugins" }
+  [ -d "$TMUX_PATH/plugins" ] || {
+    mkdir -vp "$TMUX_PATH/plugins" &&
+    cp -r "$PSOXIZSH/tmux/plugins" "$TMUX_PATH/plugins"
+  }
 
   # Both tmux and TPM are very opininated about where configs must live,
   # and TPM will only expand one layer of source-file directives, so we
-  # symlink the base config to the user local config file, if it doesn't
+  # symlink the base config to the user local config file, if it does not
   # exist.
-  [ ! -f ~/.tmux.conf ] && ln -s $PSOXIZSH/tmux/tmux.conf ~/.tmux.conf
+  [[ ! -f $TMUX_PATH/tmux.conf ]] && cp -r "$PSOXIZSH/tmux/tmux.conf" "$TMUX_PATH/tmux.conf"
-  [ ! -f "$TMUX_PATH/plugins.conf" ] && ln -s "$PSOXIZSH/tmux/fragment/plugins.conf" "$TMUX_PATH/plugins.conf"
+  [[ ! -f ~/.tmux.conf ]] && ln -s $PSOXIZSH/tmux/tmux.conf ~/.tmux.conf
+  [[ ! -f "$TMUX_PATH/plugins.conf" ]] && ln -vs "$PSOXIZSH/tmux/fragment/plugins.conf" "$TMUX_PATH/plugins.conf"
+  [[ "$USER" == "astemmet" ]] && [[ ! -f $TMUX_PATH/keys.conf ]] && {
+    cp -v "$PSOXIZSH/tmux/fragment/ctrl-alt-movement.conf" "$TMUX_PATH/keys.conf"
+  }
 
   export TMUX_PATH=$TMUX_PATH TMUX_PLUGINS="$TMUX_PATH/plugins" TMUX_CONFIG=~/.tmux.conf
 fi
@@ -190,6 +207,8 @@ which nvim >/dev/null 2>&1 && alias vim="$(which nvim)"
 alias v=vim
 [[ -x /usr/bin/yay ]] && [[ "$(whoami)" != "pacman" ]] && alias yay='sudo -iupacman /usr/bin/yay'
 [[ -x /usr/bin/paru ]] && [[ "$(whoami)" != "pacman" ]] && alias yay='sudo -iupacman /usr/bin/paru'
+[[ -x /usr/bin/paru ]] && [[ "$(whoami)" != "pacman" ]] && alias paru='sudo -iupacman /usr/bin/paru'
+[[ -x /usr/bin/bat ]] && export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 
 typeset -A key
 
@@ -252,7 +271,7 @@ fi
 alias src='omz reload'
 
 # Remove unwanted aliases
-( where fd | grep -qE '\/s?bin\/fd' ) && alias fd &>/dev/null && unalias fd
+( where fd | grep -qE '/s?bin/fd' ) && alias fd &>/dev/null && unalias fd
 
 # Clean up global aliases
 source <(alias -g | awk -F= '/^[A-Za-z]+/{print $1}' | xargs -I{} -n1 echo unalias "'{}'")