From af5fcee77de2f195a508b2cebd78d95563547478 Mon Sep 17 00:00:00 2001 From: jomido Date: Wed, 18 Jul 2018 15:44:48 -0500 Subject: [PATCH 1/6] Added some options to $LESS and messed with vim clipboard --- bash/.bashrc | 5 ++++- vim/.vimrc | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bash/.bashrc b/bash/.bashrc index 7497146..15830ea 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 @@ -39,3 +39,6 @@ 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 + +#add date/time to history +export HISTTIMEFORMAT="%F %T: " diff --git a/vim/.vimrc b/vim/.vimrc index b3a0059..39ebe0c 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -10,6 +10,9 @@ set showtabline=2 set hidden set incsearch +" share system clipboard +set clipboard=^unnamed,unnamedplus + " hide showmode because its in statusline set noshowmode From 033ae55594b0b6d49635c1637716cc134cb72250 Mon Sep 17 00:00:00 2001 From: jomido Date: Wed, 18 Jul 2018 15:45:19 -0500 Subject: [PATCH 2/6] This was a rebase from master --- vim/.vim/bundle/calendar.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/syntastic | 2 +- vim/.vim/bundle/targets.vim | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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/nerdtree b/vim/.vim/bundle/nerdtree index ed446e5..a0e49c9 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit ed446e5cbe0733a8f98befc88d33e42edebb67d2 +Subproject commit a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index b7b473b..2c02edd 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4 +Subproject commit 2c02edd174c60abc6e176dda8e03ccc3276dcb2c diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim index c3042dc..c173218 160000 --- a/vim/.vim/bundle/targets.vim +++ b/vim/.vim/bundle/targets.vim @@ -1 +1 @@ -Subproject commit c3042dc18acc0dfcee479310d3efc6aefe92db75 +Subproject commit c1732189c9ec29cc3320094304019ffcafadafc4 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index b82abd5..409b098 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit b82abd5bd583cfb90be63ae12adc36a84577bd45 +Subproject commit 409b098c93bc7d8345b1de300f9e2b8c3dce2add From 712e769bf130a7b922cf685a4eec8d82c3349dce Mon Sep 17 00:00:00 2001 From: jomido Date: Sun, 22 Jul 2018 14:00:05 -0500 Subject: [PATCH 3/6] 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 4/6] 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 5/6] 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 From 117278ea13e0e9b72c5906081cbeb8553f875670 Mon Sep 17 00:00:00 2001 From: jomido Date: Mon, 23 Jul 2018 11:04:39 -0500 Subject: [PATCH 6/6] Added vertical column at 79 characters to see wrap edge --- vim/.vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/.vimrc b/vim/.vimrc index 39ebe0c..f851198 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -28,6 +28,8 @@ set fileformat=unix "highlight cursorline cterm=none ctermbg=darkred ctermfg=white guibg=darkred guifg=white hi cursorline cterm=none term=none ctermbg=236 set cursorline +" vertical column at 79 so you know when to wrap +set colorcolumn=79 "enable relative line numbers "set number relativenumber