powerline json files and dircolors moved.

dotfiles/config/powerline/colors.json

@@ -0,0 +1,110 @@
+{
+  "colors": {
+    "black": 16,
+    "white": 231,
+
+    "darkestgreen": 22,
+    "darkgreen": 28,
+    "mediumgreen": 70,
+    "brightgreen": 148,
+
+    "darkestcyan": 23,
+    "darkcyan": 74,
+    "mediumcyan": 117,
+    "brightcyan": 159,
+
+    "darkestblue": 24,
+    "darkblue": 31,
+
+    "darkestred": 52,
+    "darkred": 88,
+    "mediumred": 124,
+    "brightred": 160,
+    "brightestred": 196,
+
+    "darkestpurple": 55,
+    "mediumpurple": 98,
+    "brightpurple": 189,
+
+    "darkorange": 94,
+    "mediumorange": 166,
+    "brightorange": 208,
+    "brightestorange": 214,
+
+    "brightyellow": 220,
+
+    "gray0": 233,
+    "gray1": 235,
+    "gray2": 236,
+    "gray3": 239,
+    "gray4": 240,
+    "gray5": 241,
+    "gray6": 244,
+    "gray7": 245,
+    "gray8": 247,
+    "gray9": 250,
+    "gray10": 252,
+
+    "gray61": [14, "93a1a1"],
+    "gray13": [8, "002b36"],
+
+    "royalblue5": [0, "073642"],
+    "darkgreencopper": [10, "586e75"],
+    "lightskyblue4": [11, "657b83"],
+    "azure4": [12, "839496"],
+    "lightyellow": [7, "eee8d5"],
+    "oldlace": [15, "fdf6e3"],
+
+    "green": [2, "719e07"],
+    "cyan": [6, "2aa198"],
+    "blue": [4, "268bd2"],
+    "red": [1, "dc322f"],
+    "magenta": [5, "d33682"],
+    "violet": [13, "6c71c4"],
+    "orange": [9, "cb4b16"],
+    "yellow": [3, "b58900"],
+
+    "lightyellowgreen": 106,
+    "gold3": 178,
+    "orangered": 202,
+
+    "steelblue": 67,
+    "darkorange3": 166,
+    "skyblue1": 117,
+    "khaki1": 228
+  },
+  "gradients": {
+    "dark_GREEN_Orange_red": [
+      [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 94, 94, 94, 94, 94, 94, 94, 52],
+      ["005f00", "015f00", "025f00", "035f00", "045f00", "055f00", "065f00", "075f00", "085f00", "095f00", "0b5f00", "0c5f00", "0d5f00", "0e5f00", "0f5f00", "105f00", "115f00", "125f00", "135f00", "145f00", "165f00", "175f00", "185f00", "195f00", "1a5f00", "1b5f00", "1c5f00", "1d5f00", "1e5f00", "1f5f00", "215f00", "225f00", "235f00", "245f00", "255f00", "265f00", "275f00", "285f00", "295f00", "2a5f00", "2c5f00", "2d5f00", "2e5f00", "2f5f00", "305f00", "315f00", "325f00", "335f00", "345f00", "355f00", "375f00", "385f00", "395f00", "3a5f00", "3b5f00", "3c5f00", "3d5f00", "3e5f00", "3f5f00", "415f00", "425f00", "435f00", "445f00", "455f00", "465f00", "475f00", "485f00", "495f00", "4a5f00", "4c5f00", "4d5f00", "4e5f00", "4f5f00", "505f00", "515f00", "525f00", "535f00", "545f00", "555f00", "575f00", "585f00", "595f00", "5a5f00", "5b5f00", "5c5f00", "5d5f00", "5e5f00", "615f00", "655f00", "685f00", "6c5f00", "6f5f00", "735f00", "765f00", "7a5f00", "7d5f00", "815f00", "845f00", "815200", "702900"]
+    ],
+    "GREEN_Orange_red": [
+      [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1],
+      ["005f00", "015f00", "025f00", "035f00", "045f00", "055f00", "065f00", "075f00", "085f00", "095f00", "0b5f00", "0c5f00", "0d5f00", "0e5f00", "0f5f00", "105f00", "115f00", "125f00", "135f00", "145f00", "165f00", "175f00", "185f00", "195f00", "1a5f00", "1b5f00", "1c5f00", "1d5f00", "1e5f00", "1f5f00", "215f00", "225f00", "235f00", "245f00", "255f00", "265f00", "275f00", "285f00", "295f00", "2a5f00", "2c5f00", "2d5f00", "2e5f00", "2f5f00", "305f00", "315f00", "325f00", "335f00", "345f00", "355f00", "375f00", "385f00", "395f00", "3a5f00", "3b5f00", "3c5f00", "3d5f00", "3e5f00", "3f5f00", "415f00", "425f00", "435f00", "445f00", "455f00", "465f00", "475f00", "485f00", "495f00", "4a5f00", "4c5f00", "4d5f00", "4e5f00", "4f5f00", "505f00", "515f00", "525f00", "535f00", "545f00", "555f00", "575f00", "585f00", "595f00", "5a5f00", "5b5f00", "5c5f00", "5d5f00", "5e5f00", "615f00", "655f00", "685f00", "6c5f00", "6f5f00", "735f00", "765f00", "7a5f00", "7d5f00", "815f00", "845f00", "815200", "702900"]
+    ],
+    "green_yellow_red": [
+      [190, 184, 178, 172, 166, 160],
+      ["8ae71c", "8ce71c", "8fe71c", "92e71c", "95e71d", "98e71d", "9ae71d", "9de71d", "a0e71e", "a3e71e", "a6e71e", "a8e71e", "abe71f", "aee71f", "b1e71f", "b4e71f", "b6e720", "b9e720", "bce720", "bfe720", "c2e821", "c3e721", "c5e621", "c7e521", "c9e522", "cbe422", "cde322", "cfe222", "d1e223", "d3e123", "d5e023", "d7df23", "d9df24", "dbde24", "dddd24", "dfdc24", "e1dc25", "e3db25", "e5da25", "e7d925", "e9d926", "e9d626", "e9d426", "e9d126", "e9cf27", "e9cc27", "e9ca27", "e9c727", "e9c528", "e9c228", "e9c028", "e9bd28", "e9bb29", "e9b829", "e9b629", "e9b329", "e9b12a", "e9ae2a", "e9ac2a", "e9a92a", "eaa72b", "eaa42b", "eaa22b", "ea9f2b", "ea9d2c", "ea9b2c", "ea982c", "ea962c", "ea942d", "ea912d", "ea8f2d", "ea8d2d", "ea8a2e", "ea882e", "ea862e", "ea832e", "ea812f", "ea7f2f", "ea7c2f", "ea7a2f", "eb7830", "eb7530", "eb7330", "eb7130", "eb6f31", "eb6c31", "eb6a31", "eb6831", "eb6632", "eb6332", "eb6132", "eb5f32", "eb5d33", "eb5a33", "eb5833", "eb5633", "eb5434", "eb5134", "eb4f34", "eb4d34", "ec4b35"]
+    ],
+    "green_yellow_orange_red": [
+      [2, 3, 9, 1],
+      ["719e07", "739d06", "759c06", "779c06", "799b06", "7b9a05", "7d9a05", "7f9905", "819805", "839805", "859704", "879704", "899604", "8b9504", "8d9504", "8f9403", "919303", "949303", "969203", "989102", "9a9102", "9c9002", "9e9002", "a08f02", "a28e01", "a48e01", "a68d01", "a88c01", "aa8c01", "ac8b00", "ae8a00", "b08a00", "b28900", "b58900", "b58700", "b68501", "b78302", "b78102", "b87f03", "b97d04", "b97b04", "ba7905", "bb7806", "bb7606", "bc7407", "bd7208", "bd7008", "be6e09", "bf6c0a", "bf6a0a", "c0690b", "c1670c", "c1650c", "c2630d", "c3610e", "c35f0e", "c45d0f", "c55b10", "c55a10", "c65811", "c75612", "c75412", "c85213", "c95014", "c94e14", "ca4c15", "cb4b16", "cb4a16", "cc4917", "cc4818", "cd4719", "cd4719", "ce461a", "ce451b", "cf441c", "cf441c", "d0431d", "d0421e", "d1411f", "d1411f", "d24020", "d23f21", "d33e22", "d33e22", "d43d23", "d43c24", "d53b25", "d53b25", "d63a26", "d63927", "d73828", "d73828", "d83729", "d8362a", "d9352b", "d9352b", "da342c", "da332d", "db322e", "dc322f"]
+    ],
+    "yellow_red": [
+      [220, 178, 172, 166, 160],
+      ["ffd700", "fdd500", "fbd300", "fad200", "f8d000", "f7cf00", "f5cd00", "f3cb00", "f2ca00", "f0c800", "efc700", "edc500", "ebc300", "eac200", "e8c000", "e7bf00", "e5bd00", "e3bb00", "e2ba00", "e0b800", "dfb700", "ddb500", "dbb300", "dab200", "d8b000", "d7af00", "d7ad00", "d7ab00", "d7aa00", "d7a800", "d7a700", "d7a500", "d7a300", "d7a200", "d7a000", "d79f00", "d79d00", "d79b00", "d79a00", "d79800", "d79700", "d79500", "d79300", "d79200", "d79000", "d78f00", "d78d00", "d78b00", "d78a00", "d78800", "d78700", "d78500", "d78300", "d78200", "d78000", "d77f00", "d77d00", "d77b00", "d77a00", "d77800", "d77700", "d77500", "d77300", "d77200", "d77000", "d76f00", "d76d00", "d76b00", "d76a00", "d76800", "d76700", "d76500", "d76300", "d76200", "d76000", "d75f00", "d75b00", "d75700", "d75300", "d74f00", "d74c00", "d74800", "d74400", "d74000", "d73c00", "d73900", "d73500", "d73100", "d72d00", "d72900", "d72600", "d72200", "d71e00", "d71a00", "d71600", "d71300", "d70f00", "d70b00", "d70700"]
+    ],
+    "yellow_orange_red": [
+      [3, 9, 1],
+      ["b58900", "b58700", "b58600", "b68501", "b68401", "b78202", "b78102", "b88003", "b87f03", "b87d03", "b97c04", "b97b04", "ba7a05", "ba7805", "bb7706", "bb7606", "bc7507", "bc7307", "bc7207", "bd7108", "bd7008", "be6e09", "be6d09", "bf6c0a", "bf6b0a", "c06a0b", "c0680b", "c0670b", "c1660c", "c1650c", "c2630d", "c2620d", "c3610e", "c3600e", "c35e0e", "c45d0f", "c45c0f", "c55b10", "c55910", "c65811", "c65711", "c75612", "c75412", "c75312", "c85213", "c85113", "c94f14", "c94e14", "ca4d15", "ca4c15", "cb4b16", "cb4a16", "cb4a17", "cc4917", "cc4918", "cc4818", "cd4819", "cd4719", "cd471a", "ce461a", "ce461b", "ce451b", "cf451c", "cf441c", "cf441d", "d0431d", "d0431e", "d0421e", "d1421f", "d1411f", "d14120", "d24020", "d24021", "d23f21", "d33f22", "d33e22", "d33e23", "d43d23", "d43d24", "d43c24", "d53c25", "d53b25", "d53b26", "d63a26", "d63a27", "d63927", "d73928", "d73828", "d73829", "d83729", "d8372a", "d8362a", "d9362b", "d9352b", "d9352c", "da342c", "da342d", "da332d", "db332e"]
+    ],
+    "blue_red": [
+      [39, 74, 68, 67, 103, 97, 96, 132, 131, 167, 203, 197],
+      ["19b4fe", "1bb2fc", "1db1fa", "1faff8", "22aef6", "24adf4", "26abf2", "29aaf0", "2ba9ee", "2da7ec", "30a6ea", "32a5e8", "34a3e6", "36a2e4", "39a0e2", "3b9fe1", "3d9edf", "409cdd", "429bdb", "449ad9", "4798d7", "4997d5", "4b96d3", "4d94d1", "5093cf", "5292cd", "5490cb", "578fc9", "598dc7", "5b8cc6", "5e8bc4", "6089c2", "6288c0", "6487be", "6785bc", "6984ba", "6b83b8", "6e81b6", "7080b4", "727eb2", "757db0", "777cae", "797aac", "7b79ab", "7e78a9", "8076a7", "8275a5", "8574a3", "8772a1", "89719f", "8c709d", "8e6e9b", "906d99", "926b97", "956a95", "976993", "996791", "9c668f", "9e658e", "a0638c", "a3628a", "a56188", "a75f86", "a95e84", "ac5c82", "ae5b80", "b05a7e", "b3587c", "b5577a", "b75678", "ba5476", "bc5374", "be5273", "c05071", "c34f6f", "c54e6d", "c74c6b", "ca4b69", "cc4967", "ce4865", "d14763", "d34561", "d5445f", "d7435d", "da415b", "dc4059", "de3f58", "e13d56", "e33c54", "e53a52", "e83950", "ea384e", "ec364c", "ee354a", "f13448", "f33246", "f53144", "f83042", "fa2e40"]
+    ],
+    "white_red": [
+      [231, 223, 216, 209, 196],
+      ["ffffff", "fffe61", "fffcc4", "fffb28", "fff98b", "fff7ef", "fff651", "fff4b4", "fff318", "fff17b", "ffefdf", "ffee41", "ffeca4", "ffeb08", "ffe96b", "ffe7cf", "ffe631", "ffe494", "ffe2f8", "ffe15b", "ffdfbf", "ffde21", "ffdc84", "ffdae8", "ffd94b", "ffd7af", "ffd602", "ffd455", "ffd2aa", "ffd0fd", "ffcf50", "ffcda5", "ffcbf8", "ffca4b", "ffc8a0", "ffc6f3", "ffc546", "ffc39b", "ffc1ee", "ffc041", "ffbe96", "ffbce9", "ffbb3c", "ffb991", "ffb7e4", "ffb637", "ffb48c", "ffb2df", "ffb132", "ffaf87", "ffadda", "ffac2d", "ffaa82", "ffa8d5", "ffa728", "ffa57d", "ffa3d0", "ffa223", "ffa078", "ff9ecb", "ff9d1e", "ff9b73", "ff99c6", "ff9819", "ff966e", "ff94c1", "ff9314", "ff9169", "ff8fbc", "ff8e0f", "ff8c64", "ff8ab7", "ff890a", "ff875f", "ff81f4", "ff7c8a", "ff771f", "ff71b5", "ff6c4c", "ff66e1", "ff6177", "ff5c0c", "ff56a2", "ff5139", "ff4bce", "ff4664", "ff40f9", "ff3b8f", "ff3626", "ff30bb", "ff2b51", "ff25e6", "ff207c", "ff1b13", "ff15a8", "ff103e", "ff0ad3", "ff0569", "ff0000"]
+    ]
+  }
+}

