Updated various configs.

bspwm/panel/panel

@@ -17,7 +17,7 @@ bspc config top_padding $PANEL_HEIGHT
 xtitle -sf 'T%s\n' | sed -u 's/^\(.................................................\).*\(..........................\)/\1...\2/' > "$PANEL_FIFO" &
 bspc subscribe report > "$PANEL_FIFO" &
 tick > "$PANEL_FIFO" &
-while true; do [ -f /tmp/djsissom-jackmute ] && echo 'M' > "$PANEL_FIFO" || echo 'M' > "$PANEL_FIFO"; sleep 0.1; done &
+while true; do [ -f /tmp/djsissom-jackmute ] && echo 'P' > "$PANEL_FIFO" || echo 'P' > "$PANEL_FIFO"; sleep 0.1; done &
 
 ~/.config/bspwm/panel/panel_bar < "$PANEL_FIFO" | lemonbar -n "$PANEL_WM_NAME" -g "x$PANEL_HEIGHT" -a 20 -B "#BF000000" -F "#FF9A875F" -f "$PANEL_FONT" -f "$PANEL_FONT2" -f "$PANEL_FONT3" | sh &
 

bspwm/panel/panel_bar

@@ -12,7 +12,7 @@ while read -r line ; do
 			# xtitle output
 			title="%{F-}${line#?}%{F-}"
 			;;
-		M*)
+		P*)
 			# mic mute output
 			mic="%{F-}${line#?}%{F-}"
 			;;

bspwm/panel/scripts/calendar

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env zsh
 
 #source $HOME/.cache/wal/colors.sh
 color0="#000000"

git/gitconfig

@@ -1,9 +1,10 @@
 [user]
-	email = daniel@arclet.org
+	email = daniel@sissom.net
 	name = Daniel Sissom
 	signingkey = C6336D759D54FDA3C891EB624F6B3BB9D34719B7
 [push]
 	default = simple
+	followTags = true
 [alias]
 	lo = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 	lg = log --graph --pretty=format:'%C(auto,yellow)%H%C(reset) %C(auto)%d%C(reset)%n%C(auto,green)%cd (%cr)%C(reset)  %C(auto,blue)%an <%ae>%C(reset)  %C(auto,green)%G?%C(reset)%n%n    %s%+b%n'
@@ -13,3 +14,5 @@
 	ff = false
 [pull]
 	ff = only
+[tag]
+	gpgSign = true

sh/aliases

@@ -53,7 +53,8 @@ fi
 # Quick setup and fixes
 #:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-alias xtv='xrandr --output HDMI-0 --auto --same-as DVI-I-1'
+#alias xtv='xrandr --output HDMI-0 --auto --same-as DVI-I-1'
+alias xtv='xrandr --output HDMI-0 --mode 1920x1080 --rate 60 --same-as DVI-D-0'
 alias alsa_mic='echo "Starting jack alsa mic input..." && alsa_in -j mic -d hw:USB -r 192000 -c 2 -p 1024 -n 3'
 alias mic='echo "Starting jack mic input..." && jack_connect system:capture_1 system:playback_1 && jack_connect system:capture_1 system:playback_2'
 alias mic_off='echo "Stopping jack mic input..." && jack_disconnect system:capture_1 system:playback_1 && jack_disconnect system:capture_1 system:playback_2'
@@ -67,7 +68,7 @@ alias gamepad="xboxdrv --silent --detach-kernel-driver --mimic-xpad" # run as ro
 
 alias todo='vim ~/.todo.tp'
 alias tclock='tty-clock -sctb -d 0 -a 10000000 -C 6 -f "%Y/%m/%d"'
-alias netmon="bmon -p eth1,eth0 -b -o curses:'nocolors;bgchar= '"
+alias netmon="bmon -p eth0,eth1 -b -o curses:'nocolors;bgchar= '"
 alias kp="kpcli --kdb ~/Local/key/KeePass/master.kdbx --key ~/Local/key/master.key --histfile /dev/null"
 
 
@@ -90,6 +91,7 @@ alias scan-flatbed='scanimage --format=tiff --device "brother4:bus4;dev2"  --res
 alias scan-tray='scanimage --format=tiff --device "brother4:bus4;dev1"  --resolution 600'
 alias merge_pdfs='gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=merged.pdf'
 alias rm-if-no-screen='for i in *; do if [ ! -e screens/"$i".jpg -a $i != "screens" ]; then rm -Iv $i; fi; done'
