Fix minor issues and Add bat and exa aliases when possible

.config/aliasrc

@@ -15,8 +15,6 @@ alias dotfiles='.f'
 alias dotfiles-mail='.fm'
 alias du='du -h'
 
-alias exa="exa -lh --icons"
-
 alias free='free -h'
 
 alias grep='grep --color=auto'
@@ -36,3 +34,10 @@ alias qutebrowser-kiosk='qutebrowser -B $XDG_DATA_DIR/qutebrowser-kiosk -C $XDG_
 alias rm='rm -I --one-file-system -v'
 
 alias sudo='sudo '
+
+### conditionals
+
+[ -x "$(command -v bat)" ] && alias cat='bat -pp'
+
+[ -x "$(command -v exa)" ] && alias ls='exa -lh --git --icons'
+[ -x "$(command -v exa)" ] && alias la='exa -lah --git --icons'

.config/qutebrowser/config.py

@@ -15,7 +15,7 @@ c.tabs.new_position.related = 'last'
 c.url.start_pages = ['dashboard.serguzim.me', 'cloud.serguzim.me', 'localhost:6680/iris/']
 c.url.searchengines = {'DEFAULT': 'bookmarks.serguzim/?q={}'}
 
-c.zoom.default = 130
+c.zoom.default = 125
 
 config.bind(',v', 'spawn mpv {url}')
 config.bind(',V', 'hint links spawn mpv {hint-url}')

.config/vim/autoload/plug.vim

@@ -804,7 +804,7 @@ function! s:syntax()
   syn match plugNumber /[0-9]\+[0-9.]*/ contained
   syn match plugBracket /[[\]]/ contained
   syn match plugX /x/ contained
-  syn match plugDash /^-/
+  syn match plugDash /^-\{1}\ /
   syn match plugPlus /^+/
   syn match plugStar /^*/
   syn match plugMessage /\(^- \)\@<=.*/
@@ -822,6 +822,7 @@ function! s:syntax()
   syn match plugError /^x.*/
   syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/
   syn match plugH2 /^.*:\n-\+$/
+  syn match plugH2 /^-\{2,}/
   syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
   hi def link plug1       Title
   hi def link plug2       Repeat
@@ -1077,8 +1078,9 @@ function! s:checkout(spec)
   let sha = a:spec.commit
   let output = s:git_revision(a:spec.dir)
   if !empty(output) && !s:hash_match(sha, s:lines(output)[0])
+    let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : ''
     let output = s:system(
-          \ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
+          \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
   endif
   return output
 endfunction
@@ -1530,7 +1532,7 @@ while 1 " Without TCO, Vim stack is bound to explode
     let [error, _] = s:git_validate(spec, 0)
     if empty(error)
       if pull
-        let cmd = ['git', 'fetch']
+        let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch']
         if has_tag && !empty(globpath(spec.dir, '.git/shallow'))
           call extend(cmd, ['--depth', '99999999'])
         endif

.config/vim/vimrc

@@ -19,6 +19,7 @@ call plug#begin('~/.config/vim/plugged')
     Plug 'posva/vim-vue'
     Plug 'vhdirk/vim-cmake'
     Plug 'lervag/vimtex'
+    Plug 'fatih/vim-go'
 call plug#end()
 
 packadd termdebug

.config/zsh/.zshrc

@@ -90,6 +90,7 @@ source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
+[ -f "$HOME/.config/environment" ] && source $HOME/.config/environment
 [ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
 [ -x "$(command -v thefuck)" ] && eval $(thefuck --alias)
 
@@ -100,7 +101,5 @@ export SAVEHIST=1000000
 export HISTSIZE=1000000
 export HISTFILE="$HOME/.cache/zsh_history"
 
-[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
-
 # Load zsh-syntax-highlighting; should be last.
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null