Merge branch 'master' of github.com:10sr/dotfiles

profile

@@ -2,8 +2,10 @@
 
 # ~/.dotfiles/profile
 
-test -n "$DOTFILES_PROFILE" && return
-export DOTFILES_PROFILE=t
+# This not works when, for example, inherit parent ENV and load /etc/profile
+# again.
+#test -n "$DOTFILES_PROFILE" && return
+#export DOTFILES_PROFILE=t
 
 # export PS1="\$ "
 export LC_TIME=C

setup.sh

@@ -56,7 +56,7 @@ git_config(){
     git config --global status.relativePaths false
     git config --global status.showUntrackedFiles normal
     git config --global log.date iso
-    git config --global alias.graph "log --graph --date-order -C -M --pretty=tformat:\"<%C(green)%h%C(reset)> %C(white)%ad%C(reset) [%C(red)%an%C(reset)] %C(yellow)%d%C(reset) %C(white bold)%s%C(reset)\" --all --date=iso -n 499"
+    git config --global alias.graph "log --graph --date-order -C -M --pretty=tformat:\"%C(green)%h%C(reset) %C(white)%ad%C(reset) %C(red)%an%C(reset)%C(yellow)%d%C(reset) %C(white bold)%s%C(reset)\" --all --date=iso -n 499"
     git config --global alias.st "status -s -b"
     git config --global alias.b "branch"
     git config --global alias.sb "show-branch"

tmux.conf.pl

@@ -42,6 +42,8 @@ sub set_key {
 }
 
 sub set_prefs {
+    set("base-index", "1");
+    set("pane-base-index", "1");
     setw("mode-keys", "vi");
     set("default-command", "/bin/bash");
     set("default-path", $ENV{"HOME"});
@@ -49,16 +51,25 @@ sub set_prefs {
     set("display-panes-time", "5000");
 }
 
+sub get_hostname {
+    my $hostname = $ENV{"HOSTNAME"};
+    if (! $hostname) {
+        $hostname = `hostname`;
+        $hostname =~ s/\n//;
+    }
+    return $hostname;
+}
+
 sub set_status_line {
     my $user = $ENV{"USER"};
-    my $hostname = $ENV{"HOSTNAME"};
+    my $hostname = get_hostname();
     my $tmux_v = `tmux -V`;
     $tmux_v =~ s/\n//;
     set("status-right", "${user}\@${hostname} | ${tmux_v} ");
 }
 
 sub set_colors {
-    my $hostname = $ENV{"HOSTNAME"};
+    my $hostname = get_hostname();
     my $color = $color_prefs{$hostname};
     if (! $color) {
         $color = $color_def;