From 4009da94841e784ad85e3e9fde7f6146d8627c23 Mon Sep 17 00:00:00 2001 From: jond Date: Sat, 21 Jul 2018 11:08:25 -0500 Subject: [PATCH 1/4] Fixed pager (less) options to deal with ansi esc sequences --- bash/.bashrc | 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/vim-fugitive | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 7497146..9d5ea2f 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -14,7 +14,7 @@ fi #-I case insensitive #-j 5 show X lines above search for context ## 4 - right/left four chars -export LESS='-C -M -I -j 5 -# 4' +export LESS='-C -M -I -j 5 -# 4 -R' # 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 25009a8..1aee272 160000 --- a/vim/.vim/bundle/calendar.vim +++ b/vim/.vim/bundle/calendar.vim @@ -1 +1 @@ -Subproject commit 25009a8eeae8ecca0c0d74f06f62ad82d2557c1c +Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index 48af2af..f07ff6a 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36 +Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index 78c43c1..41fb97e 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923 +Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index ed446e5..6188c5e 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit ed446e5cbe0733a8f98befc88d33e42edebb67d2 +Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index b7b473b..d17b98c 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4 +Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index b82abd5..b14434b 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit b82abd5bd583cfb90be63ae12adc36a84577bd45 +Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2 From 712e769bf130a7b922cf685a4eec8d82c3349dce Mon Sep 17 00:00:00 2001 From: jomido Date: Sun, 22 Jul 2018 14:00:05 -0500 Subject: [PATCH 2/4] Chromebook commits, tmux, x etc --- tmux/.tmux.conf | 7 ++++--- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/syntastic | 2 +- vim/.vim/bundle/vim-airline | 2 +- vim/.vim/bundle/vim-airline-themes | 2 +- vim/.vimrc | 1 + x/.Xresources | 4 ++-- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 1a1dda3..4b5ef49 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -28,6 +28,7 @@ set -g mode-keys vi # enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1 # copy/paste: shift+left click to highlight, then shift+middle to past -if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ - 'set -g mouse on; set -g mouse-utf8 on' \ - 'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' +#if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ +# 'set -g mouse on; set -g mouse-utf8 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 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 8cd17c1..a3fdf1e 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538 +Subproject commit a3fdf1e3c111e011af09d6d5a6b58517ea4fa6d7 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index 5e1b26c..e1161a7 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333 +Subproject commit e1161a723a353db99780f9a9351340df7abbb106 diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline index d8eb128..e03afa1 160000 --- a/vim/.vim/bundle/vim-airline +++ b/vim/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150 +Subproject commit e03afa1733c6296774ca95ef981bd8fd39bb1151 diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes index 08c76e4..5d75d76 160000 --- a/vim/.vim/bundle/vim-airline-themes +++ b/vim/.vim/bundle/vim-airline-themes @@ -1 +1 @@ -Subproject commit 08c76e4cd0cdaa12c476ed03b920912173e31339 +Subproject commit 5d75d76ca2e17edd68f89ac4f547009d477570c6 diff --git a/vim/.vimrc b/vim/.vimrc index e8faabf..87cf510 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -43,6 +43,7 @@ nnoremap nnoremap " use jj to escape insert mode inoremap jj +inoremap jk nnoremap l :ls:b nnoremap :bnext diff --git a/x/.Xresources b/x/.Xresources index 907ffb6..3bca90f 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -23,8 +23,8 @@ *color14: #7E9982 *color15: #BDBDA4 URxvt*scrollBar: false -URxvt.font: xft:xos4 Terminus:size=14:antialias=true -URxvt.boldFont: xft:xos4 Terminus:bold:size=14:antialias=true +URxvt.font: xft:Terminus:size=14:antialias=true +URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true URxvt*transparent: true URxvt*shading: 10 From e9a1e917d4ce8e798ccef24ef05486bad1a1ccd0 Mon Sep 17 00:00:00 2001 From: jomido Date: Sun, 22 Jul 2018 14:24:33 -0500 Subject: [PATCH 3/4] Removing those annoying indexes --- dirindex.html | 33 --------------------------------- index.html | 1 - 2 files changed, 34 deletions(-) delete mode 100644 dirindex.html delete mode 120000 index.html diff --git a/dirindex.html b/dirindex.html deleted file mode 100644 index e34400c..0000000 --- a/dirindex.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Directory Index: dots - - - -
-

(root) - / -dots

-

Directory Index

-
- -
-Root | -Global | -Sorted -
- -

Sub-directories:

-

- - - - - - - diff --git a/index.html b/index.html deleted file mode 120000 index 0fc8e54..0000000 --- a/index.html +++ /dev/null @@ -1 +0,0 @@ -dirindex.html \ No newline at end of file From d71ae981d4eb78affb3d39d9cbdb4fe07416bc44 Mon Sep 17 00:00:00 2001 From: jomido Date: Sun, 22 Jul 2018 14:28:20 -0500 Subject: [PATCH 4/4] Fixed tmux mouse and xresources merge conflict --- tmux/.tmux.conf | 9 ++++----- x/.Xresources | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 08da304..ab8ef91 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -33,11 +33,11 @@ set -g mode-keys vi # enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1 # copy/paste: shift+left click to highlight, then shift+middle to past -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' +#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 on #'set -g mouse on; set -g mouse-utf8 on' \ bind-key Tab last-window @@ -99,4 +99,3 @@ bind -T off F12 \ set -u status-right \;\ set -u status-bg \;\ display-message "EXIT inner tmux ..." ->>>>>>> 4009da94841e784ad85e3e9fde7f6146d8627c23 diff --git a/x/.Xresources b/x/.Xresources index ee3b611..13e9429 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -1,10 +1,6 @@ URxvt*scrollBar: false URxvt.font: xft:Terminus:size=14:antialias=true -<<<<<<< HEAD -URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true -======= !URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true ->>>>>>> 4009da94841e784ad85e3e9fde7f6146d8627c23 URxvt*transparent: true URxvt*shading: 10