Update to tmux 1.2

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index a27550b..1aede82 100644 (file)
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -393,7 +393,7 @@ globalkeys = awful.util.table.join(
     awful.key(k_ms, "Tab", function () awful.screen.focus_relative(-1) end),
 
     -- Mod+Enter: Launch a new terminal
-    awful.key(k_m,  "e",      function() awful.util.spawn("firefox") end),
+    awful.key(k_m,  "e",      function() awful.util.spawn("chromium-browser") end),
     awful.key(k_m,  "Return", function() awful.util.spawn(terminal) end),
     awful.key(k_ac, "r", awesome.restart),
     awful.key(k_m, "F12", function() awful.util.spawn(lock) end),

diff --git a/tmux.conf b/tmux.conf
index 4dee807..1e5b57d 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,5 +1,6 @@
 # set the prefix to ^G
 
+set  -g default-terminal screen-256color
 set  -g history-limit 100000
 set  -g mouse-select-pane on
 setw -g mode-mouse on
@@ -110,6 +111,11 @@ setw -g window-status-attr dim
 setw -g window-status-format         '#I #W#F'
 setw -g window-status-current-format '#[fg=red,nobold][#[fg=white,bold]#I #W#F#[fg=red,nobold]]'
 
+set -g pane-border-bg default
+set -g pane-border-fg default
+set -g pane-active-border-bg default
+set -g pane-active-border-fg red
+
 # active window title colors
 setw -g window-status-current-fg   white
 setw -g window-status-current-bg   default

diff --git a/vimrc b/vimrc
index 64eb1c5..23e3632 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -364,31 +364,31 @@ if has("gui_running") || &t_Co >= 88
         exec <SID>myhi("Normal",       "none",       "dfdfdf",    "NONE")
         exec <SID>myhi("MoreMsg",      "none",       "dfdfdf",    "NONE")
     endif
-    exec <SID>myhi("Comment",      "none",       "afafff",    "0f0f2f")
-    exec <SID>myhi("Folded",       "none",       "afafff",    "0f0f2f")
+    exec <SID>myhi("Comment",      "none",       "afafff",    "0f0f0f")
+    exec <SID>myhi("Folded",       "none",       "afafff",    "0f0f0f")
 
-    exec <SID>myhi("SpecialKey",   "none",       "dfdfdf",    "0f0f2f")
-    exec <SID>myhi("Todo",         "underline",  "yellow",    "333333")
+    exec <SID>myhi("SpecialKey",   "none",       "dfdfdf",    "0f0f0f")
+    exec <SID>myhi("Todo",         "underline",  "yellow",    "2f2f2f")
     exec <SID>myhi("Error",        "bold",       "white",     "red")
 
-    exec <SID>myhi("Function",     "none",       "4fcfcf",    "NONE")
-    exec <SID>myhi("Identifier",   "none",       "4fcfcf",    "NONE")
+    exec <SID>myhi("Function",     "none",       "4fdfdf",    "NONE")
+    exec <SID>myhi("Identifier",   "none",       "4fdfdf",    "NONE")
 
     exec <SID>myhi("Cursor",       "reverse",    "dfdfdf",    "black")
-    exec <SID>myhi("Visual",       "none",       "NONE",      "333333")
+    exec <SID>myhi("Visual",       "none",       "NONE",      "2f2f2f")
     exec <SID>myhi("IncSearch",    "none",       "black",     "yellow")
     exec <SID>myhi("Search",       "none",       "black",     "yellow")
 
-    exec <SID>myhi("StatusLine",   "none",       "yellow",    "333333")
+    exec <SID>myhi("StatusLine",   "none",       "yellow",    "2f2f2f")
     exec <SID>myhi("StatusLineNc", "none",       "dfdfdf",    "1c1c1c")
-    exec <SID>myhi("WildMenu",     "none",       "white",     "0f0f2f")
-    exec <SID>myhi("VertSplit",    "none",       "darkgray",  "0f0f2f")
+    exec <SID>myhi("WildMenu",     "none",       "white",     "0f0f0f")
+    exec <SID>myhi("VertSplit",    "none",       "darkgray",  "0f0f0f")
     exec <SID>myhi("NonText",      "none",       "darkgray",  "NONE")
 
-    exec <SID>myhi("MatchParen",   "none",       "white",     "0f0f2f")
-    exec <SID>myhi("Pmenu",        "none",       "dfdfdf",    "0f0f2f")
+    exec <SID>myhi("MatchParen",   "none",       "white",     "0f0f0f")
+    exec <SID>myhi("Pmenu",        "none",       "dfdfdf",    "0f0f0f")
     exec <SID>myhi("PmenuSel",     "none",       "white",     "3f3f7f")
-    exec <SID>myhi("PmenuSbar",    "none",       "white",     "0f0f2f")
+    exec <SID>myhi("PmenuSbar",    "none",       "white",     "0f0f0f")
     exec <SID>myhi("PmenuThumb",   "none",       "3f3f7f",    "3f3f7f")
 
     exec <SID>myhi("SpellBad",     "none",       "NONE",      "800000")
@@ -401,10 +401,10 @@ if has("gui_running") || &t_Co >= 88
     exec <SID>myhi("Repeat",       "none",       "bf7f00",    "NONE")
     exec <SID>myhi("Statement",    "none",       "bf7f00",    "NONE")
 
-    exec <SID>myhi("StorageClass", "none",       "3fbf3f",    "NONE")
-    exec <SID>myhi("Type",         "none",       "3fbf3f",    "NONE")
-    exec <SID>myhi("Structure",    "none",       "3fbf3f",    "NONE")
-    exec <SID>myhi("Directory",    "none",       "3fbf3f",    "NONE")
+    exec <SID>myhi("StorageClass", "none",       "20b020",    "NONE")
+    exec <SID>myhi("Type",         "none",       "20b020",    "NONE")
+    exec <SID>myhi("Structure",    "none",       "20b020",    "NONE")
+    exec <SID>myhi("Directory",    "none",       "20b020",    "NONE")
 
     exec <SID>myhi("Include",      "none",       "bf0fbf",    "NONE")
     exec <SID>myhi("PreProc",      "none",       "bf0fbf",    "NONE")