From 9627470c6d4a884b1d67b6833002bc443d8e5d7f Mon Sep 17 00:00:00 2001 From: jond Date: Sat, 28 Jul 2018 11:35:15 -0500 Subject: [PATCH] Updated --- bash/.bashrc | 4 +++- vim/.vim/bundle/calendar.vim | 2 +- vim/.vim/bundle/jedi-vim | 2 +- vim/.vim/bundle/lightline.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/supertab | 1 + vim/.vim/bundle/syntastic | 2 +- vim/.vim/bundle/vim-easyescape | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- vim/.vim/bundle/vim-surround | 2 +- vim/.vimrc | 12 ++++++++++-- x/.Xresources | 2 -- 12 files changed, 22 insertions(+), 13 deletions(-) create mode 160000 vim/.vim/bundle/supertab diff --git a/bash/.bashrc b/bash/.bashrc index 9d5ea2f..df215ca 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -10,11 +10,13 @@ fi #pager setup #-C faster reprints +#-F auto quit if less than 1 screen #-M more status #-I case insensitive #-j 5 show X lines above search for context +#-R fix ansi esc sequences ## 4 - right/left four chars -export LESS='-C -M -I -j 5 -# 4 -R' +export LESS='-C -F -M -I -j 5 -R -# 4' # User specific aliases and functions alias l.='ls -lh --color=auto' 2>/dev/null diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim index 1aee272..f27fcf5 160000 --- a/vim/.vim/bundle/calendar.vim +++ b/vim/.vim/bundle/calendar.vim @@ -1 +1 @@ -Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e +Subproject commit f27fcf52c8a516f55ede5cff468f0a3e4014ae1b diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index f07ff6a..9a4a4f4 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65 +Subproject commit 9a4a4f4074e3bee97e46353cb09e9dc8855aca1b diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index 41fb97e..0532dff 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b +Subproject commit 0532dff598abca9975d3f80128eaadadbf1d91d4 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 6188c5e..d6032c8 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3 +Subproject commit d6032c876c6d6932ab7f07e262a16c9a85a31d5b diff --git a/vim/.vim/bundle/supertab b/vim/.vim/bundle/supertab new file mode 160000 index 0000000..40fe711 --- /dev/null +++ b/vim/.vim/bundle/supertab @@ -0,0 +1 @@ +Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index d17b98c..0dde090 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d +Subproject commit 0dde090ed41b383b1fa56f8db49d89e0735b1ca9 diff --git a/vim/.vim/bundle/vim-easyescape b/vim/.vim/bundle/vim-easyescape index 710f59b..7054da8 160000 --- a/vim/.vim/bundle/vim-easyescape +++ b/vim/.vim/bundle/vim-easyescape @@ -1 +1 @@ -Subproject commit 710f59bc13acd843aa80b2a2954fea6154f730c5 +Subproject commit 7054da8cae2995fb5f834790d3a6c8c880aabc7d diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index b14434b..a8626a4 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2 +Subproject commit a8626a4ca448036227bf1de537dccd1f3599df4b diff --git a/vim/.vim/bundle/vim-surround b/vim/.vim/bundle/vim-surround index e49d6c2..aa1f120 160000 --- a/vim/.vim/bundle/vim-surround +++ b/vim/.vim/bundle/vim-surround @@ -1 +1 @@ -Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313 +Subproject commit aa1f120ad3a29c27cc41d581cda3751c59343cce diff --git a/vim/.vimrc b/vim/.vimrc index b3a0059..beb95c0 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -81,6 +81,13 @@ map :NERDTreeToggle "lightline colorscheme let g:lightline = {'colorscheme': 'jellybeans',} +"supertab setting +"let g:SuperTabDefaultCompletionType = "context" + +"vim-jedi auto-select first, saves a keystroke +let g:jedi#popup_select_first = 0 +let g:SuperTabCrMapping=1 + " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() @@ -90,20 +97,21 @@ Plugin 'tpope/vim-fugitive' Plugin 'kien/ctrlp.vim' Plugin 'scrooloose/nerdtree' Plugin 'tmhedberg/SimpylFold' -Plugin 'vim-scripts/indentpython.vim' +"Plugin 'vim-scripts/indentpython.vim' Plugin 'scrooloose/syntastic' " PEP8 checking plugin Plugin 'nvie/vim-flake8' Plugin 'itchyny/lightline.vim' Plugin 'taohex/lightline-buffer' "Plugin 'klen/python-mode' -Plugin 'itchyny/calendar.vim' +"Plugin 'itchyny/calendar.vim' Plugin 'davidhalter/jedi-vim' Plugin 'tpope/vim-surround' Plugin 'ap/vim-buftabline' Plugin 'wellle/targets.vim' Plugin 'junegunn/goyo.vim' Plugin 'zhou13/vim-easyescape' +Plugin 'ervandew/supertab' call vundle#end() " required filetype plugin indent on " required diff --git a/x/.Xresources b/x/.Xresources index 13e9429..82e1ff8 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -6,8 +6,6 @@ URxvt*shading: 10 URxvt*perl-ext-common: default,matcher URxvt*matcher.button: 1 -! URxvt*url-launcher: /usr/bin/google-chrome -! URxvt*url-launcher: /home/jon/apps/firefox/firefox URxvt*url-launcher: /usr/bin/firefox ! URxvt.blurRadius: 25