From ba4dcd13083038dd87bdee63cafed3653a029d0c Mon Sep 17 00:00:00 2001
From: Alex Kelly <alex.kelly@franklin.edu>
Date: Thu, 30 Apr 2020 09:31:20 -0400
Subject: [PATCH] Added .direnvc

---
 .direnvrc | 9 +++++++++
 vim/vimrc | 7 ++++---
 zsh/zshrc | 9 +++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 .direnvrc

diff --git a/.direnvrc b/.direnvrc
new file mode 100644
index 0000000..4abe70d
--- /dev/null
+++ b/.direnvrc
@@ -0,0 +1,9 @@
+layout_virtualenv() {
+  local venv_path="$1"
+  source ${venv_path}/bin/activate
+}
+
+layout_virtualenvwrapper() {
+  local venv_path="${WORKON_HOME}/$1"
+  layout_virtualenv $venv_path
+}
diff --git a/vim/vimrc b/vim/vimrc
index a8bf4c9..8b029d3 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -52,6 +52,8 @@ Plugin 'plasticboy/vim-markdown'
 Plugin 'fatih/vim-go'
 Plugin 'dbeniamine/cheat.sh-vim'
 Plugin 'jacqueswww/vim-vyper'
+Plugin 'direnv/direnv.vim'
+Plugin 'tomlion/vim-solidity'
 "let g:deoplete#enable_at_startup = 1
 "Plugin 'Shougo/deoplete.nvim'
 
@@ -82,13 +84,12 @@ set smarttab
 set softtabstop=4
 set autoindent
 set expandtab
-let &colorcolumn="80,".join(range(81,999),",")
-
+"let &colorcolumn="123,".join(range(124,999),",")
 augroup vimrc_autocmds
 	autocmd!
 	"highlight characters past col 80
 	autocmd FileType python highlight Excess ctermbg=DarkGrey guibg=Black
-	autocmd FileType python match Excess /\%80v.*/
+	autocmd FileType python match Excess /\%123v.*/
 	autocmd FileType python set nowrap
 "    autocmd FileType rst set textwidth=80
     autocmd FileType markdown set textwidth=80
diff --git a/zsh/zshrc b/zsh/zshrc
index dd377c9..67c06ca 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -82,9 +82,12 @@ alias atwork="task context work"
 alias athome="task context home"
 alias atschool="task context school"
 alias atnone="task context none;"
+alias icat="kitty +kitten icat"
+alias d="kitty +kitten diff"
 #eval "$(ntfy shell-integration)"
 source /usr/share/gems/gems/tmuxinator-0.6.11/completion/tmuxinator.zsh
 source ~/.private_aliases
+source /usr/bin/virtualenvwrapper.sh
 
 
 #Aliases
@@ -92,6 +95,7 @@ alias dum='du -sh *|egrep ".*\.?[0-9]M"'
 alias keploy='echo -e "\e[101;97mKeploy was removed, its functionality is already built in ssh-copy-id, just use that\e[49m"; ssh-copy-id'
 alias shrug='curl shrug.io|xclip'
 alias weather='curl wttr.in'
+alias ipython='ipython --no-confirm-exit'
 
 #Variable Exports
 export EDITOR='vim'
@@ -107,3 +111,8 @@ for f (~/.functions/**/*(N.))  . $f
 #This didn't work, but I'll leave it here in case someday it does
 #export AGNOSTER_PROMPT_SEGMENTS=("prompt_status" "prompt_context" "prompt_virtualenv" "prompt_dir" "prompt_end")
 cat /home/kellya/.local/share/franklinlogo.txt
+
+#Stop the annoying git prompt
+prompt_git () {
+        :
+}