Merge branch 'master' of ssh://jonfu.com/home/jon/dots

Conflicts:
	vim/.vim/bundle/lightline.vim

.tools/get_public_ip.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+dig +short myip.opendns.com @resolver1.opendns.com;

bash/.bashrc

@@ -6,14 +6,27 @@ if [ -f /etc/bashrc ]; then
 fi
 
 # Uncomment the following line if you don't like systemctl's auto-paging feature:
-# export SYSTEMD_PAGER=
+#export SYSTEMD_PAGER=
+
+#pager setup
+#-C faster reprints
+#-M more status
+#-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'
 
 # 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'
+<<<<<<< HEAD
+alias dmesg='dmesg -H'
+=======
+alias ip='ip -c'
+>>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -22,3 +35,9 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+
+#ctrl-x, ctrl-e to launch $EDITOR (vim)
+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

tmux/.tmux.conf

@@ -1,3 +1,8 @@
+set -g default-terminal screen-256color
+
+#remove escape delay
+set -s escape-time 0
+
 #change C-b to Ca
 unbind C-b
 set-option -g prefix C-a
@@ -31,8 +36,41 @@ set -g mode-keys vi
 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-utf8 on' \
+
+#set -g mouse on
+#'set -g mouse on; set -g mouse-utf8 on' \
 
 bind-key Tab last-window
 bind-key BTab previous-window
 
+# Basic status bar colors
+set-option -g status-bg default
+set-option -g status-fg white
+
+# Left side of status bar
+set-option -g status-left-length 40
+set-option -g status-left "#[fg=colour18,bg=colour12] #S #[fg=default,bg=default] "
+
+# Window status
+set-option -g window-status-format "#[fg=colour18,bg=brightblack] #I #[fg=white,bg=black] #W "
+set-option -g window-status-current-format "#[fg=colour18,bg=colour7] #I #[fg=colour18,bg=colour4] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 40
+set-option -g status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=colour18,bg=colour4] #(whoami)@#h "
+
+# Pane border
+set-option -g pane-border-bg default
+set-option -g pane-border-fg brightblack
+set-option -g pane-active-border-bg default
+set-option -g pane-active-border-fg white
+
+# Pane number indicator
+set-option -g display-panes-colour brightblack
+set-option -g display-panes-active-colour brightwhite
+
+# Clock mode
+set-option -g clock-mode-colour white
+set-option -g clock-mode-style 24

vim/.vim/.netrwhist

@@ -1,5 +1,7 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =5
 let g:netrw_dirhist_1='/home/jon'
 let g:netrw_dirhist_2='/home/jon/.gnome'
 let g:netrw_dirhist_3='/home/jon'
+let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
+let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'

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 <Leader>c :set cursorline! cursorcolumn!<CR>
@@ -51,6 +51,13 @@ nnoremap <C-j> <C-W><C-J>
 nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
+
+" use jj to escape insert mode 
+inoremap jj <Esc>
+inoremap jk <Esc>
+inoremap kj <Esc>
+nnoremap <CR> o<Esc>
+
 " use jk to escape insert mode - using easyescape plugin 
 let g:easyescape_chars = { "j": 1, "k": 1 }
 "let g:easyescape_timeout = 100
@@ -72,7 +79,7 @@ nnoremap <space> za
 map <C-n> :NERDTreeToggle<CR>
 
 "lightline colorscheme
-let g:lightline = {'colorscheme': 'powerline',}
+let g:lightline = {'colorscheme': 'jellybeans',}
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
@@ -82,7 +89,6 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
-"Plugin 'fholgado/minibufexpl.vim'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/syntastic'
@@ -94,6 +100,8 @@ Plugin 'taohex/lightline-buffer'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
+Plugin 'ap/vim-buftabline'
+Plugin 'wellle/targets.vim'
 Plugin 'junegunn/goyo.vim'
 Plugin 'zhou13/vim-easyescape'
 

x/.Xresources

@@ -1,33 +1,52 @@
-*background: #151B1A
-*foreground: #8FA388
-
-*cursorColor: #9E6438
-
-*color0: #2E2B38
-*color1: #984E66
-*color2: #7A8C54
-*color3: #9E6438
-*color4: #395667
-*color5: #9D916B
-*color6: #536556
-*color7: #828181
-*color8: #474159
-*color9: #A86D56
-*color10: #9FB274
-*color11: #B29F5E
-*color12: #507A91
-*color13: #B89855
-*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
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
 ! URxvt*url-launcher:      /usr/bin/google-chrome
-URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+! URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+URxvt*url-launcher:     /usr/bin/firefox
 
 ! URxvt.blurRadius: 25
+URxvt*.termName: rxvt-unicode-256color
+
+! special
+*.foreground:   #c5c8c6
+*.background:   #1d1f21
+*.cursorColor:  #c5c8c6
+
+! black
+*.color0:       #282a2e
+*.color8:       #373b41
+
+! red
+*.color1:       #a54242
+*.color9:       #cc6666
+
+! green
+*.color2:       #8c9440
+*.color10:      #b5bd68
+
+! yellow
+*.color3:       #de935f
+*.color11:      #f0c674
+
+! blue
+*.color4:       #5f819d
+*.color12:      #81a2be
+
+! magenta
+*.color5:       #85678f
+*.color13:      #b294bb
+
+! cyan
+*.color6:       #5e8d87
+*.color14:      #8abeb7
+
+! white
+*.color7:       #707880
+*.color15:      #c5c8c6
+