From 27ea98bdbd3719eaf2af9e13a07431220f72348a Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Thu, 14 Jul 2016 15:15:29 -0400 Subject: [PATCH] fix all the things --- INSTALL.sh | 3 ++- gitignore | 1 + vim/init.vim | 2 +- vim/nvim | 1 + vim/vim | 1 + vimrc | 7 +++++-- zshrc | 9 +++++---- 7 files changed, 16 insertions(+), 8 deletions(-) create mode 120000 vim/nvim create mode 120000 vim/vim diff --git a/INSTALL.sh b/INSTALL.sh index b0ac0c5..928c288 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -6,7 +6,8 @@ ln -s $(pwd)/gitignore ~/.gitignore ln -s $(pwd)/hushlogin ~/.hushlogin ln -s $(pwd)/vim ~/.vim ln -s $(pwd)/vimrc ~/.vimrc -ln -s $(pwd)/vimrc.bundles ~/.vimrc.bundles +ln -s ~/.config/nvim ~/.vim +ln -s ~/.config/nvim/init.vim ~/.vimrc ln -s $(pwd)/zshrc ~/.zshrc ln -s $(pwd)/tyrel.zsh-theme ~/.oh-my-zsh/themes/tyrel.zsh-theme diff --git a/gitignore b/gitignore index 839acd2..b418965 100644 --- a/gitignore +++ b/gitignore @@ -10,3 +10,4 @@ tags tmp/**/* !tmp/cache/.keep .pre-commit-config.yaml +.ruby-version diff --git a/vim/init.vim b/vim/init.vim index 8c1e516..90104ae 120000 --- a/vim/init.vim +++ b/vim/init.vim @@ -1 +1 @@ -/Users/tyrelsouza/.vimrc \ No newline at end of file +/home/tsouza/.vimrc \ No newline at end of file diff --git a/vim/nvim b/vim/nvim new file mode 120000 index 0000000..5eb6985 --- /dev/null +++ b/vim/nvim @@ -0,0 +1 @@ +/home/tsouza/.config/nvim \ No newline at end of file diff --git a/vim/vim b/vim/vim new file mode 120000 index 0000000..f4109ac --- /dev/null +++ b/vim/vim @@ -0,0 +1 @@ +/home/tsouza/Documents/gitlab/tyrelsouza/dotfiles/vim \ No newline at end of file diff --git a/vimrc b/vimrc index 4b32039..1c14fc3 100644 --- a/vimrc +++ b/vimrc @@ -6,6 +6,7 @@ execute pathogen#infect() syntax on colorscheme monokai set noshowmode +set mouse-=a " Leader let mapleader = " " @@ -102,12 +103,14 @@ autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif nmap :NERDTreeToggle -autocmd BufWinLeave *.* mkview -autocmd BufWinEnter *.* silent loadview +"autocmd BufWinLeave *.* mkview +"autocmd BufWinEnter *.* silent loadview autocmd StdinReadPre * let s:std_in=1 +hi Normal ctermbg=none + " Local config if filereadable($HOME . "/.vimrc.local") diff --git a/zshrc b/zshrc index 7ea87be..973e0b1 100644 --- a/zshrc +++ b/zshrc @@ -1,6 +1,6 @@ # Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh -plugins=(git brew sudo github django python pip) +plugins=(git brew sudo github django python pip dnf emoji cp vagrant virtualenv nmap rvm) if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then ZSH_THEME="soliah" @@ -21,8 +21,8 @@ export GOPATH=$HOME/go export PHP_AUTOCONF="/usr/local/bin/autoconf" export WORKON_HOME=$HOME/.virtualenvs export PROJECT_HOME=$HOME/AddGeneProjects -source /usr/local/bin/virtualenvwrapper_lazy.sh -source $HOME/bin/virtualenv-auto-activate.sh +source /usr/bin/virtualenvwrapper.sh +#source $HOME/bin/virtualenv-auto-activate.sh @@ -55,7 +55,6 @@ fi COMPLETION_WAITING_DOTS="true" -export ADDGENE_CORE_REPO_DIR=/Users/tyrelsouza/AddGeneProjects/addgene-core # VMware Fusion if [ -d "/Applications/VMware Fusion.app/Contents/Library" ]; then @@ -87,3 +86,5 @@ if [ -e ~/.zshrc.local ];then source ~/.zshrc.local fi alias vim=nvim +export VAGRANT_DEFAULT_PROVIDER=virtualbox +source $HOME/.profile