From 7389708dcd23df87da827f816e25e9bf5e1cf3fc Mon Sep 17 00:00:00 2001 From: jomido Date: Wed, 20 Jun 2018 11:50:59 -0500 Subject: [PATCH 1/4] Updated bashrc, dmesg -T and l/ll/etc colors --- bash/.bashrc | 8 +++----- vim/.vimrc | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 357dde3..3fb33b5 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -10,11 +10,11 @@ fi # User specific aliases and functions alias l.='ls -lh --color=auto' 2>/dev/null -alias l='ls -lh' -alias ll='ls -lh' -#set -o vi +alias l='ls -lh --color=auto' +alias ll='ls -lh --color=auto' alias p='ping' alias s='sudo' +alias dmesg='dmesg -H' #golang stuff export GOPATH=$HOME/gopath @@ -24,8 +24,6 @@ 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' diff --git a/vim/.vimrc b/vim/.vimrc index a148695..a8e7047 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -27,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236 set cursorline "enable relative line numbers -set number relativenumber +"set number relativenumber "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white nnoremap c :set cursorline! cursorcolumn! From 164ab9f4d81bd4ac43c2e7e9253c06d0b55d8224 Mon Sep 17 00:00:00 2001 From: Jon Dossey Date: Thu, 21 Jun 2018 12:30:32 -0500 Subject: [PATCH 2/4] Created tools dir for simple scripts --- .tools/get_public_ip.sh | 3 +++ tmux/.tmux.conf | 8 +++----- 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 | 2 +- vim/.vim/bundle/vim-airline | 2 +- vim/.vim/bundle/vim-airline-themes | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- vim/.vimrc | 2 +- 13 files changed, 17 insertions(+), 16 deletions(-) create mode 100755 .tools/get_public_ip.sh diff --git a/.tools/get_public_ip.sh b/.tools/get_public_ip.sh new file mode 100755 index 0000000..4d3ba92 --- /dev/null +++ b/.tools/get_public_ip.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +dig +short myip.opendns.com @resolver1.opendns.com; diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 940568d..e905e7f 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,8 +1,8 @@ +set -g default-terminal screen-256color + #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 @@ -37,14 +37,12 @@ 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 bind-key BTab previous-window -set -g default-terminal "screen-256color" - # Basic status bar colors set-option -g status-bg default set-option -g status-fg white diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim index 9a38216..6437ad6 160000 --- a/vim/.vim/bundle/Vundle.vim +++ b/vim/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d +Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87 diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim index 1aee272..6d6be26 160000 --- a/vim/.vim/bundle/calendar.vim +++ b/vim/.vim/bundle/calendar.vim @@ -1 +1 @@ -Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e +Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index 48af2af..7792439 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36 +Subproject commit 77924398bd594e238766153cec97ace62650f082 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index 78c43c1..555f202 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923 +Subproject commit 555f202e33987863aaa31bf4df75ef989c3c49a7 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index a0e49c9..97433ed 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8 +Subproject commit 97433edd43f3a4a95c84389bcaafbe7a047cf756 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index 2c02edd..206b616 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 2c02edd174c60abc6e176dda8e03ccc3276dcb2c +Subproject commit 206b616c8e49f948d18231799c469aa3e6e2c29c diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim index c173218..c3042dc 160000 --- a/vim/.vim/bundle/targets.vim +++ b/vim/.vim/bundle/targets.vim @@ -1 +1 @@ -Subproject commit c1732189c9ec29cc3320094304019ffcafadafc4 +Subproject commit c3042dc18acc0dfcee479310d3efc6aefe92db75 diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline index e9a7a12..396cc92 160000 --- a/vim/.vim/bundle/vim-airline +++ b/vim/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137 +Subproject commit 396cc9226171f8dbf1069800a0ae56700bbf3913 diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes index 08c76e4..26f67b9 160000 --- a/vim/.vim/bundle/vim-airline-themes +++ b/vim/.vim/bundle/vim-airline-themes @@ -1 +1 @@ -Subproject commit 08c76e4cd0cdaa12c476ed03b920912173e31339 +Subproject commit 26f67b926553555e505ac60e992c97ab5fdfc83f diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index 409b098..7c9b87a 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 409b098c93bc7d8345b1de300f9e2b8c3dce2add +Subproject commit 7c9b87a3c3ef4b53425aca4a27e11a7359caae9f diff --git a/vim/.vimrc b/vim/.vimrc index a8e7047..b3a0059 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -60,7 +60,7 @@ nnoremap o " use jk to escape insert mode - using easyescape plugin let g:easyescape_chars = { "j": 1, "k": 1 } -let g:easyescape_timeout = 100 +"let g:easyescape_timeout = 100 cnoremap jk cnoremap kj From e6fbc77181622cbe35553c6210d88ea1e99b34a0 Mon Sep 17 00:00:00 2001 From: Jon Dossey Date: Thu, 21 Jun 2018 17:16:04 -0500 Subject: [PATCH 3/4] Updated some stuff (great msg right?) --- dirindex.html | 33 +++++++++++++++++++++++++ index.html | 1 + vim/.vim/bundle/Vundle.vim | 2 +- vim/.vim/bundle/calendar.vim | 2 +- vim/.vim/bundle/dirindex.html | 41 ++++++++++++++++++++++++++++++++ vim/.vim/bundle/index.html | 1 + vim/.vim/bundle/jedi-vim | 2 +- vim/.vim/bundle/lightline-buffer | 2 +- vim/.vim/bundle/lightline.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/syntastic | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- vim/.vim/dirindex.html | 37 ++++++++++++++++++++++++++++ vim/.vim/index.html | 1 + vim/.vimrc | 2 +- vim/dirindex.html | 35 +++++++++++++++++++++++++++ vim/index.html | 1 + 17 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 dirindex.html create mode 120000 index.html create mode 100644 vim/.vim/bundle/dirindex.html create mode 120000 vim/.vim/bundle/index.html create mode 100644 vim/.vim/dirindex.html create mode 120000 vim/.vim/index.html create mode 100644 vim/dirindex.html create mode 120000 vim/index.html diff --git a/dirindex.html b/dirindex.html new file mode 100644 index 0000000..e34400c --- /dev/null +++ b/dirindex.html @@ -0,0 +1,33 @@ + + + + + + Directory Index: dots + + + +
+

