From e141d0b1f808d5582dcf01191dc99e6eaeed58ad Mon Sep 17 00:00:00 2001 From: jond Date: Sat, 9 Sep 2017 09:00:13 -0500 Subject: [PATCH 1/4] Removed a comment from Xresources --- x/.Xresources | 3 --- 1 file changed, 3 deletions(-) diff --git a/x/.Xresources b/x/.Xresources index 907ffb6..e9777e0 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -1,9 +1,6 @@ *background: #151B1A *foreground: #8FA388 -! Alternate foreground -! !*foreground: #7E9982 - *cursorColor: #9E6438 *color0: #2E2B38 From 9d59533e47551ca83b753a0d6077d852de92e86b Mon Sep 17 00:00:00 2001 From: jond Date: Sun, 24 Sep 2017 17:54:32 -0500 Subject: [PATCH 2/4] Mapped C-Tab to function like alt-tab --- tmux/.tmux.conf | 5 ++++- vim/.vim/.netrwhist | 5 +++++ vim/.vim/bundle/vim-airline | 2 +- vim/.vim/bundle/vim-surround | 1 + vim/.vimrc | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 vim/.vim/.netrwhist create mode 160000 vim/.vim/bundle/vim-surround diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 1a1dda3..55f475b 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -29,5 +29,8 @@ 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 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' + +bind-key Tab last-window +bind-key BTab previous-window diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist new file mode 100644 index 0000000..66efdea --- /dev/null +++ b/vim/.vim/.netrwhist @@ -0,0 +1,5 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhist_cnt =3 +let g:netrw_dirhist_1='/home/jon' +let g:netrw_dirhist_2='/home/jon/.gnome' +let g:netrw_dirhist_3='/home/jon' diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline index d8eb128..e9a7a12 160000 --- a/vim/.vim/bundle/vim-airline +++ b/vim/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150 +Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137 diff --git a/vim/.vim/bundle/vim-surround b/vim/.vim/bundle/vim-surround new file mode 160000 index 0000000..e49d6c2 --- /dev/null +++ b/vim/.vim/bundle/vim-surround @@ -0,0 +1 @@ +Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313 diff --git a/vim/.vimrc b/vim/.vimrc index e8faabf..c4269a7 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -78,6 +78,7 @@ Plugin 'vim-airline/vim-airline-themes' "Plugin 'klen/python-mode' Plugin 'itchyny/calendar.vim' Plugin 'davidhalter/jedi-vim' +Plugin 'tpope/vim-surround' call vundle#end() " required filetype plugin indent on " required From 4b6766a2157095a1efe3683f3515615c5cbca009 Mon Sep 17 00:00:00 2001 From: jond Date: Thu, 2 Nov 2017 19:02:21 -0500 Subject: [PATCH 3/4] Added nested tmux config --- tmux/.tmux.conf | 31 +++++++++++++++++++++++++++++++ x/.Xresources | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 55f475b..c85c4d2 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -34,3 +34,34 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ bind-key Tab last-window bind-key BTab previous-window + +#nested tmux +set -g status-bg colour40 +setw -g window-status-current-bg colour40 + +bind -n C-t new-window -a +bind -n S-left prev +bind -n S-right next +bind -n S-C-left swap-window -t -1 +bind -n S-C-right swap-window -t +1 + +bind -n M-F11 set -qg status-bg colour25 +bind -n M-F12 set -qg status-bg colour40 +bind -n S-up \ + send-keys M-F12 \; \ + set -qg status-bg colour25 \; \ + unbind -n S-left \; \ + unbind -n S-right \; \ + unbind -n S-C-left \; \ + unbind -n S-C-right \; \ + unbind -n C-t \; \ + set -qg prefix C-b +bind -n S-down \ + send-keys M-F11 \; \ + set -qg status-bg colour40 \; \ + bind -n S-left prev \; \ + bind -n S-right next \; \ + bind -n S-C-left swap-window -t -1 \; \ + bind -n S-C-right swap-window -t +1 \; \ + bind -n C-t new-window -a -c "#{pane_current_path}" \; \ + set -qg prefix C-a diff --git a/x/.Xresources b/x/.Xresources index e9777e0..7b1bf93 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -27,4 +27,6 @@ URxvt*shading: 10 URxvt*perl-ext-common: default,matcher URxvt*matcher.button: 1 -URxvt*url-launcher: /usr/bin/google-chrome +! URxvt*url-launcher: /usr/bin/google-chrome +URxvt*url-launcher: /home/jon/Downloads/firefox/firefox + From 8ec84cb04cb2073f5741bc1073e53dfa4a088a50 Mon Sep 17 00:00:00 2001 From: jond Date: Thu, 2 Nov 2017 19:05:10 -0500 Subject: [PATCH 4/4] Removed nested for now --- tmux/.tmux.conf | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index c85c4d2..e89d7bc 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -35,33 +35,3 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ bind-key Tab last-window bind-key BTab previous-window -#nested tmux -set -g status-bg colour40 -setw -g window-status-current-bg colour40 - -bind -n C-t new-window -a -bind -n S-left prev -bind -n S-right next -bind -n S-C-left swap-window -t -1 -bind -n S-C-right swap-window -t +1 - -bind -n M-F11 set -qg status-bg colour25 -bind -n M-F12 set -qg status-bg colour40 -bind -n S-up \ - send-keys M-F12 \; \ - set -qg status-bg colour25 \; \ - unbind -n S-left \; \ - unbind -n S-right \; \ - unbind -n S-C-left \; \ - unbind -n S-C-right \; \ - unbind -n C-t \; \ - set -qg prefix C-b -bind -n S-down \ - send-keys M-F11 \; \ - set -qg status-bg colour40 \; \ - bind -n S-left prev \; \ - bind -n S-right next \; \ - bind -n S-C-left swap-window -t -1 \; \ - bind -n S-C-right swap-window -t +1 \; \ - bind -n C-t new-window -a -c "#{pane_current_path}" \; \ - set -qg prefix C-a