Lotsa updates over time

.XCompose

@@ -11,12 +11,12 @@ include "%L"
 <dead_acute> <sabovedot> : U1E65
 <dead_acute> <V> : U01D7
 <dead_acute> <v> : U01D8
-<dead_acute> <nobreakspace> : combining_acute
+#<dead_acute> <nobreakspace> : combining_acute
 <dead_belowdot> <Sabovedot> : U1E68
 <dead_belowdot> <sabovedot> : U1E69
-<dead_belowdot> <dead_belowdot> : combining_belowdot
+#<dead_belowdot> <dead_belowdot> : combining_belowdot
-<dead_belowdot> <nobreakspace> : combining_belowdot
+#<dead_belowdot> <nobreakspace> : combining_belowdot
-<dead_belowdot> <space> : combining_belowdot
+#<dead_belowdot> <space> : combining_belowdot
 <dead_breve> <Aacute> : Abreveacute
 <dead_breve> <Agrave> : Abrevegrave
 <dead_breve> <Ahook> : Abrevehook
@@ -152,7 +152,7 @@ include "%L"
 <dead_doubleacute> <nobreakspace> : U030B
 <dead_grave> <V> : U01DB
 <dead_grave> <v> : U01DC
-<dead_grave> <nobreakspace> : combining_grave
+#<dead_grave> <nobreakspace> : combining_grave
 <UFDD2> <A> : Greek_ALPHA
 <UFDD2> <a> : Greek_alpha
 <UFDD2> <B> : Greek_BETA
@@ -337,7 +337,7 @@ include "%L"
 <dead_tilde> <minus> : similarequal
 <dead_tilde> <less> : U2272
 <dead_tilde> <greater> : U2273
-<dead_tilde> <nobreakspace> : combining_tilde
+#<dead_tilde> <nobreakspace> : combining_tilde
 <dead_acute> <dead_abovedot> <S> : U1E64
 <dead_acute> <dead_abovedot> <s> : U1E65
 <dead_belowdot> <dead_abovedot> <S> : U1E68

.Xdefaults

@@ -108,3 +108,5 @@ XClock*update:     1
 !XCalc*Background:    #222222
 XCalc*customization: -color
 XCalc*rpn:           True
+
+XTerm*VT100.cutNewLine: false

.config/nvim/init.vim

@@ -71,16 +71,22 @@ Plug 'twerth/ir_black'
 " Generate UUIDs
 Plug 'kburdett/vim-nuuid'
 
+" Format js prettier
+Plug 'sbdchd/neoformat'
+
 " Various langs
 Plug 'rodjek/vim-puppet'
 Plug 'keith/swift.vim'
 Plug 'darfink/vim-plist'
 Plug 'vim-ruby/vim-ruby'
+Plug 'thoughtbot/vim-rspec'
 Plug 'jvirtanen/vim-hcl'
+Plug 'chrisbra/csv.vim'
 Plug 'wlangstroth/vim-racket'
 Plug 'kchmck/vim-coffee-script'
 Plug 'jceb/vim-orgmode'
 Plug 'bfontaine/Brewfile.vim'
+Plug 'pprovost/vim-ps1'
 Plug 'mdempsky/gocode', { 'rtp': 'nvim', 'do': '~/.config/nvim/plugged/gocode/nvim/symlink.sh' }
 Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 " For vim-orgmode
@@ -123,7 +129,7 @@ noremap <F1> :Helptags<CR>
 noremap <Leader>q :bp<bar>sp<bar>bn<bar>bd<CR>
 
 " From vim-rhubarb
-noremap <Leader>gh :Gbrowse<CR>
+noremap <Leader>gh :GBrowse<CR>
 
 " Edit a file in the same directory as the current buffer
 noremap <Leader>e :e %:p:h/
@@ -204,16 +210,31 @@ let g:go_highlight_function_parameters = 1
 let g:go_highlight_function_calls = 1
 let g:go_highlight_types = 1
 let g:go_highlight_fields = 1
