diff --git a/.chunkwmrc b/.chunkwmrc index 1b9c5ff..cf07d88 100755 --- a/.chunkwmrc +++ b/.chunkwmrc @@ -111,5 +111,10 @@ chunkc tiling::rule --owner \"Lightroom\" --state float chunkc tiling::rule --owner \"Steam\" --state float chunkc tiling::rule --owner \"Stickies\" --state float chunkc tiling::rule --owner \"System Preferences\" --state float +chunkc tiling::rule --owner \"DEVONagent\" --state float +chunkc tiling::rule --owner \"nvALT\" --state float chunkc tiling::rule --owner \"Emacs\" --state tile chunkc tiling::rule --owner \"Adobe Lightroom CC\" --state tile +chunkc tiling::rule --owner \"1Password 7\" --state tile +chunkc tiling::rule --owner \"IntelliJ IDEA\" --name ".+Documents/work/git.+" --state tile +chunkc tiling::rule --owner \"IntelliJ IDEA\" --except ".+Documents/work/git.+" --state float diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index c3ae94d..37b2d7f 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -153,6 +153,7 @@ noremap tn :color tender noremap ip :color inkpot noremap ir :color ir_black noremap fed :e ~/.config/nvim/init.vim +noremap tod :e ~/Dropbox/todo.txt " TODO quickfix for ripgrep results " TODO quickfix for autolint and rake stuff diff --git a/.khdrc b/.khdrc index 5ad4cbe..086f83b 100644 --- a/.khdrc +++ b/.khdrc @@ -61,14 +61,14 @@ ctrl + shift + alt - 5 : chunkc tiling::window --send-to-desktop 15 ctrl + shift + alt - 6 : chunkc tiling::window --send-to-desktop 16 # Focus display -switcher + shift - 1 : chunkc tiling::monitor -f 1 -switcher + shift - 2 : chunkc tiling::monitor -f 2 -switcher + shift - 3 : chunkc tiling::monitor -f 3 +switcher - 1 : chunkc tiling::monitor -f 1 ; khd -e "mode activate default" +switcher - 2 : chunkc tiling::monitor -f 2 ; khd -e "mode activate default" +switcher - 3 : chunkc tiling::monitor -f 3 ; khd -e "mode activate default" # Move window to display -swap + shift - 1 : chunkc tiling::window --send-to-monitor 1 -swap + shift - 2 : chunkc tiling::window --send-to-monitor 2 -swap + shift - 3 : chunkc tiling::window --send-to-monitor 3 +swap + shift - 1 : chunkc tiling::window --send-to-monitor 1 ; khd -e "mode activate default" +swap + shift - 2 : chunkc tiling::window --send-to-monitor 2 ; khd -e "mode activate default" +swap + shift - 3 : chunkc tiling::window --send-to-monitor 3 ; khd -e "mode activate default" ## ytd mode #ytd - x : ytc play;\ diff --git a/.zshrc b/.zshrc index c6111ec..ff7ce2b 100644 --- a/.zshrc +++ b/.zshrc @@ -52,7 +52,7 @@ paths=(/usr/texbin /cat/bin /cat/games/bin /opt/csw/sbin /opt/csw/bin /opt/local/bin /usr/local/share/bin /usr/openwin/bin /usr/bin/X11 ~/Library/Haskell/bin /usr/local/bin/X11 /usr/openwin/bin/xview /opt/java/bin /opt/java5/bin /opt/java/jre/bin /opt/openoffice/program) -prepaths=(/usr/local/bin /usr/local/sbin ~/coreos-osx/bin ~/.rbenv/bin ~/.cabal/bin +prepaths=(/usr/local/bin /usr/local/sbin /usr/local/opt/node@8/bin ~/coreos-osx/bin ~/.rbenv/bin ~/.cabal/bin ~/Library/Haskell/bin ~/local/bin ~/local/sbin ~/local/share/bin) for dir in $paths ; do if [ -d $dir ] ; then @@ -306,6 +306,7 @@ function dr() { cmd=$2 && [ -z $2 ] && cmd="/bin/bash" docker run -it --rm $1 $cmd } +alias k="kubectl" #startup aliases alias -s pdf="zathura" alias -s txt="vi" @@ -483,3 +484,9 @@ fi # added by travis gem [ -f /Users/hunner/.travis/travis.sh ] && source /Users/hunner/.travis/travis.sh + +# The next line updates PATH for the Google Cloud SDK. +if [ -f '/Users/hunner/google-cloud-sdk/path.zsh.inc' ]; then source '/Users/hunner/google-cloud-sdk/path.zsh.inc'; fi + +# The next line enables shell command completion for gcloud. +if [ -f '/Users/hunner/google-cloud-sdk/completion.zsh.inc' ]; then source '/Users/hunner/google-cloud-sdk/completion.zsh.inc'; fi diff --git a/Brewfile b/Brewfile index 6fc3416..3b16289 100644 --- a/Brewfile +++ b/Brewfile @@ -1,6 +1,6 @@ # Work fun tap "d12frosted/emacs-plus" ; brew "emacs-plus" -cask "blue-jeans-launcher" +cask "blue-jeans" cask "docker" # docker docker cask "hipchat" # Work chat cask "slack" # Work/fun chat @@ -27,7 +27,10 @@ brew "node@8" # LTS major version; 10 after oct 2018 brew "yarn" # node stuff brew "stow" # node stuff? brew "hugo" # node stuff? +tap "homebrew/cask-versions" # For FF Nightly and java8 cask "java8" # jdk 8 +cask "intellij-idea" # java dev +cask "visual-studio-code" # frontend dev brew "pyenv" # rbenv for py brew "pyenv-virtualenv" # rbenv for pyenv? @@ -38,6 +41,7 @@ tap "crisidev/chunkwm" ; brew "chunkwm" # Window manager tap "koekeishiya/formulae" ; brew "khd" # Keyboard shortcuts cask "cathode" # Silly terminal cask "ubersicht" # UI bar +tap "homebrew/cask-fonts" # For fonts cask "font-hack" # I don't think I use this any more cask "font-liberation-mono-for-powerline" # For neovim @@ -48,7 +52,8 @@ cask "steam" # Meta game # Life fun cask "1password" # Family accounts -cask "adobe-creative-cloud" # Family pictures +cask "adobe-creative-cloud" # Family pictures. Run /usr/local/Caskroom/adobe-creative-cloud/latest/Creative Cloud Installer.app +cask "microsoft-office" # OneNote, word, outlook, etc. brew "ddrescue" # Photo recover brew "exiftool" # Photo munge brew "imagemagick" # manipulation @@ -65,6 +70,7 @@ cask "zerotier-one" # Personal network # Browsers cask "brave" # For bt cask "firefox" # Personal browsing -cask "firefoxnightly" # Work browsing +cask "firefox-nightly" # Work browsing +cask "choosy" # Browser choosing cask "multifirefox" # Profile manager cask "google-chrome" # Flash/music