Merge branch 'master' into vim-clean

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index fd2246edd5ff4563859ebf0262d33187372920fd..41a623663ad277a05bbcad4a9223cb30037a0381 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -85,7 +85,8 @@ globalkeys = awful.util.table.join(globalkeys,
     awful.key({        }, "Print", function () awful.util.spawn("ksnapshot") end),
     -- Layout manipulation
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-    awful.key({ modkey,           }, "#94",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1
+    awful.key({ modkey,           }, "#49",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (chronos)
+    awful.key({ modkey,           }, "#94",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (shada)
     awful.key({ modkey, "Control" }, "Left",   function () awful.screen.focus_relative( 1) end),
     awful.key({ modkey, "Control" }, "Right",  function () awful.screen.focus_relative(-1) end),
     -- Volume
@@ -116,6 +117,7 @@ clientkeys = awful.util.table.join(
     -- {{{2 My Client Keys
     -- Move client to screen
     awful.key({ modkey, "Shift" }, "#94",      awful.client.movetoscreen ),
+    awful.key({ modkey, "Shift" }, "#49",      awful.client.movetoscreen ),
     -- ontop and below
     awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
     awful.key({ modkey,           }, "b",      function (c) c.below = not c.below            end)

diff --git a/awesome/tags.lua b/awesome/tags.lua
index b3216eeb35ceb300c1217ad611ab2057cc969f6c..fcbb15906abb425cb635f2cc874604a04315e4c9 100644 (file)
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -21,18 +21,19 @@ layouts =
 local mytags = {}
 local path = beautiful.path
 local icon_only = true
+
 -- {{{ single screen
 mytags[1] = {}
 mytags[1][1] = {
-    { name = "α", layout = awful.layout.suit.tile.left,   mwfact=0.50 },
-    { name = "ω", layout = awful.layout.suit.tile,        mwfact=0.60 },
-    { name = "ι", layout = awful.layout.suit.tile,        mwfact=0.88 },
-    { name = "δ", layout = awful.layout.suit.tile.left,   mwfact=0.60 },
-    { name = "ε", layout = awful.layout.suit.tile,        mwfact=0.30 },
-    { name = "ζ", layout = awful.layout.suit.tile,        mwfact=0.88 },
-    { name = "θ", layout = awful.layout.suit.tile.bottom, mwfact=0.84 },
-    { name = "ι", layout = awful.layout.suit.max,         mwfact=0.50 },
-    { name = "κ", layout = awful.layout.suit.floating,    mwfact=0.50 },
+    { name = "1", layout = awful.layout.suit.tile.left,   mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
+    { name = "2", layout = awful.layout.suit.tile,        mwfact=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
+    { name = "3", layout = awful.layout.suit.tile,        mwfact=0.88, icon = path.."/cutiemarks/twilight_sparkle.png"},
+    { name = "4", layout = awful.layout.suit.tile.left,   mwfact=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
+    { name = "5", layout = awful.layout.suit.tile,        mwfact=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
+    { name = "6", layout = awful.layout.suit.tile,        mwfact=0.88, icon = path.."/cutiemarks/trixie.png"},
+    { name = "7", layout = awful.layout.suit.tile.bottom, mwfact=0.84, icon = path.."/cutiemarks/soarin.png"},
+    { name = "8", layout = awful.layout.suit.max,         mwfact=0.50, icon = path.."/cutiemarks/princess_celestia.png"},
+    { name = "9", layout = awful.layout.suit.floating,    mwfact=0.50, icon = path.."/cutiemarks/princess_luna.png"},
 }
 -- }}}
 

diff --git a/dwb/default/cookies.allow b/dwb/default/cookies.allow
index 01f99927082c6618b4a31fec1761dfcd9d365f83..29024d9de6f3ec805a2e072517c81d0d2c8130ca 100644 (file)
--- a/dwb/default/cookies.allow
+++ b/dwb/default/cookies.allow
@@ -25,6 +25,8 @@
 .ohloh.net
 .playstarbound.com
 .reddit.com
+.redditmedia.com
+.redditstatic.com
 .sourceforge.net
 .steamcommunity.com
 .steampowered.com

diff --git a/dwb/default/scripts.allow b/dwb/default/scripts.allow
index e74ac439a0e17e5dd22bc990392e429ac7b79081..5943644ebca10f96a1945f51daab8708f06c0137 100644 (file)
--- a/dwb/default/scripts.allow
+++ b/dwb/default/scripts.allow
@@ -22,9 +22,11 @@ steamcommunity.com
 store.steampowered.com
 superuser.com
 tardis
+tex.stackexchange.com
 thetvdb.com
 together.jolla.com
 translate.google.com
+twitter.com
 wiki.ros.org
 www.amazon.co.uk
 www.amazon.com

diff --git a/dwb/userscripts/blank.js b/dwb/userscripts/blank.js
new file mode 100755 (executable)
index 0000000..4028ef1
--- /dev/null
+++ b/dwb/userscripts/blank.js
@@ -0,0 +1,7 @@
+#!javascript
+
+Signal.connect("documentLoaded", function (wv) {
+  if (wv.uri == "about:blank") {
+    wv.inject("document.body.style.background = '#222';");
+  }
+});

diff --git a/mutt/bindings b/mutt/bindings
index a5fd9c057f5c9bcee7f5bf25a601585c4952c962..8e6302a6ba00d9de37baf974adbdd2619d033496 100644 (file)
--- a/mutt/bindings
+++ b/mutt/bindings
@@ -19,17 +19,13 @@ bind index Q quit
 bind editor <Tab> complete-query
 bind editor ^T    complete
 
-# sidebar
-bind index,pager \CK sidebar-prev
-bind index,pager \CJ sidebar-next
-bind index,pager \CO sidebar-open
-
 macro index b "<enter-command>toggle sidebar_visible<enter><refresh>" "Toggle sidebar"
 macro pager b "<enter-command>toggle sidebar_visible<enter><redraw-screen>" "Toggle sidebar"
 
 macro pager \Cu "|urlview<enter>" "open urlview"
 
 # flag without resolving
+bind index F flag-message
 bind pager F noop
 macro pager F "<enter-command>set my_resolve=\$resolve;set noresolve<enter><flag-message><enter-command>set resolve=\$my_resolve<enter>"\
               "Flag message without resolving"
@@ -38,6 +34,9 @@ macro pager F "<enter-command>set my_resolve=\$resolve;set noresolve<enter><flag
 bind index,pager B bounce-message
 bind index,pager R group-reply
 
+# limit when syncing
+macro index $ "<sync-mailbox><limit>=(=U|=F)<enter><collapse-all>"
+
 bind index <space> collapse-thread
 
 # open mailcap in attach view

diff --git a/mutt/muttrc b/mutt/muttrc
index f01ed8aea15db18550209c26f6e41d0755b34003..0f6cc34fad0c0e4996ed4aeac04604c0bc5d5df2 100644 (file)
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -60,8 +60,8 @@ hdr_order from: to: cc: date: subject:
 
 # sidebar
 set sidebar_width = 14
-set sidebar_visible = yes
-set sidebar_delim = '|'
+set sidebar_visible = no
+set sidebar_delim = '│'
 set sidebar_sort = no
 set sidebar_shortpath = yes
 set sidebar_format = "%B%* %?N?%N?"

diff --git a/zsh/functions/_wake b/zsh/functions/_wake
index 4ab10d374a6e5d82d953d3d32b5f2ade2ec9ddd6..3361232029955aabab6023536bc2610474bbdc3d 100644 (file)
--- a/zsh/functions/_wake
+++ b/zsh/functions/_wake
@@ -1,4 +1,4 @@
 #compdef wake
 #autoload
 
-_arguments "1:device to wake:_files -W '$HOME/.wakeonlan'" && return 0
+_arguments "1:device to wake:_files -W '$XDG_CONFIG_HOME/wakeonlan'" && return 0

diff --git a/zsh/functions/wake b/zsh/functions/wake
index 07f449372078efa9d05cb3872a273ff199bea67c..0ca0c1c5bf55867d04a97cb7d92f907734197dc5 100644 (file)
--- a/zsh/functions/wake
+++ b/zsh/functions/wake
@@ -29,16 +29,16 @@
 # wakeonlan man page.
 
 function wake() {
-  local config_file="$HOME/.wakeonlan/$1"
+  local config_file="$XDG_CONFIG_HOME/wakeonlan/$1"
   if [[ ! -f "$config_file" ]]; then
     echo "ERROR: There is no configuration file at \"$config_file\"."
     return 1
   fi
 
-  if (( ! $+commands[wakeonlan] )); then
-    echo "ERROR: Can't find \"wakeonlan\".  Are you sure it's installed?"
+  if (( ! $+commands[wol] )); then
+    echo "ERROR: Can't find \"wol\".  Are you sure it's installed?"
     return 1
   fi
 
-  wakeonlan -f "$config_file"
+  wol -f "$config_file"
 }