From f1421eeb48670474bba80a0e95f10ad66891ff79 Mon Sep 17 00:00:00 2001
From: jon <jon@nhdc.local>
Date: Sat, 12 Jan 2019 21:23:28 -0600
Subject: [PATCH 1/2] Cleanup vimrc

---
 vim/.vimrc | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/vim/.vimrc b/vim/.vimrc
index 72d4ca0..a39f8b8 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -44,8 +44,6 @@ nnoremap <silent><expr> <Leader>h (&hls && v:hlsearch ? ':nohls' : ':set hls')."
 set showmatch
 set matchtime=2
 
-" python-syntax
-let pythong_highlight_all = 1
 syntax on
 
 set foldmethod=indent
@@ -79,11 +77,7 @@ nnoremap <S-Tab> :bprev<CR>
 
 nnoremap <space> za
 
-" NERDTree, open/close toggle
-" map <C-n> :NERDTreeToggle<CR>
-
 map <C-n> :NnnPicker<CR>
-
 " Opens the nnn window in a split
 let g:nnn#layout = { 'left': '~30%' } " or right, up, down
 
@@ -97,17 +91,14 @@ call plug#begin('~/.vim/plugged') " vim-plug
 
 Plug 'VundleVim/Vundle.vim'
 Plug 'tpope/vim-fugitive'
-"Plug 'scrooloose/nerdtree'
 Plug 'tmhedberg/SimpylFold'
 Plug 'vim-scripts/indentpython.vim'
 Plug 'scrooloose/syntastic'
 Plug 'nvie/vim-flake8'    " PEP 8 checking plugin
 Plug 'itchyny/lightline.vim'
 Plug 'taohexxx/lightline-buffer'
-"Plug 'klen/python-mode'
 Plug 'davidhalter/jedi-vim'
 Plug 'tpope/vim-surround'
-"Plug 'ap/vim-buftabline'
 Plug 'wellle/targets.vim'
 Plug 'junegunn/goyo.vim'
 Plug 'junegunn/fzf.vim'

From 6983714075d67d452bd871d8db7f5f8c13c0172a Mon Sep 17 00:00:00 2001
From: jon <jon@nhdc.local>
Date: Sun, 20 Jan 2019 15:18:16 -0600
Subject: [PATCH 2/2] Finally fixing prompt color and pipenv venv in prompt

---
 bash/.bashrc        | 7 ++++++-
 vim/.vim/.netrwhist | 3 ++-
 x/.Xresources       | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 37b517d..12e6425 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -50,10 +50,15 @@ export HISTSIZE=1000
 export HISTFILESIZE=2000
 
 # Prompt
-if [ -z $TERM ]; then
+if [ ! -z "$TERM" ]; then
     export PS1="\[$(tput bold)\]\[$(tput setaf 2)\][\u@\h \W]\\$ \[$(tput sgr0)\]"
 fi
 
+if [ ! -z "$VIRTUAL_ENV" ]; then
+    #export PS1="[$(basename "$VIRTUAL_ENV")] \[\u@\h \W]\\$"
+    export PS1="[$(basename "$VIRTUAL_ENV")] $PS1"
+fi
+
 # fedoras stupid command-not-found shit
 unset command_not_found_handle
 
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
index 5d389e8..a81370a 100644
--- a/vim/.vim/.netrwhist
+++ b/vim/.vim/.netrwhist
@@ -1,7 +1,8 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =5
+let g:netrw_dirhist_cnt =6
 let g:netrw_dirhist_1='/home/jon'
 let g:netrw_dirhist_2='/home/jon/.gnome'
 let g:netrw_dirhist_3='/home/jon'
 let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
 let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'
+let g:netrw_dirhist_6='/home/jon/projects/contract_management/app'
diff --git a/x/.Xresources b/x/.Xresources
index 5248656..e956e89 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,8 +1,8 @@
 URxvt*scrollBar:	false
 URxvt.font:     xft:Terminus:size=14:antialias=true
 !URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
-URxvt*transparent: true
-URxvt*shading: 10
+!URxvt*transparent: true
+!URxvt*shading: 10
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1