Merge branch 'master' of ssh://ssh.paoda.moe:31059/paoda/dotfiles into master

.config/nvim/init.vim

@@ -5,6 +5,13 @@ nnoremap <silent><nowait> <space>s  :TagbarToggle<CR>
 " Remove Highlight
 nnoremap <esc><esc> :let @/=""<cr>
 
+" Always show the signcolumn
+if has("patch-8.1.1564")
+  " Recently vim can merge signcolumn and number column into one
+  set signcolumn=number
+else
+  set signcolumn=yes
+endif
 
 " Required for operations modifying multiple buffers like rename.
 " Used by coc.nvim
@@ -20,6 +27,9 @@ autocmd CursorHold * silent call CocActionAsync('highlight')
 " C-Space triggers autocompletion
 inoremap <silent><expr> <c-space> coc#refresh()
 
+" coc.nvim quick fix
+nmap <leader>qf  <Plug>(coc-fix-current)
+
 " Use tab for trigger completion with characters ahead and navigate.
 " Used by coc.nvim
 inoremap <silent><expr> <TAB>
@@ -84,6 +94,9 @@ nnoremap <silent><nowait> <space>c  :<C-u>CocList commands<cr>
 
 " Plugged Plugins
 call plug#begin(stdpath('data') . '/plugged')
+" Activity Tracking
+Plug 'ActivityWatch/aw-watcher-vim'
+
 " One Dark Theme
 Plug 'joshdick/onedark.vim'
 
@@ -123,6 +136,9 @@ Plug 'ryanoasis/vim-devicons'
 " Better Rust Synatax Highlighting 
 Plug 'arzg/vim-rust-syntax-ext'
 
+" Auto-close brackets
+Plug 'jiangmiao/auto-pairs'
+
 call plug#end()
 
 " Autosave with rust-fmt (Rust Only)

paoda.zsh

@@ -2,9 +2,6 @@
 # Make ZSH behave like vim
 bindkey -v
 
-# Re-enable reverse-i-search
-# bindkey '^R' history-incremental-search-backward
-
 # Aliases
 alias yay="yay --aur"
 alias ls="exa"
@@ -23,16 +20,6 @@ dotfile() {
     fi
 }
 
-
-# alias dotfile='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME '
-
-
-### Environment Variable Exports
-
-# Rust
-export CARGO_HOME=~/.local/share/cargo
-export RUSTUP_HOME=~/.config/rustup
-
 # Re-enable reverse-i-search
 bindkey '^R' history-incremental-search-backward