Merge branch 'release/1.0.0'

.dotphiles

@@ -1 +1 @@
-0.2.5
+1.0.0

.gitignore

@@ -26,9 +26,10 @@ gnupg/sshcontrol
 gnupg/random*
 gnupg/private*
 gnupg/*~
+mercurial/certs/
 mutt/cache/*
 mutt/mailboxes.*
 mutt/smime/*
 mutt/certificates
-task/*.data
+task/task/*.data
 

CHANGES.md

@@ -0,0 +1,7 @@
+dotphiles changelog
+-------------------
+
+  - 1.0.0  : Intitial stable release
+  - 0.2.x  : Bugfixes
+  - 0.1.x  : Initial releases
+

postgresql/psqlrc

@@ -12,7 +12,7 @@
 \set PROMPT1 '(%n@%M:%>) [%/] > '
 \set PROMPT2 ''
 \set PAGER OFF
-\set HISTFILE ~/.history/psql- :HOST - : DBNAME -- Remove space between : and DBNAME
+\set HISTFILE ~/.history/psql- :HOST - :DBNAME
 \set HISTSIZE 2000
 \set ECHO_HIDDEN ON
 \set COMP_KEYWORD_CASE upper

ssh/config

@@ -12,9 +12,6 @@ ForwardAgent yes
 #VisualHostKey yes
 HashKnownHosts no
 #ConnectTimeout 2
-ServerAliveCountMax 6
-ServerAliveInterval 30
-KeepAlive yes
 
 # My Hosts
 #Host hostname hostname.fqdn.com
@@ -24,6 +21,9 @@ KeepAlive yes
 Host *
     #User username
     StrictHostKeyChecking ask
+    ServerAliveCountMax 6
+    ServerAliveInterval 30
+    KeepAlive yes
     #ControlMaster auto
     #ControlPath ~/.ssh/master/%r@%h:%p
 

tmux/tmux.conf

@@ -15,7 +15,8 @@ if-shell 'test "$(uname)" = "Darwin"' 'bind C-c run "tmux save-buffer - | reatta
 if-shell 'test "$(uname)" = "Darwin"' 'bind C-v run "reattach-to-user-namespace pbpaste | tmux load-buffer - && tmux paste-buffer"'
 
 # 0 is too far from ` ;)
-set -g base-index 1
+set-option -g base-index 1
+set-window-option -g pane-base-index 1
 
 set-option -g default-command $SHELL
 set-option -g default-shell $SHELL
@@ -81,11 +82,14 @@ bind -n M-Down select-pane -D
 bind -n S-Left  previous-window
 bind -n S-Right next-window
 
+# easily toggle synchronization (mnemonic: e is for echo)
+bind e setw synchronize-panes
+
 # No delay for escape key press
 set -sg escape-time 0
 
 # Reload tmux config
-bind r source-file ~/.tmux.conf \; display-message 'Releaded ~/.tmux.conf!'
+bind r source-file ~/.tmux.conf \; display-message 'Reloaded ~/.tmux.conf!'
 
 # Set window notifications
 setw -g monitor-activity on
@@ -103,14 +107,14 @@ set -g status-fg blue
 set-window-option -g window-status-current-fg white
 
 #set -g status-position top
-set -g status-left-length 32
+set -g status-left-length 64
 set -g status-right-length 150
 
 set -g status-fg blue
 set -g status-bg black
 # pane border
 set-option -g pane-border-fg black
-set-option -g pane-active-border-fg brightgreen
+set-option -g pane-active-border-fg brightcyan
 # pane number display
 set-option -g display-panes-active-colour brightyellow
 set-option -g display-panes-colour yellow
@@ -121,9 +125,10 @@ set -g message-attr bold
 # clock
 set-window-option -g clock-mode-colour green
 # window status
-set -g window-status-format "#[fg=yellow,bg=black] #I #W "
-set -g window-status-activity-attr bold
+set -g window-status-format "#[fg=brightyellow,bg=black] #I #W "
+set -g window-status-activity-attr reverse
 set -g window-status-current-format "#[fg=black,bg=yellow]⮀#[fg=black,bg=yellow,noreverse,bold] #I ⮁ #W #[fg=yellow,bg=black,nobold]⮀"
 # statusbar
-set -g status-left '#[fg=brightwhite,bg=blue,bold] ❐ #S #[fg=blue,bg=brightyellow,nobold]⮀#[fg=white,bg=brightyellow,bold] #(whoami) #[fg=brightyellow,bg=black,nobold]⮀'
+set -g status-left '#[fg=brightwhite,bg=blue,bold] ❐ #S #[fg=blue,bg=brightyellow,nobold]⮀#[fg=white,bg=brightyellow,bold] #(whoami)@#(hostname -s) #[fg=brightyellow,bg=black,nobold]⮀'
 set -g status-right ' %H:%M:%S %d-%b-%y '
+

vim/vimrc

@@ -18,8 +18,6 @@ if has("user_commands")
   "let g:vundles=['general', 'programming', 'php', 'ruby', 'python', 'javascript', 'html', 'misc']
   let g:vundles=['general', 'programming']
   let g:neocomplcache_enable_at_startup = 1
-  " Tell Neosnippet about the other snippets
-  let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
   " Load 'vundles'
   source ~/.vim/vundles.vim
   " Add extra bundles here...