dotfiles/config/powerline/colorschemes/tmux/default.json

@@ -1,7 +1,12 @@
 {
   "name": "Default color scheme for terminal prompts",
   "groups": {
-    "background:divider": { "fg": "gray5", "bg": "gray0" },
+    "global": { "fg": "darkestred", "bg": "gray0" },
+    "window_status_left": { "fg": "gray10", "bg": "gray0" },
+    "window_status_right": { "fg": "gray10", "bg": "gray0" },
+    "current_window_status_left": { "fg": "gray10", "bg": "darkestred" },
+    "current_window_status_right": { "fg": "gray10", "bg": "darkblue" },
+    "background:divider": { "fg": "darkestred", "bg": "gray0" },
     "session": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
     "date": { "fg": "gray8", "bg": "gray2" },
     "time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
@@ -18,6 +23,7 @@
     "cpu_load_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" },
     "environment": { "fg": "gray8", "bg": "gray0" },
     "battery": { "fg": "gray8", "bg": "gray0" },
+    "test": { "fg": "gray10", "bg": "black" },
     "battery_gradient": { "fg": "white_red", "bg": "gray0" },
     "now_playing": { "fg": "gray10", "bg": "black" }
   }

dotfiles/config/powerline/themes/tmux/default.json

@@ -18,9 +18,6 @@
 	"name": "uptime",
 	"priority": 50
       },
