moar cleanup and streamlining

tmux.conf

@@ -19,7 +19,6 @@ bind -n M-q previous-window
 bind -n M-j next-window
 bind -n M-k previous-window
 bind -n M-` last-window
-bind -n S-Pageup copy-mode -u
 setw -g mode-keys "vi"
 set -g set-titles "on"
 set -g set-titles-string "[#h:#S] #W"
@@ -35,19 +34,14 @@ set -g status-justify "left"
 set -g status-left-length "100"
 set -g status "on"
 set -g status-right-length "100"
-set -g status-right-attr "none"
 set -g pane-border-fg "colour11"
 set -g pane-active-border-fg "colour14"
 set -g message-bg "colour11"
 set -g message-fg "colour7"
-set -g status-attr "none"
-set -g status-left-attr "none"
-setw -g window-status-attr "none"
 setw -g window-status-activity-attr "none"
 setw -g window-status-format "#I #W "
 set -g status-bg "colour7"
-set -g message-command-fg "colour8"
+set -g message-style "bg=colour7,fg=colour11"
-set -g message-command-bg "colour11"
 setw -g window-status-fg "colour14"
 setw -g window-status-bg "colour7"
 setw -g window-status-current-format "#[fg=colour8,bg=colour7,underscore]#I #W#[default] "

vimplugins

@@ -22,8 +22,8 @@ Plug 'w0rp/ale', { 'for': 'python' }
 
 " colorschemes
 Plug 'lifepillar/vim-solarized8'
-Plug 'KeitaNakamura/neodark.vim'
 Plug 'nanotech/jellybeans.vim'
+Plug 'rakr/vim-one'
 
 " syntax highlight plugins
 Plug 'sheerun/vim-polyglot'
@@ -43,8 +43,8 @@ let g:lightline.separator = { 'left': "\ue0b0", 'right': "\ue0b2" }
 let g:lightline.subseparator = { 'left': "\ue0b1", 'right': "\ue0b3" }
 
 " signify options
-let g:signify_vcs_list=[ 'git' ]
+let g:signify_vcs_list = [ 'git' ]
-let g:signify_sign_change='~'
+let g:signify_sign_change = '~'
 
 " easy-align options
 xmap <Leader>a <Plug>(EasyAlign)

zshrc

@@ -70,12 +70,12 @@ PROMPT2='%b%f%_%(!.%F{red}.%F{black})>%f%b '
 PROMPT3='%b%f?%(!.%F{red}.%F{black})#%f%b '
 PROMPT4='%b%f+%N:%i%(!.%F{red}.%F{black})>%f%b '
 precmd.title() {
-    case ${TERM} in
+    case $TERM in
         xterm*|rxvt*)
-            printf "\033]0;%s@%s\007" "$USER" "${HOST%%.*}"
+            printf "\033]0;%s@%s\007" $USER ${HOST%%.*}
             ;;
         screen*|tmux)
-            printf "\033k%s@%s\033\\" "$USER" "${HOST%%.*}"
+            printf "\033k%s@%s\033\\" $USER ${HOST%%.*}
             ;;
     esac
 }
@@ -98,12 +98,12 @@ precmd.git() {
     local staged_count=0 unstaged_count=0 untracked_count=0 unmerged_count=0
 
     while read line; do
-        [[ $line[1,2] == '##'                 ]] && branch_info=$line[4,-1]
+        [[ $line[1,2] == '##'     ]] && branch_info=$line[4,-1]
-        [[ $line[1,2] == '??'                 ]] && (( untracked_count++ ))
+        [[ $line[1,2] == '??'     ]] && (( untracked_count++ ))
-        [[ $line[1,2] =~ .[MD]                ]] && (( unstaged_count++  ))
+        [[ $line[1,2] =~ .[MD]    ]] && (( unstaged_count++  ))
-        [[ $line[1,2] =~ [MDARC].             ]] && (( staged_count++    ))
+        [[ $line[1,2] =~ [MDARC]. ]] && (( staged_count++    ))
-        [[ $line[1,2] =~ (U[ADU]|A[AU]|D[DU]) ]] && (( unmerged_count++  ))
+        [[ $line[1,2] =~ [ADU]{2} ]] && (( unmerged_count++  ))
-    done <<< "${raw_status}"
+    done <<< $raw_status
 
     (( unstaged_count  )) && git_status+="%F{yellow}~$unstaged_count"
     (( staged_count    )) && git_status+="%F{blue}+$staged_count"
@@ -178,7 +178,7 @@ alias -g WK='| iconvwk'
 alias -g UK='| iconvuk'
 alias -g KU='| iconvku'
 alias -g WU='| iconvwu'
-alias -s {txt,xml,cfg,cnf,conf,ini.erb.pp}=${EDITOR}
+alias -s {txt,xml,cf,cfg,cnf,conf,ini,erb,pp}=$EDITOR
 alias -s {mkv,mp4,avi,mpg,mp3,ogg,mpeg,mov,webm,flv}='mpv'
 alias -s {jpg,png,gif,bmp,jpeg}='eog'
 # }}}