From f6188dfe86b027abf56037a084b620b83555597f Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Mon, 12 Apr 2021 18:49:57 -0700
Subject: [PATCH] misc from hermia

---
 .gitconfig   | 1 +
 .i3/config   | 2 ++
 .vimrc       | 8 ++------
 .xinitrc.bak | 1 +
 .zprofile    | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index cfb8585..3bfb3b1 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -19,6 +19,7 @@
   praise = blame
   hist = show-branch -a
   undo-last = reset HEAD^
+  unstage = restore --staged
 
 [diff]  
   renamelimit = 0
diff --git a/.i3/config b/.i3/config
index 1e3c69f..ea3d808 100644
--- a/.i3/config
+++ b/.i3/config
@@ -128,6 +128,8 @@ bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace 10
 
+bindsym $mod+Tab workspace back_and_forth
+
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace 1
 bindsym $mod+Shift+2 move container to workspace 2
diff --git a/.vimrc b/.vimrc
index ac49f94..cbbe4ba 100644
--- a/.vimrc
+++ b/.vimrc
@@ -176,12 +176,9 @@ Plug 'leafOfTree/vim-svelte-plugin'
 "Plug 'posva/vim-vue'
 Plug 'Shougo/context_filetype.vim'
 "Plug 'idris-hackers/idris-vim', {'for': 'idris'}
-Plug 'edwinb/idris2-vim', {'for': 'idris'}
 Plug 'fedorenchik/AnsiEsc'
-Plug 'derekwyatt/vim-scala', {'for': 'scala'}
 Plug 'hwayne/tla.vim'
 Plug 'zchee/vim-goasm'
-Plug 'cakebaker/scss-syntax.vim'
 "Plug 'cappyzawa/starlark.vim'
 
 " Plugins that autocomplete
@@ -204,8 +201,8 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'Shougo/vimproc.vim'
 Plug 'Shougo/vimfiler.vim'
 Plug 'Shougo/unite.vim'
-"Plug 'lucas8/coquille', {'branch': 'error_on_coq_error', 'for': 'coq'}
-Plug 'whonore/coquille', {'branch': 'pathogen-bundle', 'for': 'coq'}
+" TODO: Look into Coqtail, same author
+Plug 'whonore/coquille', {'branch': 'pathogen-bundle', 'for': 'coq'}  
 "Plug 'dhruvasagar/vim-zoom'
 Plug 'gabrielelana/vim-markdown'
 Plug 'lervag/vimtex'
@@ -545,7 +542,6 @@ set statusline+=%{fugitive#statusline()}\ \
 set statusline+=%c,     "cursor column
 set statusline+=%l/%L   "cursor line/total lines
 set statusline+=\ %P    "percent through file
-set statusline+=%{zoom#statusline()}\ 
 
 " ** SMALL FUNCTIONS THAT DON'T FIT AS PLUGINS ***
 
diff --git a/.xinitrc.bak b/.xinitrc.bak
index 9a3a9a8..8e3d5c3 100755
--- a/.xinitrc.bak
+++ b/.xinitrc.bak
@@ -44,6 +44,7 @@ fi
 if command -v picom &>/dev/null; then
   picom -b --config ~/.compton.conf &
 fi
+
 #exec awesome
 exec i3
 #exec startxfce4
diff --git a/.zprofile b/.zprofile
index 7296da2..bf2ba75 100644
--- a/.zprofile
+++ b/.zprofile
@@ -33,6 +33,7 @@ PAGER=less;  	export PAGER
 
 # set ENV to a file invoked each time sh is started for interactive use.
 ENV=$HOME/.zshrc; export ENV
+RUST_BACKTRACE=1; export RUST_BACKTRACE
 
 #alias ls='ls -FG'
 #alias la='ls -FGal'