pulled in updates

This commit is contained in:
Caleb Young 2021-08-07 12:10:02 -07:00
parent 3f0ccd5ede
commit 5a4deea4db
2 changed files with 6 additions and 21 deletions

6
bashrc
View File

@ -16,8 +16,8 @@ HISTCONTROL=ignoreboth
shopt -s histappend
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
HISTSIZE=1000
HISTFILESIZE=2000
HISTSIZE=5000
HISTFILESIZE=5000
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
@ -136,5 +136,3 @@ alias su='sudo -i'
alias gist='git status'
#cd ~
#export SHELL=gnome-terminal
PATH=$PATH:/snap/bin

21
vimrc
View File

@ -12,7 +12,7 @@ Plugin 'flazz/vim-colorschemes'
Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
"Plugin 'vim-scripts/auto-pairs-gentle'
"Plugin 'Yggdroot/indentLine'
Plugin 'Yggdroot/indentLine'
Plugin 'scrooloose/nerdtree'
Plugin 'Xuyuanp/nerdtree-git-plugin'
@ -40,22 +40,9 @@ set background=dark
colorscheme PaperColor
set t_Co=256
cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
command Matlab :set autowrite | :term matlab -nodesktop
"Nerd Tree things
command Treemove :NERDTree | :normal <c-w><c-w>
autocmd vimenter * Treemove
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
command Tree :NERDTree | :normal <c-w><c-w>
"autocmd vimenter * Treemove
"autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
if (empty($TMUX))
if (has("nvim"))
"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
endif