Prefer x KBD for XResources

I'm finding that I'm visiting XResources more frequently than I'm
visiting ~/.xinitrc or other X files.

4 files changed, 26 insertions, 16 deletions

diff --git a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el
index 0adc9ec4dd85..8d6fe0530f46 100644
--- a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el
+++ b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el
@@ -69,7 +69,7 @@
     "ea" (lambda () (interactive) (wpc/find-file-split "~/aliases.zsh"))
     "ef" (lambda () (interactive) (wpc/find-file-split "~/functions.zsh"))
     "el" (lambda () (interactive) (wpc/find-file-split "~/variables.zsh"))
-    "ex" (lambda () (interactive) (wpc/find-file-split "~/.xsessionrc"))
+    "ex" (lambda () (interactive) (wpc/find-file-split "~/.Xresources"))
     "ei" (lambda () (interactive) (wpc/find-file-split "~/.config/i3/config"))
 
     "B"  #'magit-blame
@@ -114,8 +114,8 @@
                ("M-l"  . wpc/tmux-emacs-windmove-right)
                ("M-k"  . wpc/tmux-emacs-windmove-up)
                ("M-j"  . wpc/tmux-emacs-windmove-down)
-               ("M--"  . split-window-below)
-               ("M-\\" . split-window-right)
+               ("M--"  . wpc/evil-window-split-down)
+               ("M-\\" . wpc/evil-window-vsplit-right)
                ("M-q"  . delete-window))
     map)
   "William Carroll's keybindings that should have the highest precedence.")
diff --git a/configs/shared/misc/.config/nvim/init.vim b/configs/shared/misc/.config/nvim/init.vim
index 82fbe84844a1..0fe8082e9817 100644
--- a/configs/shared/misc/.config/nvim/init.vim
+++ b/configs/shared/misc/.config/nvim/init.vim
@@ -264,7 +264,7 @@ nnoremap <leader>ez :vsplit ~/.zshrc<CR>
 nnoremap <leader>ea :vsplit ~/aliases.zsh<CR>
 nnoremap <leader>ef :vsplit ~/functions.zsh<CR>
 nnoremap <leader>el :vsplit ~/variables.zsh<CR>
-nnoremap <leader>ex :vsplit ~/.xsessionrc<CR>
+nnoremap <leader>ex :vsplit ~/.Xresources<CR>
 nnoremap <leader>ei :vsplit ~/.config/i3/config<CR>
 
 " quickly source your vimrc
diff --git a/configs/shared/zsh/aliases.zsh b/configs/shared/zsh/aliases.zsh
index 578c4e884aad..ea5fbc450b70 100644
--- a/configs/shared/zsh/aliases.zsh
+++ b/configs/shared/zsh/aliases.zsh
@@ -6,7 +6,7 @@ alias ls="exa"
 alias ll="exa -l"
 alias la="exa -la"
 alias lorem="echo Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-alias e="emacsclient --alternate-editor=${EDITOR}"
+alias e="emacsclient --no-wait --alternate-editor=vim"
 alias d="docker"
 alias dps="docker ps"
 alias dpsa="docker ps -a"
@@ -60,23 +60,24 @@ alias vim=nvim # prefer neovim to vim
 alias links='find ~ -maxdepth 1 -type l -exec exa {} \;' # list all of the links in the home directory
 alias ra=ranger
 alias chrome=google-chrome
+alias btctl=bluetoothctl
 
 # couple the e* aliases to the <leader>e* kbds in vim
-alias ev='vim ~/.config/nvim/init.vim'
-alias ee='vim ~/.emacs.d/init.el'
-alias ez='vim ~/.zshrc'
-alias ea='vim ~/aliases.zsh'
-alias ef='vim ~/functions.zsh'
-alias el='vim ~/variables.zsh'
-alias ex='vim ~/.xsessionrc'
-alias ei='vim ~/.config/i3/config'
+alias ev='e ~/.config/nvim/init.vim'
+alias ee='e ~/.emacs.d/init.el'
+alias ez='e ~/.zshrc'
+alias ea='e ~/aliases.zsh'
+alias ef='e ~/functions.zsh'
+alias el='e ~/variables.zsh'
+alias ex='e ~/.Xresources'
+alias ei='e ~/.config/i3/config'
 
 # couple the s* aliases to the <leader>s* kbds in vim
 alias sz='source ~/.zshrc'
 alias sa='source ~/aliases.zsh'
 alias sf='source ~/functions.zsh'
 alias sl='source ~/variables.zsh'
-alias sx='sudo systemctl restart display-manager'
+alias sx='xrdb ~/.Xresources'
 alias si='i3-msg restart'
 
 # Google aliases
diff --git a/configs/shared/zsh/variables.zsh b/configs/shared/zsh/variables.zsh
index 05c5edc81754..830170ddc8c8 100644
--- a/configs/shared/zsh/variables.zsh
+++ b/configs/shared/zsh/variables.zsh
@@ -1,8 +1,17 @@
-EDITOR=emacs
+export TERMINAL=urxvtc
+export EDITOR=emacsclient
+
 BROWSER=google-chrome
 NIXIFY="$HOME/programming/nixify"
 DATE_FMT=%b-%d-%Y_%T # my preferred date formatting string used for generated filename
 
+# ZSH's static named directories
+hash -d pro="$HOME/programming"
+hash -d dot="$HOME/programming/dotfiles"
+hash -d citc="/google/src/cloud/$USER"
+hash -d doc="$HOME/Documents"
+hash -d d="$HOME/Downloads"
+
 # commonly used config files
 v="$HOME/.config/nvim/init.vim"
 e="$HOME/.emacs.d/init.el"
@@ -10,5 +19,5 @@ z="$HOME/.zshrc"
 a="$HOME/aliases.zsh"
 f="$HOME/functions.zsh"
 l="$HOME/variables.zsh" # v is taken by vim
-x="$HOME/.xsessionrc"
+x="$HOME/.Xresources"
 i="$HOME/.config/i3/config"