From 8339691402a347f81d8e7896e8acfc8cebca7ddf Mon Sep 17 00:00:00 2001 From: jon Date: Sun, 20 May 2018 10:08:10 -0500 Subject: [PATCH 1/4] Removed xrdb from bashrc --- bash/.bashrc | 1 - vim/.vim/bundle/jedi-vim | 2 +- vim/.vim/bundle/lightline.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/syntastic | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 6dbc515..2f28a73 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -23,5 +23,4 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH export EDITOR=/usr/bin/vim [ -f ~/.fzf.bash ] && source ~/.fzf.bash -xrdb -merge /home/jon/.colors/codeschool.dark diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index f07ff6a..48af2af 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65 +Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index 41fb97e..78c43c1 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b +Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 6188c5e..a172d7c 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3 +Subproject commit a172d7cfcb4fe9b927dcc24184204fc89d826301 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index d17b98c..b7b473b 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d +Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index b14434b..3e0bd86 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2 +Subproject commit 3e0bd86b99c50691f830d9e25a4bbe2a88078f8f From daa517a02f3c54c234a687215b177ae95b06dfa3 Mon Sep 17 00:00:00 2001 From: jomido Date: Wed, 2 May 2018 09:48:10 -0500 Subject: [PATCH 2/4] Main thing here was adding enter mapping in vim to insert newline without leaving normal mode --- tmux/.tmux.conf | 9 ++++++++- vim/.vim/.netrwhist | 4 +++- vim/.vim/bundle/Vundle.vim | 2 +- 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/syntastic | 2 +- vim/.vim/bundle/targets.vim | 1 + vim/.vim/bundle/vim-buftabline | 1 + vim/.vim/bundle/vim-fugitive | 2 +- vim/.vimrc | 5 ++++- 12 files changed, 24 insertions(+), 10 deletions(-) create mode 160000 vim/.vim/bundle/targets.vim create mode 160000 vim/.vim/bundle/vim-buftabline diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 9cf6ff1..980e37e 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,3 +1,8 @@ +#remove escape delay +set -s escape-time 0 + +set -g default-terminal "rxvt-unicode-256color" + #change C-b to Ca unbind C-b set-option -g prefix C-a @@ -31,7 +36,9 @@ set -g mode-keys vi if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ 'set -g mouse on' \ 'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' -# 'set -g mouse on; set -g mouse-utf8 on' \ + +set -g mouse on +#'set -g mouse on; set -g mouse-utf8 on' \ bind-key Tab last-window bind-key BTab previous-window diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist index 66efdea..5d389e8 100644 --- a/vim/.vim/.netrwhist +++ b/vim/.vim/.netrwhist @@ -1,5 +1,7 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =3 +let g:netrw_dirhist_cnt =5 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' diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim index 6437ad6..9a38216 160000 --- a/vim/.vim/bundle/Vundle.vim +++ b/vim/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87 +Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim index 6d6be26..1aee272 160000 --- a/vim/.vim/bundle/calendar.vim +++ b/vim/.vim/bundle/calendar.vim @@ -1 +1 @@ -Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c +Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index 0c6a2b7..48af2af 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78 +Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index b19faca..78c43c1 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590 +Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 8cd17c1..a0e49c9 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538 +Subproject commit a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index 5e1b26c..2c02edd 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333 +Subproject commit 2c02edd174c60abc6e176dda8e03ccc3276dcb2c diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim new file mode 160000 index 0000000..c173218 --- /dev/null +++ b/vim/.vim/bundle/targets.vim @@ -0,0 +1 @@ +Subproject commit c1732189c9ec29cc3320094304019ffcafadafc4 diff --git a/vim/.vim/bundle/vim-buftabline b/vim/.vim/bundle/vim-buftabline new file mode 160000 index 0000000..14d208b --- /dev/null +++ b/vim/.vim/bundle/vim-buftabline @@ -0,0 +1 @@ +Subproject commit 14d208b1fa5f4308383e3ce429d57c84423029f9 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index 913fff1..409b098 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5 +Subproject commit 409b098c93bc7d8345b1de300f9e2b8c3dce2add diff --git a/vim/.vimrc b/vim/.vimrc index e44b663..92b2598 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -54,6 +54,7 @@ nnoremap inoremap jj inoremap jk inoremap kj +nnoremap o nnoremap l :ls:b nnoremap :bnext @@ -66,7 +67,7 @@ nnoremap za map :NERDTreeToggle "lightline colorscheme -let g:lightline = {'colorscheme': 'powerline',} +let g:lightline = {'colorscheme': 'jellybeans',} " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim @@ -87,6 +88,8 @@ Plugin 'itchyny/lightline.vim' Plugin 'itchyny/calendar.vim' Plugin 'davidhalter/jedi-vim' Plugin 'tpope/vim-surround' +Plugin 'ap/vim-buftabline' +Plugin 'wellle/targets.vim' call vundle#end() " required filetype plugin indent on " required From 7526102530177cfecd3418c457a975e5465cca0f Mon Sep 17 00:00:00 2001 From: jomido Date: Wed, 23 May 2018 09:34:23 -0500 Subject: [PATCH 3/4] Added vi mode back into bashrc and fixed cls bug --- bash/.bashrc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bash/.bashrc b/bash/.bashrc index 8f63c90..e273039 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -21,3 +21,11 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH export EDITOR=/usr/bin/vim [ -f ~/.fzf.bash ] && source ~/.fzf.bash + +#vi readline +set -o vi +#ctrl-x, ctrl-e to launch $EDITOR (vim) +bind -m vi-insert '"\C-x\C-e": edit-and-execute-command' + +#fix clear screen in vi mode +bind -m vi-insert "\C-l":clear-screen From 26bf46ad54973c05fad18a7dda15ac89f63a762f Mon Sep 17 00:00:00 2001 From: jomido Date: Wed, 23 May 2018 10:21:47 -0500 Subject: [PATCH 4/4] Fixed merge issues --- bash/.bashrc | 3 --- vim/.vimrc | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 01d5fc1..357dde3 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -24,7 +24,6 @@ export EDITOR=/usr/bin/vim [ -f ~/.fzf.bash ] && source ~/.fzf.bash -<<<<<<< HEAD #vi readline set -o vi #ctrl-x, ctrl-e to launch $EDITOR (vim) @@ -32,5 +31,3 @@ bind -m vi-insert '"\C-x\C-e": edit-and-execute-command' #fix clear screen in vi mode bind -m vi-insert "\C-l":clear-screen -======= ->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf diff --git a/vim/.vimrc b/vim/.vimrc index 19ba076..a148695 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -51,13 +51,13 @@ nnoremap nnoremap nnoremap nnoremap -<<<<<<< HEAD + " use jj to escape insert mode inoremap jj inoremap jk inoremap kj nnoremap o -======= + " use jk to escape insert mode - using easyescape plugin let g:easyescape_chars = { "j": 1, "k": 1 } let g:easyescape_timeout = 100 @@ -67,7 +67,6 @@ cnoremap kj " blank lines nnoremap o nnoremap O ->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf nnoremap l :ls:b nnoremap :bnext @@ -90,7 +89,6 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'tpope/vim-fugitive' Plugin 'kien/ctrlp.vim' Plugin 'scrooloose/nerdtree' -"Plugin 'fholgado/minibufexpl.vim' Plugin 'tmhedberg/SimpylFold' Plugin 'vim-scripts/indentpython.vim' Plugin 'scrooloose/syntastic' @@ -102,13 +100,10 @@ Plugin 'taohex/lightline-buffer' Plugin 'itchyny/calendar.vim' Plugin 'davidhalter/jedi-vim' Plugin 'tpope/vim-surround' -<<<<<<< HEAD Plugin 'ap/vim-buftabline' Plugin 'wellle/targets.vim' -======= Plugin 'junegunn/goyo.vim' Plugin 'zhou13/vim-easyescape' ->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf call vundle#end() " required filetype plugin indent on " required