(root) + / +dots

+

Directory Index

+
+ +
+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/index.html b/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file 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/dirindex.html b/vim/.vim/bundle/dirindex.html new file mode 100644 index 0000000..e0d05d4 --- /dev/null +++ b/vim/.vim/bundle/dirindex.html @@ -0,0 +1,41 @@ + + + + + + Directory Index: dots/vim/.vim/bundle + + + +
+

(root) + / +dots + / +vim + / +.vim + / +bundle

+

Directory Index

+
+ +

+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/vim/.vim/bundle/index.html b/vim/.vim/bundle/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/vim/.vim/bundle/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index 0c6a2b7..6781eb1 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78 +Subproject commit 6781eb17dad705eab1d1d932ebf3b1871a90c783 diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer index 1c090e0..128ddaa 160000 --- a/vim/.vim/bundle/lightline-buffer +++ b/vim/.vim/bundle/lightline-buffer @@ -1 +1 @@ -Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca +Subproject commit 128ddaad4a4d57c10f224428c7f64a10e5f21ca5 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index b19faca..41fb97e 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590 +Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 8cd17c1..6188c5e 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538 +Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index 5e1b26c..d17b98c 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333 +Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index 913fff1..b1df5f1 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5 +Subproject commit b1df5f1226676ae52380a214e0b13af1250951cd diff --git a/vim/.vim/dirindex.html b/vim/.vim/dirindex.html new file mode 100644 index 0000000..aae61be --- /dev/null +++ b/vim/.vim/dirindex.html @@ -0,0 +1,37 @@ + + + + + + Directory Index: dots/vim/.vim + + + +
+

(root) + / +dots + / +vim + / +.vim

+

Directory Index

+
+ +

+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/vim/.vim/index.html b/vim/.vim/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/vim/.vim/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file diff --git a/vim/.vimrc b/vim/.vimrc index 4745d72..86cc628 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -53,7 +53,7 @@ nnoremap nnoremap " use jk to escape insert mode - using easyescape plugin let g:easyescape_chars = { "j": 1, "k": 1 } -let g:easyescape_timeout = 100 +"let g:easyescape_timeout = 100 cnoremap jk cnoremap kj diff --git a/vim/dirindex.html b/vim/dirindex.html new file mode 100644 index 0000000..819e04b --- /dev/null +++ b/vim/dirindex.html @@ -0,0 +1,35 @@ + + + + + + Directory Index: dots/vim + + + +
+

(root) + / +dots + / +vim

+

Directory Index

+
+ +

+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/vim/index.html b/vim/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/vim/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file From cb8d5ead688ef80c3d3d290caf7e4b55b98bfc46 Mon Sep 17 00:00:00 2001 From: jon Date: Sun, 24 Jun 2018 15:15:18 -0500 Subject: [PATCH 4/4] ugh --- bash/.bashrc | 1 + 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/vim-fugitive | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 8f63c90..bc9e815 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -21,3 +21,4 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH export EDITOR=/usr/bin/vim [ -f ~/.fzf.bash ] && source ~/.fzf.bash +alias p='ping' 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..25009a8 160000 --- a/vim/.vim/bundle/calendar.vim +++ b/vim/.vim/bundle/calendar.vim @@ -1 +1 @@ -Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c +Subproject commit 25009a8eeae8ecca0c0d74f06f62ad82d2557c1c 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..ed446e5 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538 +Subproject commit ed446e5cbe0733a8f98befc88d33e42edebb67d2 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index 5e1b26c..b7b473b 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333 +Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index 913fff1..b82abd5 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5 +Subproject commit b82abd5bd583cfb90be63ae12adc36a84577bd45