-      {
-	"name": "date"
-      },
       {
 	"name": "date",
 	"args": {
@@ -28,16 +25,18 @@
 	  "istime": true
 	}
       },
-      {
-	"name": "hostname"
-      }
-    ],
-    "left": [
       {
 	"name": "external_ip"
       },
       {
-        "name": "system_load"
+	"name": "hostname"
+      }
+    ],
+    "special": [
+      {
+        "name": "window_status",
+        "type": "string",
+        "contnets": "#I"
       }
     ]
   }

dotfiles/emacs.d

@@ -1 +1 @@
-Subproject commit d6fbf2572c090b2a4a34da42d270501e0fbc036d
+Subproject commit 88a8048591b2de0a422e74bc96049777c7a40b92

dotfiles/gitconfig

@@ -1,5 +1,5 @@
 [alias]
-	l = log --pretty=oneline -n 20 --graph
+	l = log --pretty=oneline --graph
 	s = status -s
 	c = clone --recursive
 	ff = merge --ff-only

dotfiles/gitignore

@@ -21,3 +21,4 @@ Thumbs.db
 TAGS
 run_tests.sh
 untracked/
+.ropeproject/

dotfiles/lib/shellrc.sh

@@ -7,3 +7,5 @@ for filename in ~/.lib/shellrc/*; do
     source $filename
 done
 
+local dircolors_file="$HOME/.dircolors"
+test -r $dircolors_files  && eval "$(dircolors $dircolors_file)"

dotfiles/lib/shellrc/aliases.sh

@@ -5,6 +5,7 @@ alias timestamp='date +%s'
 alias go2dotfiles='cd $(dirname `readlink -f ~/.zshrc | xargs dirname`)'
 alias fn='find . -name '
 alias prj='cd ~/Projects'
+alias reload_tmux='tmux source-file ~/.tmux.conf'
 
 # enables the sudoing of aliases.
 alias sudo='sudo '

dotfiles/tmux.powerline

@@ -2,12 +2,10 @@ if-shell 'test -z "$POWERLINE_COMMAND"' 'if-shell "which powerline-client" "set-
 set -g status on
 set -g status-utf8 on
 set -g status-interval 2
-set -g status-fg colour231
+set -g status-justify left
-set -g status-bg colour234
 set -g status-left-length 150
-set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour234,nobold]#(eval $POWERLINE_COMMAND tmux left)'
-set -g status-right '#(eval $POWERLINE_COMMAND tmux right -R pane_id=`tmux display -p "#D"`)'
 set -g status-right-length 150
+set -g status-right '#(eval $POWERLINE_COMMAND tmux right -R pane_id=`tmux display -p "#D"`)'
 set -g window-status-format "#[fg=colour244,bg=colour234]#I #[fg=colour240] #[default]#W "
 set -g window-status-current-format "#[fg=colour234,bg=colour31]#[fg=colour117,bg=colour31] #I  #[fg=colour231,bold]#W #[fg=colour31,bg=colour234,nobold]"
 set-window-option -g window-status-fg colour249