From: Samir Benmendil Date: Tue, 23 Sep 2014 09:52:03 +0000 (+0100) Subject: Merge branch 'master' into vim-clean X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/4b1d62d1350c90c23d9d365ffcb1ecdf1f088e3d?hp=62c3835d6d47dcc29c045519fc3e97aba78e6000 Merge branch 'master' into vim-clean --- diff --git a/awesome/bindings.lua b/awesome/bindings.lua index fd2246e..41a6236 100644 --- 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 b3216ee..fcbb159 100644 --- 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 01f9992..29024d9 100644 --- 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 e74ac43..5943644 100644 --- 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 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 a5fd9c0..8e6302a 100644 --- a/mutt/bindings +++ b/mutt/bindings @@ -19,17 +19,13 @@ bind index Q quit bind editor 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 "toggle sidebar_visible" "Toggle sidebar" macro pager b "toggle sidebar_visible" "Toggle sidebar" macro pager \Cu "|urlview" "open urlview" # flag without resolving +bind index F flag-message bind pager F noop macro pager F "set my_resolve=\$resolve;set noresolveset resolve=\$my_resolve"\ "Flag message without resolving" @@ -38,6 +34,9 @@ macro pager F "set my_resolve=\$resolve;set noresolve=(=U|=F)" + bind index collapse-thread # open mailcap in attach view diff --git a/mutt/muttrc b/mutt/muttrc index f01ed8a..0f6cc34 100644 --- 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 4ab10d3..3361232 100644 --- 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 07f4493..0ca0c1c 100644 --- 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" }