From 97adcdf00fd530bbb80c9a5816810444b7a0cedb Mon Sep 17 00:00:00 2001
From: Devon Tingley <dtingley@twilit.io>
Date: Thu, 13 Jan 2022 22:20:05 -0500
Subject: [PATCH] Vim commands && zsh rust plugin

---
 .config/nvim/init.vim | 17 ++++++++++++-----
 .zshrc                |  7 ++++---
 setup.sh              | 15 +--------------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index b2bd3ff..a1a7f00 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -23,17 +23,24 @@ inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
 let g:coc_global_extensions = [
     \'coc-pairs',
     \'coc-json',
+    \'coc-git',
     \'coc-pyright',
     \'coc-go',
     \'coc-rust-analyzer',
     \'coc-clangd',
     \'coc-html',
     \'coc-css',
-    \'coc-tsserver'
+    \'coc-tsserver',
+    \'coc-flutter'
 \]
 
 " GoTo code navigation.
-nmap <silent> gd <Plug>(coc-definition)
-nmap <silent> gy <Plug>(coc-type-definition)
-nmap <silent> gi <Plug>(coc-implementation)
-nmap <silent> gr <Plug>(coc-references)
+nmap <leader>def <Plug>(coc-definition)
+nmap <leader>typedef <Plug>(coc-type-definition)
+nmap <leader>impl <Plug>(coc-implementation)
+nmap <leader>ref <Plug>(coc-references)
+
+" Misc coc-commands
+nmap <leader>rename <Plug>(coc-rename)
+nmap <leader>help :CocDiagnostics<CR>
+nmap <leader>git <Plug>(coc-git-commit)
diff --git a/.zshrc b/.zshrc
index 1adf712..50704a0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -17,8 +17,7 @@ plugins=(
     golang
     docker
     docker-compose
-    cargo
-    rustup
+    rust
     python
     yarn
 )
@@ -28,5 +27,7 @@ export GDK_DPI_SCALE=1.5
 export QT_AUTO_SCREEN_SCALE_FACTOR=1.5
 
 source $ZSH/oh-my-zsh.sh
+export PATH=$PATH:/opt/texlive/2021/bin/x86_64-linux
+export CHROME_EXECUTABLE=/usr/bin/chromium
 
-export $(grep -v '^#' .env | tr -d '"' | xargs -d '\n')
+# export $(grep -v '^#' .env | tr -d '"' | xargs -d '\n')
diff --git a/setup.sh b/setup.sh
index 66e64a2..c4b0b4f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,19 +11,6 @@ ln -sn $PWD/.config $HOME/.config
 ln -s $PWD/.zshrc $HOME/.zshrc
 touch $HOME/.z
 
-mode "exit: [l]ogout, [r]eboot, [s]hutdown" {
-  bindsym l exec i3-msg exit
-  bindsym r exec systemctl reboot
-  bindsym s exec systemctl shutdown
-  bindsym k exec i3lock; mode "default"
-  bindsym Escape mode "default"
-  bindsym Return mode "default"
-
-}
-
-bindsym $mod+x mode "exit: [l]ogout, [r]eboot, [s]hutdown, loc[k]"
-
-
 setup_macos() {
     # Install Homebrew
     /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)";
@@ -48,4 +35,4 @@ if [[ "$(uname)" == "Linux" ]]; then
     $INSTALL_CMD evince neofetch feh
     $INSTALL_CMD docker docker-compose
     $INSTALL_CMD texlive-full
-
+fi