From c5f03acdac33ff5dd965171f246f5273671569a6 Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Sat, 29 Aug 2020 13:38:14 -0500
Subject: [PATCH 1/4] Add ActivityWatch to neovim config

---
 .config/nvim/init.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index fed36bf..4ddc1ab 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -84,6 +84,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'
 

From 96d121ba87c038969a66e5f4bc36fc77a2fa5d35 Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Fri, 4 Sep 2020 00:42:17 -0500
Subject: [PATCH 2/4] Added auto brackets to neovim

---
 .config/nvim/init.vim | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 4ddc1ab..bd7070f 100644
--- a/.config/nvim/init.vim
+++ b/.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>
@@ -126,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)

From 4fead0b34714f517a7a488e062e385c7975ced18 Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Mon, 7 Sep 2020 16:35:21 -0500
Subject: [PATCH 3/4] chore: Remove rust environment variables

---
 paoda.zsh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/paoda.zsh b/paoda.zsh
index b221cc0..28afc2b 100644
--- a/paoda.zsh
+++ b/paoda.zsh
@@ -26,13 +26,6 @@ dotfile() {
 
 # 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
 

From 38d008cb79bfebfe016794ecbb218152e54e202d Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Mon, 7 Sep 2020 16:47:48 -0500
Subject: [PATCH 4/4] chore: Clean paoda.zsh

---
 paoda.zsh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/paoda.zsh b/paoda.zsh
index 28afc2b..ffa1aed 100644
--- a/paoda.zsh
+++ b/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,9 +20,6 @@ dotfile() {
     fi
 }
 
-
-# alias dotfile='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME '
-
 # Re-enable reverse-i-search
 bindkey '^R' history-incremental-search-backward