merge

tmux.conf

@@ -54,7 +54,7 @@ set -g status-justify centre
 # 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"
+set -g status-right "#[fg=blue]#S #I:#P #[fg=yellow]: %d %b %Y #[fg=green]: %l:%M %p : #(date -u | awk '{print $4}') :"
 
 
 # show host name and IP address on left side of status bar
@@ -95,3 +95,16 @@ bind p paste-buffer # `prefix + p` pastes the latest buffer
 # bind -t vi-copy Enter
 #bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"toggle
 
+#bind -t vi-copy y copy-pipe 'xclip -in -selection clipboard'
+
+#bind p paste-buffer # `prefix + p` pastes the latest buffer
+# in copy mode…
+
+# Update default binding of `Enter` to also use copy-pipe
+#bind -t vi-copy Enter copy-selection
+#bind-key -t vi-copy Enter #copy-pipe "reattach-to-user-namespace pbcopy"toggle
+#set-option -g default-command "reattach-to-user-namespace -l zsh"
+
+
+# These two necessary for Mac OS copying
+bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"

vimrc

@@ -0,0 +1,10 @@
+set nocompatible
+
+filetype on
+filetype plugin on
+filetype indent on
+syntax on
+set hidden
+set showmode
+
+:set nu

zshrc

@@ -100,13 +100,16 @@ alias grm='git rebase origin/master'
 alias gp='git pull origin master'
 alias gra='git reset --soft HEAD@{1}'
 
-alias sls='s4cmd ls'
+alias sl='s4cmd ls'
 alias sg='s4cmd get'
 alias sp='s4cmd put'
 
+alias size='du -sh *'
+
 # Watcher
 alias watch='python ~/bin/keepwatching'
 
+alias venv='use_virtualenv'
 
 alias redshift="ssh hive@hive001"
 alias reload="source ~/.zshrc"