diff --git a/bash/.bashrc b/bash/.bashrc index df215ca..545b4e6 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -41,3 +41,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/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 diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index aab9dca..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 diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline index 396cc92..e03afa1 160000 --- a/vim/.vim/bundle/vim-airline +++ b/vim/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 396cc9226171f8dbf1069800a0ae56700bbf3913 +Subproject commit e03afa1733c6296774ca95ef981bd8fd39bb1151 diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes index 26f67b9..5d75d76 160000 --- a/vim/.vim/bundle/vim-airline-themes +++ b/vim/.vim/bundle/vim-airline-themes @@ -1 +1 @@ -Subproject commit 26f67b926553555e505ac60e992c97ab5fdfc83f +Subproject commit 5d75d76ca2e17edd68f89ac4f547009d477570c6 diff --git a/vim/.vimrc b/vim/.vimrc index beb95c0..d19229c 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 @@ -25,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