Merge remote-tracking branch 'upsteam/master'

updated changed for tmux

.bash_aliases

@@ -1,9 +1,8 @@
 alias gti='git'
-alias tmux='tmux -2'
+#alias tmux='tmux -2'
 alias less='less -R'
 alias diff='colordiff'
 alias dc='cd'
 alias nethack-online='ssh nethack@nethack.alt.org ; clear'
 alias tron-online='ssh sshtron.zachlatta.com ; clear'
-alias yams='find . -type f -name "*.yml*" | sed "s|\./||g" | egrep -v "(\.kitchen/|\[warning\]|\.molecule/)" | xargs yamllint -f parsable'
 alias glog='git log --oneline --graph --color --all --decorate'

.tmux.conf

@@ -6,15 +6,25 @@ set -g default-terminal "screen-256color"
 set -g history-limit 50000
 
 # Tmux mouse mode
-set-option -g mouse off
+set-option -g mouse on
+
+## Enable mouse with 'm' and disable with 'M'
+unbind m
+bind m \
+ set -g mouse on \;\
+ display 'Mouse: ON'
+unbind M
+  bind M \
+  set -g mouse off \;\
+  display 'Mouse: OFF'
 
 # THEME
 set -g status-bg colour235
 set -g status-fg yellow
-set-option -g status-attr dim
-set-window-option -g window-status-current-fg brightred #orange
-set-window-option -g window-status-current-bg colour236
-set-window-option -g window-status-current-attr bright
+#set-option -g status-attr dim
+#set-window-option -g window-status-current-fg brightred #orange
+#set-window-option -g window-status-current-bg colour236
+#set-window-option -g window-status-current-attr bright
 
 set -g status-interval 60
 set -sg escape-time 1000
@@ -23,13 +33,13 @@ setw -g aggressive-resize on
 set -g status-justify centre
 #set -g status-left '#[fg=green]#(whoami)@#H#[default]'
 set -g status-left-length 70
-set -g status-left "#[fg=yellow]#(ifconfig eth0 | grep 'inet ' | awk '{print \"eth0 \" $2}') #(ifconfig eth1 | grep 'inet ' | awk '{print \"eth1 \" $2}') #[fg=red]#(ifconfig tun0 | grep 'inet ' | awk '{print \"vpn \" $2}') #(ifconfig ppp0 | grep 'inet ' | awk '{print \"vpn \" $2}')"
+set -g status-left "#[fg=yellow]#(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | awk '{print \"Local \" $2}') #[fg=red]#(ifconfig tun0 | grep 'inet ' | awk '{print \"vpn \" $2}') #(ifconfig ppp0 | grep 'inet ' | awk '{print \"vpn \" $2}')"
 # show session name, window & pane number, date and time on right side of status bar
 set -g status-right-length 60
 set -g status-right "#[fg=blue]#S #I:#P #[fg=yellow]:: %d %b %Y #[fg=green]:: %l:%M %p :: #(date -u | awk '{print $4}')::"
 # set pane colors - hilight the active pane
-set-option -g pane-border-fg colour235 #base02
-set-option -g pane-active-border-fg colour240 #base01
+#set-option -g pane-border-fg colour235 #base02
+#set-option -g pane-active-border-fg colour240 #base01
 
 
 # use PREFIX | to split window horizontally and PREFIX - to split vertically
@@ -61,5 +71,5 @@ bind-key -n C-S-Right resize-pane -R 10
 #    display-message "Windows reordered..."
 
 ## pane border and colors
-set-option -g pane-active-border-fg yellow
-set-option -g pane-border-fg white
+#set-option -g pane-active-border-fg yellow
+#set-option -g pane-border-fg white

.vimrc

@@ -1,5 +1,6 @@
 " execute pathogen#infect()
-
+set mouse=
+set ttymouse=
 " Allow saving of files as sudo when I forgot to start vim using sudo.
 cmap w!! w !sudo tee > /dev/null %