+alias rm-if-no-screen-alt='for i in *; do if [ ! -e "../screens/`basename $i .mp4` s.jpg" ];  then rm -Iv $i; fi; done'
 alias pic-dirs-by-date='for i in *.NEF; do dirname=`ll --time-style=full-iso $i | awk '\''{ print $6 }'\''`; mkdir -p $dirname; mv -v $i $dirname; done'
 make_thumbs() { vcsi -g 5x4 -w 1920 -t --grid-spacing 0 "$*"; }
 make_thumbs_big() { vcsi -g 5x20 -w 1920 -t --grid-spacing 0 "$*"; }

sxhkd/sxhkdrc

@@ -98,7 +98,7 @@ alt + {o,i}
 
 # select window backward/forward in history
 alt + {_,shift} + Tab
-	bspc node --focus {prev.local,next.local}
+	bspc node --focus {prev.local.leaf,next.local.leaf}
 
 # swap window with last focused window
 alt + apostrophe
@@ -292,6 +292,15 @@ XF86AudioMute
 	#amixer set PCM toggle
 	#amixer set Speaker toggle
 
+XF86AudioPlay
+	playerctl play-pause
+
+XF86AudioPrev
+	playerctl previous
+
+XF86AudioNext
+	playerctl next
+
 ctrl + XF86AudioPlay
 	true
 
@@ -321,7 +330,7 @@ super + x
 
 # turn on tv and mirror central monitor
 super + {_, alt +} t
-	xrandr --output HDMI-0 {--auto --same-as DVI-D-0, --off}
+	xrandr --output HDMI-0 {--mode 1920x1080 --rate 60 --same-as DVI-D-0, --off}
 
 # lock screen
 XF86Sleep

vim/vim/spell/en.utf-8.add

@@ -126,3 +126,14 @@ durations
 tuplet
 tuplets
 duplet
+mage
+intentioned
+recourses
+macrostate
+microstate
+microstates
+knowability
+unknowability
+actionability
+theorics
+microservice

vim/vimrc

@@ -43,25 +43,29 @@ endif
 "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
-if has("syntax")
-	set t_Co=256
-	syntax on
-	" Uncomment the following 'let' lines if using xter16 color scheme
-	" Select colormap: 'soft', 'softlight', 'standard', or 'allblue'
-	let xterm16_colormap = 'allblue'
-	" Select brightness: 'low', 'med', 'high', 'default', or custom levels
-	let xterm16_brightness = 'high'
-	"Other override options:
-	let xterm16fg_Cursor = '555'
-	let xterm16bg_Normal = 'none'
-	"Set color scheme
-	colorscheme xterm16
-endif
+"if has("syntax")
+"	set t_Co=256
+"	syntax on
+"	" Uncomment the following 'let' lines if using xter16 color scheme
+"	" Select colormap: 'soft', 'softlight', 'standard', or 'allblue'
+"	let xterm16_colormap = 'allblue'
+"	" Select brightness: 'low', 'med', 'high', 'default', or custom levels
+"	let xterm16_brightness = 'high'
+"	"Other override options:
+"	let xterm16fg_Cursor = '555'
+"	let xterm16bg_Normal = 'none'
+"	let xterm16fg_Normal = 'none'
+"	"Set color scheme
+"	colorscheme xterm16
+"endif
 
 " If using a dark background within the editing area and syntax highlighting
 " turn on this option as well
 set background=dark
 
+" Remove background color from sign column/gutter
+highlight clear SignColumn
+
 
 
 "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -74,7 +78,8 @@ set showmatch                   " Show matching brackets.
 set ignorecase                  " Do case insensitive matching
 set smartcase                   " Do smart case matching
 set mouse=a                     " Enable mouse usage (all modes)
-set hlsearch                    " Turn on search highlighting
+set nohlsearch                    " Turn off search highlighting
+"set hlsearch                    " Turn on search highlighting
 set shiftwidth=4                " Auto-indent amount when using cindent, <<, >>, etc.
 set softtabstop=4               " How many spaces represent a tab
 set tabstop=4                   " Real tab size
@@ -103,7 +108,7 @@ autocmd FileType plaintex,tex,latex syntax spell toplevel
 autocmd FileType plaintex,tex,latex set tw=80
 autocmd FileType tex,latex let g:tex_flavor = 'latex'
 autocmd FileType pug,jade set tw=80
-autocmd FileType text set tw=80 nocindent
+autocmd FileType text,markdown set tw=80 nocindent
 autocmd FileType swift set noexpandtab
 
 autocmd BufNewFile,BufRead *.cu set filetype=c
@@ -129,13 +134,13 @@ nnoremap   :nohlsearch
 nnoremap <silent> <C-l> :GitGutter<CR>:nohlsearch<CR><C-l>
 nnoremap <silent> <CR> :nohlsearch<CR><CR>
 
-" Center page on search
-noremap n nzz
-noremap N Nzz
-noremap * *zz
-noremap # #zz
-noremap g* g*zz
-noremap g# g#zz
+" Center page on search (breaks 'search hit bottom...' message)
+"noremap n nzz
+"noremap N Nzz
+"noremap * *zz
+"noremap # #zz
+"noremap g* g*zz
+"noremap g# g#zz
 
 " Better scrolling keys
 noremap <C-n> <C-e>
@@ -208,7 +213,8 @@ if g:use_pluggin_manager == 1
 	" Set custom plugin directory
 	call plug#begin('~/.vim/vim-plug')
 
-	Plug 'ycm-core/YouCompleteMe', { 'do': function('BuildYCM'), 'on': [] }
+	"Plug 'ycm-core/YouCompleteMe', { 'do': function('BuildYCM'), 'on': [] }
+	Plug 'ycm-core/YouCompleteMe', { 'do': function('BuildYCM') }
 	Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 	Plug 'dense-analysis/ale'
 	Plug 'airblade/vim-gitgutter'
@@ -218,6 +224,9 @@ if g:use_pluggin_manager == 1
 	Plug 'tpope/vim-speeddating'
 	Plug 'tpope/vim-repeat'
 	Plug 'lervag/vimtex'
+	Plug 'junegunn/goyo.vim'
+	Plug 'junegunn/limelight.vim'
+	Plug 'joshdick/onedark.vim'
 
 	call plug#end()
 endif
@@ -239,6 +248,70 @@ let g:ycm_seed_identifiers_with_syntax = 1
 " Start with ale linting disabled
 let g:ale_enabled = 0
 
+" Activate Limelight with Goyo and fix colors
+autocmd! User GoyoEnter Limelight
+autocmd! User GoyoLeave Limelight!
+let g:limelight_conceal_ctermfg = 'gray'
+let g:limelight_conceal_guifg = 'DarkGray'
+
+" Set up color scheme for onedark.vim
+
+let s:colors = onedark#GetColors()
+let g:onedark_terminal_italics = 0
+let g:onedark_color_overrides = {
+\ "comment_grey": { "gui": "#8888A2", "cterm": "59", "cterm16": "7" }
+\}
+
+"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
+"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
+"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
+if (empty($TMUX))
+	if (has("nvim"))
+		"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
+		let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+	endif
+	"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
+	"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
+	" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
+	if (has("termguicolors"))
+		set termguicolors
+	endif
+endif
+
+if (has("autocmd"))
+	augroup colorextend
+		autocmd!
+		" Override the `Identifier` background color in GUI mode
+		autocmd ColorScheme * call onedark#extend_highlight("String", { "fg": s:colors.cyan })
+		"autocmd ColorScheme * call onedark#extend_highlight("String", { "fg": { "gui": "#AAFFFF" } })
+	augroup END
+
+	augroup colorset
+		autocmd!
+		autocmd ColorScheme * call onedark#set_highlight("SpellBad", { "gui": "underline", "cterm": "underline" })
+		autocmd ColorScheme * call onedark#set_highlight("SpellCap", { "gui": "italic", "cterm": "italic" })
+		autocmd ColorScheme * call onedark#set_highlight("SpellRare", { "gui": "italic", "cterm": "italic" })
+		autocmd ColorScheme * call onedark#set_highlight("SpellLocal", { })
+		autocmd ColorScheme * call onedark#set_highlight("Keyword", { "fg": s:colors.blue })
+		autocmd ColorScheme * call onedark#set_highlight("Identifier", { "fg": s:colors.blue })
+	augroup END
+endif
+
+" onedark.vim override: Don't set a background color when running in a terminal;
+" `gui` is the hex color code used in GUI mode/nvim true-color mode
+" `cterm` is the color code used in 256-color mode
+" `cterm16` is the color code used in 16-color mode
+if (has("autocmd") && !has("gui_running"))
+	augroup colorsetdefault
+		autocmd!
+		"let s:white = { "gui": "#ABB2BF", "cterm": "145", "cterm16" : "7" }
+		let s:white = { "gui": "#FFFFFF", "cterm": "255", "cterm16" : "15" }
+		autocmd ColorScheme * call onedark#set_highlight("Normal", { "fg": s:white }) " `bg` will not be styled since there is no `bg` setting
+	augroup END
+endif
+
+syntax on
+colorscheme onedark
 
 
 "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

zsh/zshenv

@@ -72,6 +72,7 @@ case "$hostenv" in
 		export -UT TEXINPUTS=.:./style:$TEXINPUTS texinputs
 		export -UT BSTINPUTS=.:./style:$BSTINPUTS bstinputs
 		export -UT BIBINPUTS=.:./style:$BIBINPUTS bibinputs
+		export -UT NODE_PATH=~/Local/lib/node/node_modules:$NODE_PATH node_path
 		;;
 	( osx     )
 		path=(~/Local/bin                                   # User specific path