+let g:go_highlight_extra_types = 1
 let g:go_highlight_build_constraints = 1
 let g:go_highlight_generate_tags = 1
 let g:go_highlight_string_spellcheck = 1
 let g:go_highlight_format_strings = 1
 let g:go_highlight_variable_declarations = 1
 let g:go_highlight_variable_assignments = 1
+let g:go_auto_type_info = 1
+let g:go_updatetime = 250
+let g:go_build_tags = 'wireinject' " include wire.go but not wire_gen.go in gopls scope
 au FileType go nmap <Leader>gor <Plug>(go-run)
 au FileType go nmap <Leader>gob <Plug>(go-build)
 au FileType go nmap <Leader>got <Plug>(go-test)
 au FileType go nmap <Leader>goc <Plug>(go-coverage)
+au FileType go nmap <C-M-b> :GoImplements<CR>
+au FileType go nmap <C-M-Right> :GoDef<CR>
+au FileType go nmap <C-M-Left> :GoDefPop<CR>
+
+" Neoformat search local node_modules prettier
+let g:neoformat_try_node_exe = 1
+" Use formatprg if available
+let g:neoformat_try_formatprg = 1
+autocmd FileType javascript setlocal formatprg=prettier\ --single-quote\ --trailing-comma\ es5
+" autocmd BufWritePre *.js Neoformat
+autocmd BufWritePre *.jsx Neoformat
 
 " Disable nerdtree because it's way slow and I don't use it. fzf4evr
 nnoremap <silent> <C-G> :NERDTreeToggle<CR>
