diff --git a/src_files/.config/git/config b/src_files/.config/git/config index c399370..88702b3 100644 --- a/src_files/.config/git/config +++ b/src_files/.config/git/config @@ -1,3 +1,5 @@ +[init] + defaultBranch = master [user] name = david email = david@silverwolf.studio diff --git a/src_files/.config/tmux/tmux.conf b/src_files/.config/tmux/tmux.conf index a0c55ae..f546a68 100644 --- a/src_files/.config/tmux/tmux.conf +++ b/src_files/.config/tmux/tmux.conf @@ -5,13 +5,12 @@ unbind C-b set-option -g prefix C-a bind-key C-a send-prefix set -g status-style 'bg=#111111 fg=#22cc00' -set -g base-index 1 +set -g base-index 0 # vim-like movement stuff set-window-option -g mode-keys vi bind -T copy-mode-vi v send-keys -X begin-selection bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' -bind -r ^ last-window bind -r k select-pane -U bind -r j select-pane -D bind -r h select-pane -L @@ -21,15 +20,18 @@ bind -r l select-pane -R bind r source-file "~/.config/tmux/tmux.conf" \; display-message "tmux.conf reloaded" # kill the current session +# TODO: would it clash with other bindings to change these to C-q and C-w ? bind-key Q rename-session zzzz-temp-kill\; switch-client -p\; kill-session -t zzzz-temp-kill -bind-key W kill-session # TODO: if i can combine this into the above when only 1 session remains, do so +# TODO: if i can combine this into the above when only 1 session remains, do so +bind-key W kill-session -# custom find and switching for sessions using tmux-sessionizer +# find and switching for sessions, include using tmux-sessionizer unbind-key f -bind-key f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer" -bind-key C-f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer existing" +bind-key C-f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer" +bind-key C-s run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer existing" bind-key C-h run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer hub" bind-key C-l switch-client -l +bind -r C-o last-window bind-key C-n next-window bind-key C-p previous-window diff --git a/src_files/.config/zsh/.zshenv b/src_files/.config/zsh/.zshenv index 0c5901f..51a3c5e 100644 --- a/src_files/.config/zsh/.zshenv +++ b/src_files/.config/zsh/.zshenv @@ -1,5 +1,6 @@ # default programs -export EDITOR='vim' # TODO: update to nvim once configured +export BROWSER='brave' +export EDITOR='nvim' # env vars used for my organization structure export DIR_HOME_BOX="$HOME/dbox" diff --git a/src_files/.config/zsh/.zshrc b/src_files/.config/zsh/.zshrc index 37422d2..2fe5218 100644 --- a/src_files/.config/zsh/.zshrc +++ b/src_files/.config/zsh/.zshrc @@ -10,6 +10,10 @@ alias 3e='echo;echo;echo' alias 12e='3e;3e;3e;3e' alias cl='clear; ' alias cls='clear;ls' + +# shortcuts for executables +alias nv='nvim' +alias n='nvim' alias tms='tmux-sessionizer' # executable name overrides @@ -17,8 +21,8 @@ alias ls='ls -F' alias youtube-dl='youtube-dl --write-info-json' # misc commands -alias pdt='ping -c 4 drinkingtea.net' -alias ppw='ping -c 4 pinewoods.xyz' +alias pdt='ping -c 2 drinkingtea.net' +alias ppw='ping -c 2 pinewoods.xyz' alias weather='curl wttr.in' alias shrug='echo "¯\\_(ツ)_/¯"' alias journal="cd $DIR_HOME_BOX; $EDITOR .current-journal" diff --git a/z_temp_post_copy_fix_vim b/z_temp_post_copy_fix_vim new file mode 100755 index 0000000..fde21b7 --- /dev/null +++ b/z_temp_post_copy_fix_vim @@ -0,0 +1,4 @@ +#!/bin/zsh + +cd "$XDG_CONFIG_HOME/vim/pack/plugins/start" +sh .plugin-git-clone-script