@@ -275,6 +296,12 @@ let g:neomake_ruby_rubocop_maker = {
 let g:neomake_ruby_rubocop_rails_maker = {
   \ }
 
+" RSpec.vim mappings
+map <Leader>rf :call RunCurrentSpecFile()<CR>
+map <Leader>rt :call RunNearestSpec()<CR>
+map <Leader>rl :call RunLastSpec()<CR>
+map <Leader>ra :call RunAllSpecs()<CR>
+
 let g:deoplete#enable_at_startup = 1
 
 " ncm2 commands for completion

.config/picom/picom.conf

@@ -210,7 +210,8 @@ blur-background-exclude = [
 # `xrender` is the default one.
 #
 # backend = 'glx'
-backend = "xr_glx_hybrid";
+#backend = "xr_glx_hybrid";
+backend = "xrender"
 
 # Enable/disable VSync.
 # vsync = false
@@ -265,7 +266,7 @@ refresh-rate = 0
 # to maximize performance for full-screen windows. Known to cause flickering 
 # when redirecting/unredirecting windows.
 #
-unredir-if-possible = true
+unredir-if-possible = false
 
 # Delay before unredirecting the window, in milliseconds. Defaults to 0.
 # unredir-if-possible-delay = 0

.ideavimrc

@@ -6,6 +6,8 @@ let mapleader = ","
 noremap <Leader>v :action SearchEverywhere<CR>
 noremap <Leader>c :action ActivateTerminalToolWindow<CR>
 noremap <Leader>bo :action CloseAllEditorsButActive<CR>
+noremap <Leader>r :action RecentFiles<CR>
+noremap <Leader>pre :action TogglePresentationMode<CR>
 noremap <C-h> <C-w>h
 noremap <C-j> <C-w>j
 noremap <C-k> <C-w>k

.tmux.conf

@@ -75,7 +75,7 @@ bind '"' split-window -v -c "#{pane_current_path}"
 
 # confirm before killing a window or server
 #bind k confirm kill-window
-bind \ confirm-before "kill-server"
+#bind \ confirm-before "kill-server"
 
 # nice, big scrollback buffer (lines)
 set -g history-limit 5000

.xinitrc

@@ -7,21 +7,35 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
   unset f
 fi
 
+xrandr --setprovideroutputsource modesetting NVIDIA-0
+xrandr --auto
+
 #export GDK_DPI_SCALE=0.5
 systemctl --user import-environment DISPLAY
 #setxkbmap us dvorak ctrl:nocaps
 # remap powerkey to insert
-xmodmap -e "keycode 124 = NoSymbol Insert"
+#xmodmap -e "keycode 124 = NoSymbol Insert"
-xmodmap -e "keycode 62 = Scroll_Lock Scroll_Lock"
+#xmodmap -e "keycode 62 = Scroll_Lock Scroll_Lock"
-xmodmap -e "keycode 37 = Control_R Control_R"
+#xmodmap -e "keycode 37 = Control_R Control_R"
+xinput set-prop 'Apple Inc. Magic Trackpad 2' 'libinput Tapping Enabled' 1
+xsetroot -cursor_name right_ptr
 redshift &
 CM_DIR=~/.config/clipmenu clipmenud &
 #picom -b
 hsetroot -solid '#000000'
-xrdb -merge ~/.Xresources
+#xrdb -merge ~/.Xresources
 #feh --bg-fill ~/Dropbox/Photos/Adventurous\ Kate.jpg
 eval `ssh-agent -s`
+xrandr  --dpi 100
 battery.sh &
-xset r rate 220 32
+xset r rate 200 30
+
+xset s on
+xset s 1200
+#xss-lock -- i3lock &
+#xss-lock -- slock &
+#xss-lock -- xlock -echokeys -usefirst &
+#xscreensaver &
+
 
 exec xmonad

.xmonad/xmonad.hs

@@ -67,6 +67,8 @@ mKeys = [ ("M-S-n"   , sendMessage MirrorShrink  ) -- Expand current window
         , ("M-p"     , spawn "rofi -show run"    ) -- Run rofi
         , ("M-C-<Space>"     , spawn "/home/hunner/local/bin/emoji-menu")
         , ("M-C-c"   , spawn "CM_LAUNCHER=rofi CM_DIR=~/.config/clipmenu clipmenu")
+        , ("M-S-c"   , spawn "CM_LAUNCHER=rofi CM_DIR=~/.config/clipmenu clipmenu") -- Rebind to avoid closing windows
+        , ("M-C-S-c" , withFocused killWindow    ) -- make it harder to do accidentally
         , ("<Scroll_lock>", spawn "xlock -mode fzort -echokeys -usefirst" ) -- SCReen LocK
 
         -- Sticky/unsticky windows (does not work on workspaces created after the fact)
@@ -135,7 +137,7 @@ mKeysExt = [((m .|. mModMask, k), f i) -- changing workspaces with bébo
 -}
 
 mXPConfig :: XPConfig
-mXPConfig = defaultXPConfig { fgColor = "#005577", bgColor = "#222222", borderColor = "#005577" }
+mXPConfig = def { fgColor = "#005577", bgColor = "#222222", borderColor = "#005577" }
 
 {-
 gsConfig = defaultGSConfig
@@ -157,7 +159,7 @@ gsConfig = defaultGSConfig
         reset = M.singleton (0,xK_space) (const (0,0))
 -}
 
-gsConfig = defaultGSConfig
+gsConfig = def
 
 ------------------------------------------------------------------------
 -- Layouts:
@@ -202,6 +204,7 @@ mManageHook = composeAll
     , className =? "feh"            --> doFloat
     , className =? "emoji-keyboard" --> doFloat
     , title     =? "Talon Draft"    --> doFloat
+    , title     =? "Plover"         --> doFloat
     , className =? "Cellwriter"     --> doIgnore
     , resource  =? "desktop_window" --> doIgnore
     , resource  =? "kdesktop"       --> doIgnore
@@ -273,9 +276,9 @@ mConfig = ewmh def
   , layoutHook         = mLayout
   --, manageHook         = manageSpawn sp <+> mManageHook
   , manageHook         = mManageHook
-  , handleEventHook    = handleEventHook def <+> fullscreenEventHook <+> pickyFocusEventHook
+  , handleEventHook    = handleEventHook def <+> pickyFocusEventHook
   , startupHook        = do
-      ewmhDesktopsStartup >> setWMName "LG3D"
+      setWMName "LG3D"
       return () >> checkKeymap mConfig mKeys
   } `additionalKeysP` mKeys `additionalKeys` mKeysExt
 

.zsh/aliases

@@ -32,6 +32,7 @@ alias mutt="TERM=xterm-256color mutt"
 alias x="exit"
 alias v="vagrant"
 alias w="cd ~/Documents/work/git"
+alias cem="cd ~/Documents/work/git/cem"
 alias ssh-gpg="ssh -R ~/.gnupg/S.gpg-agent.extra:~/.gnupg/S-gpg-agent.extra -o 'StreamLocalBindUnlink=yes'"
 alias gpg-add="/usr/libexec/gpg-preset-passphrase"
 alias rsync="rsync -azPHe ssh" #-a equals -rlptgoD
@@ -58,17 +59,19 @@ alias rm=rm; unalias rm #hack
 alias be="bundle exec"
 alias bi="bundle install"
 alias bu="bundle update"
+alias jr="JAVA_OPTS='--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED' jruby --server -J-Xms1g -J-Xmx1g -S "
 alias uzbl="uzbl-browser"
 alias hide="SetFile -a V"
 alias show="SetFile -a v"
-alias whyfail="tmux copy-mode && tmux send-keys -X search-backward fail"
+alias whyfail="tmux copy-mode && tmux send-keys -X search-backward '--- FAIL'"
+alias m4b-tool='docker run -it --rm -u $(id -u):$(id -g) -v "$(pwd)":/mnt m4b-tool'
 alias morserunner="docker-wine --sound=default --cache wine '.wine/drive_c/Program Files (x86)/Afreet/MorseRunner/MorseRunner.exe'"
-alias ryml="vim -R +'set ft=yaml'"
+alias ry="vim -R +'set ft=yaml'"
 alias superscript="tr '+−=()0123456789AaÆᴂɐɑɒBbcɕDdðEeƎəɛɜɜfGgɡɣhHɦIiɪɨᵻɩjJʝɟKklLʟᶅɭMmɱNnɴɲɳŋOoɔᴖᴗɵȢPpɸrRɹɻʁsʂʃTtƫUuᴜᴝʉɥɯɰʊvVʋʌwWxyzʐʑʒꝯᴥβγδθφχнნʕⵡ' \
                       '⁺⁻⁼⁽⁾⁰¹²³⁴⁵⁶⁷⁸⁹ᴬᵃᴭᵆᵄᵅᶛᴮᵇᶜᶝᴰᵈᶞᴱᵉᴲᵊᵋᶟᵌᶠᴳᵍᶢˠʰᴴʱᴵⁱᶦᶤᶧᶥʲᴶᶨᶡᴷᵏˡᴸᶫᶪᶩᴹᵐᶬᴺⁿᶰᶮᶯᵑᴼᵒᵓᵔᵕᶱᴽᴾᵖᶲʳᴿʴʵʶˢᶳᶴᵀᵗᶵᵁᵘᶸᵙᶶᶣᵚᶭᶷᵛⱽᶹᶺʷᵂˣʸᶻᶼᶽᶾꝰᵜᵝᵞᵟᶿᵠᵡᵸჼˤⵯ';"
 alias resize="printf '\33]50;%s%d\007' 'xft:DroidSansMonoDotted:pixelsize=' $1" # ':antialias=true'"
 #alias asdf="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
-alias asdf="setxkbmap us dvorak ctrl:nocaps"
+alias asdfg="setxkbmap us dvorak ctrl:nocaps"
 kinesis_activate() {
   xmodmap -e "keycode 124 = NoSymbol Insert"
   xmodmap -e "keycode 62 = Scroll_Lock Scroll_Lock"
@@ -196,6 +199,9 @@ else
   if whence bat > /dev/null ; then
     alias cat=bat
   fi
+  if whence exa > /dev/null ; then
+    alias ls=exa
+  fi
 fi
 
 # Vim
@@ -254,9 +260,12 @@ alias gstp="git stash pop"
 alias gdw="git diff --color-words"
 alias gk="gitk --all&"
 alias gx="gitx --all"
+alias grt="git restore --staged "
 
 
 # Docker
+#alias docker="podman"
+alias d="docker"
 alias dh="echo 'dl                       -- list containers
 da [container] [command] -- attach to running container
 dr <image> [command]     -- run an image
@@ -283,6 +292,7 @@ alias d-c="docker-compose"
 
 
 # K8s
+alias kubectl="kubectl --context \${KUBE_CONTEXT:-\$(command kubectl config current-context)}"
 alias kh="echo 'k               -- kubectl
 kg              -- kubectl get ...
 kga             -- kubectl get all
@@ -291,15 +301,18 @@ kxl             -- list contexts
 knl             -- list namespaces
 kx <context>    -- switch context ...
 kn <namespace>  -- switch namespace ...
+klf <pod>       -- follow logs
 kat <pod> [cmd] -- attach and run cmd in pod'"
 alias k="kubectl"
-alias kg="kubectl get"
+alias kg="kubectl get --show-kind"
 alias kga="kubectl get all"
 alias kgan="kubectl --all-namespaces=true get all"
 alias kxl="kubectl config get-contexts"
 alias knl="kubectl get namespaces"
 alias kx="kubectl config use-context"
+function kxs() { export KUBE_CONTEXT="${1}" }
 alias kn="kubectl config set-context --current --namespace"
+alias klf="kubectl logs -f "
 function kat() {
   [ -z $1 ] && echo 'usage: kat <pod> [cmd]' && return 1
   cmd=$2 && [ -z $2 ] && cmd="/bin/sh"
@@ -307,10 +320,15 @@ function kat() {
 }
 #alias im='eval $(minikube docker-env)'
 alias rdk="relay dev kubectl"
+alias openapi="echo 'Serving ReDoc at http://localhost:8080' && docker run -it --rm -p 8080:80 -v ~/src/relay-api/openapi/latest.yaml:/usr/share/nginx/html/latest.yaml -e SPEC_URL=latest.yaml redocly/redoc"
 
 
 # Pathing
-alias gor="cd $GOPATH"
+export GO_DEV_ROOT="${DEV_ROOT}/go/src/github.com/puppetlabs"
+alias gor="cd $GO_DEV_ROOT"
+alias rapi="cd $GO_DEV_ROOT/relay-api"
+alias rui="cd $GO_DEV_ROOT/relay-ui"
+alias rcli="cd $GO_DEV_ROOT/relay"
 alias djm="cd $DEV_ROOT/DistelliJavaModels"
 alias k8s="cd $DEV_ROOT/K8SDashboard"
 alias pwf="cd $DEV_ROOT/pfc-web-framework"

.zshrc

@@ -13,7 +13,7 @@ fpath=(/usr/local/share/zsh-completions $fpath)
 #typeset -u fpath
 
 # Options
-setopt prompt_subst appendhistory hist_ignore_space hist_ignore_all_dups extendedglob nomatch notify dvorak # correct
+setopt prompt_subst inc_append_history hist_ignore_space hist_ignore_all_dups hist_expire_dups_first hist_find_no_dups hist_save_no_dups hist_reduce_blanks extendedglob nomatch notify dvorak # correct
 unsetopt beep
 bindkey -e
 
@@ -44,9 +44,11 @@ case "$TERM" in
 esac
 
 # Go lang stuff
-export GOPATH=$HOME/Documents/work/git/go
+#export GOPATH=$HOME/Documents/work/git/go
-export GOROOT=/usr/local/opt/go/libexec
+#if whence go > /dev/null ; then
-export GO111MODULE=on
+#   export GOROOT=$(go env GOROOT)
+#fi
+#export GO111MODULE=on
 
 # Paths
 #export LD_LIBRARY_PATH=/opt/csw/lib
@@ -54,7 +56,7 @@ export GO111MODULE=on
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export MANPATH=~/local/share/man:/usr/man:/usr/share/man:/usr/local/share/man
 #paths=(/cat/bin)
-prepaths=(/opt/puppetlabs/pdk/bin $GOPATH/bin $GOROOT/bin ~/.emacs.d/bin /usr/local/bin /usr/local/sbin /usr/local/opt/node@8/bin ~/local/bin ~/local/sbin)
+prepaths=(/opt/puppetlabs/pdk/bin ~/.emacs.d/bin /usr/local/bin /usr/local/sbin /usr/local/opt/node@8/bin ~/.local/bin ~/.rbenv/bin ~/local/talon ~/local/bin ~/local/sbin)
 #for dir in $paths ; do
 #    if [ -d $dir ] ; then
 #        export PATH=$PATH:$dir
@@ -94,6 +96,7 @@ fi
 #for dir in `find /opt/*/bin|grep /bin$` `find /opt/csw/*/bin|grep /bin$` ; do
 #    export PATH=$PATH:$dir
 #done
+export XDG_DATA_DIRS="$HOME/.local/share:$XDG_DATA_DIRS"
 
 # Setting vars
 #TERM=rxvt
@@ -102,8 +105,8 @@ fi
 #export GEM_PATH="$GEM_HOME:/usr/lib/ruby/gems/1.8"
 #export GEM_PATH="/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/gems/1.8"
 zshhosts=(serenity.cat.pdx.edu hunner@mint.cic.pdx.edu drkatz.cat.pdx.edu walt.ece.pdx.edu bunny.cat.pdx.edu spof.cat.pdx.edu fops.cat.pdx.edu narsil.cat.pdx.edu hunner@odin.pdx.edu hunnur@alcmaeonllc.com mir.cat.pdx.edu geppetto.cat.pdx.edu)
-HISTSIZE=1000
+HISTSIZE=100000000
-SAVEHIST=1000
+SAVEHIST=100000000
 HISTFILE=~/.history
 export GPGKEY="0x1CED67750173FC1C"
 if [ -f ~/.zsh/private ] ; then
@@ -116,6 +119,7 @@ export OVFTOOL='/Applications/VMware OVF Tool/ovftool'
 #export DOCKER_HOST='tcp://192.168.99.100:2375'
 if whence rg > /dev/null ; then
   export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --glob "!.git/*"'
+  export FZF_DEFAULT_OPTS="--history=$HOME/.fzf_history"
 fi
 
 # Prompt
@@ -213,15 +217,17 @@ function init_coalsack_vars() {
 }
 
 # Functions
-function listtoken() { curl -u hunter --url vmpooler.delivery.puppetlabs.net/api/v1/token ; }
+#VMHOST=vmpooler.delivery.puppetlabs.net
-function gettoken() { curl -X POST -u hunter --url vmpooler.delivery.puppetlabs.net/api/v1/token ; }
+VMHOST=vmpooler-prod.k8s.infracore.puppet.net
-function rmtoken() { curl -X DELETE -u hunter --url vmpooler.delivery.puppetlabs.net/api/v1/token/$1 ; }
+function listtoken() { curl -u hunter --url $VMHOST/api/v1/token ; }
-function listmyvm() { curl --url vmpooler.delivery.puppetlabs.net/api/v1/token/$(grep vmpooler_token ~/.fog | cut -d ' ' -f 4); }
+function gettoken() { curl -X POST -u hunter --url $VMHOST/api/v1/token ; }
+function rmtoken() { curl -X DELETE -u hunter --url $VMHOST/api/v1/token/$1 ; }
+function listmyvm() { curl --url $VMHOST/api/v1/token/$(grep vmpooler_token ~/.fog | cut -d ' ' -f 4); }
 
-function listvm() { curl -H "X-AUTH-TOKEN: $(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" -s --url vmpooler.delivery.puppetlabs.net/api/v1/vm/ ; }
+function listvm() { curl -H "X-AUTH-TOKEN: $(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" -s --url $VMHOST/api/v1/vm/ ; }
-function getvm() { curl -H "X-AUTH-TOKEN: $(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" -d --url vmpooler.delivery.puppetlabs.net/api/v1/vm/$1 ; }
+function getvm() { curl -H "X-AUTH-TOKEN: $(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" -d --url $VMHOST/api/v1/vm/$1 ; }
 function sshvm() { ssh -i ~/.ssh/id_rsa-acceptance root@$1 ; }
-function rmvm() { curl -H "X-AUTH-TOKEN: $(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" -X DELETE --url vmpooler.delivery.puppetlabs.net/api/v1/vm/$1 ; }
+function rmvm() { curl -H "X-AUTH-TOKEN: $(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" -X DELETE --url $VMHOST/api/v1/vm/$1 ; }
 
 function migratetoken() { curl -X POST -d '' -u hunter --url "https://nspooler-service-prod-1.delivery.puppetlabs.net/api/v1/token?token=$(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" }
 function listns() { curl -H "X-AUTH-TOKEN: $(grep vmpooler_token ~/.fog | cut -d ' ' -f 4)" -s -X GET --url https://nspooler-service-prod-1.delivery.puppetlabs.net/api/v1/status/ ; }
@@ -261,22 +267,31 @@ st+24bit|st+24bit terminal (X Window System):\
 EOF
 }
 
-if [ -d ~/.rbenv ] ; then
+# replaced by asdf
-  eval "$(rbenv init -)"
+#if [ -d ~/.rbenv ] ; then
-fi
+#  eval "$(rbenv init -)"
-if [ -d ~/.pyenv ] ; then
+#fi
-  eval "$(command pyenv init - zsh)" # --no-rehash)"
+#if [ -d ~/.pyenv ] ; then
-fi
+#  export PYENV_ROOT="$HOME/.pyenv"
+#  export PATH="$PYENV_ROOT/bin:$PATH"
+#  eval "$(pyenv init --path)"
+#  eval "$(command pyenv init - zsh)" # --no-rehash)"
+#fi
 #[ -f ~/.zsh-fuzzy-match/fuzzy-match.zsh ] && source ~/.zsh-fuzzy-match/fuzzy-match.zsh
+if [ -d ~/.asdf ] ; then
+  . $HOME/.asdf/asdf.sh
+fi
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
-load-nvm() {
+
-  export NVM_DIR="$HOME/.nvm"
+# load-nvm() {
-  . "/usr/local/opt/nvm/nvm.sh"
+#   export NVM_DIR="$HOME/.nvm"
-}
+#   [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-alias nvm-lts="load-nvm && nvm install lts/* --latest-npm ----reinstall-packages-from=node && nvm alias default lts/*"
+#   [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-alias nvm-latest="load-nvm && nvm install node --latest-npm ----reinstall-packages-from=node && nvm alias default node"
+# }
+# alias nvm-lts="load-nvm && nvm install lts/* --latest-npm ----reinstall-packages-from=node && nvm alias default lts/*"
+# alias nvm-latest="load-nvm && nvm install node --latest-npm ----reinstall-packages-from=node && nvm alias default node"
 
 # added by travis gem
 [ -f /Users/hunner/.travis/travis.sh ] && source /Users/hunner/.travis/travis.sh
@@ -287,11 +302,18 @@ if [[ "$PROFILE_STARTUP" == true ]]; then
   exec 2>&3 3>&-
 fi
 
-# The next line updates PATH for the Google Cloud SDK.
-if [ -f '/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc' ]; then . '/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc'; fi
-
-# The next line enables shell command completion for gcloud.
-if [ -f '/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc' ]; then . '/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc'; fi
-
 #test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
 
+
+# added by travis gem
+[ ! -s /home/hunner/.travis/travis.sh ] || source /home/hunner/.travis/travis.sh
+
+#eval "$(starship init zsh)"
+
+# The next line updates PATH for the Google Cloud SDK.
+if [ -f '/home/hunner/Downloads/google-cloud-sdk/path.zsh.inc' ]; then . '/home/hunner/Downloads/google-cloud-sdk/path.zsh.inc'; fi
+
+# For 1.25 gke auth update
+export USE_GKE_GCLOUD_AUTH_PLUGIN=True
+# The next line enables shell command completion for gcloud.
+if [ -f '/home/hunner/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/hunner/Downloads/google-cloud-sdk/completion.zsh.inc'; fi

local/bin/battery.sh

@@ -13,8 +13,8 @@ GFG='#379' # color of the gauge
 GH=10      # height of the gauge
 GBG='#333' # color of gauge background
 #X=1807     # x position
-X="$(expr "$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+)x[0-9]+.*$/\1/')" - $W - 1)"     # x position
+X="$(expr "$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+)x[0-9]+.*$/\1/')" - $W - 2)"     # x position
-Y=1        # y position
+Y=2        # y position
 FN='xft:Liberation Mono:size=8' # font
 
 STATEFILE='/sys/class/power_supply/BAT0/status' # battery's state file