diff --git a/.gitignore b/.gitignore index ff2f221..339a027 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +wp wallpaper walls diff --git a/aweswt.lua b/aweswt.lua index 2ccf363..4d8a0a4 100644 --- a/aweswt.lua +++ b/aweswt.lua @@ -16,7 +16,7 @@ return t end function get_input (a) - s1='echo -e "'..a..'"|dmenu' + s1='echo -e "'..a..'"|dmenu -i' return get_out(s1) end diff --git a/bindings.lua b/bindings.lua index fd33802..6821384 100644 --- a/bindings.lua +++ b/bindings.lua @@ -57,7 +57,7 @@ globalkeys = awful.util.table.join( -- awful.key({ modkey, }, "s", function () awful.util.spawn("sunbird") end), -- awful.key({ modkey, }, "g", function () awful.util.spawn("gmpc") end), awful.key({ modkey, }, "f", function () awful.util.spawn("firefox") end), - awful.key({ modkey, }, "t", function () awful.util.spawn("thunderbird") end), + awful.key({ modkey, }, "t", function () awful.util.spawn("claws-mail") end), awful.key({ modkey, }, "p", function () awful.util.spawn("pidgin") end), awful.key({ modkey, }, "s", function () awful.util.spawn("sunbird") end), awful.key({ modkey, }, "g", function () awful.util.spawn("gmpc") end), @@ -77,7 +77,7 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Control" }, "Delete", function () awful.util.spawn("xlock") end), -- Audio control - awful.key({ }, "Print", function () teardrop("sakura --class=Teardrop -e alsamixer","top","center", 0.99, 0.4)end ), + awful.key({ }, "Print", function () teardrop("urxvtc -e alsamixer","top","center", 0.99, 0.4)end ), awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Front 2dB-")end ), awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Front 2dB+")end ), awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer set Front toggle") end), @@ -94,7 +94,7 @@ globalkeys = awful.util.table.join( -- Prompt awful.key({ modkey }, "r", function () obvious.popup_run_prompt.run_prompt() end), awful.key({ }, "Scroll_Lock", function () awful.util.spawn("wli") end), - awful.key({ }, "F12", function () teardrop("sakura --class=Teardrop -e 'screen -l'","center","center", 0.99, 0.7)end ), + awful.key({ }, "F12", function () teardrop("urxvtc -e screen -l","center","center", 0.99, 0.7)end ), --{{{Default diff --git a/keymaps/actions.lua b/keymaps/actions.lua new file mode 100644 index 0000000..a81e8f5 --- /dev/null +++ b/keymaps/actions.lua @@ -0,0 +1,48 @@ +-- Client manipulation +modkey = "Mod4" + +keybinding({ "Mod1" }, "Tab", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add() + + + +--From Here default config + +keybinding({ modkey, "Shift" }, "f", function () if client.focus then client.focus.fullscreen = not client.focus.fullscreen end end):add() +keybinding({ modkey, "Shift" }, "c", function () if client.focus then client.focus:kill() end end):add() +keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add() +keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end):add() +keybinding({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(1) end):add() +keybinding({ modkey, "Shift" }, "k", function () awful.client.swap.byidx(-1) end):add() +keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add() +keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add() +keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add() +keybinding({ modkey, "Control" }, "Return", function () if client.focus then client.focus:swap(awful.client.getmaster()) end end):add() +keybinding({ modkey }, "o", awful.client.movetoscreen):add() +keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add() +keybinding({ modkey }, "u", awful.client.urgent.jumpto):add() +keybinding({ modkey, "Shift" }, "r", function () if client.focus then client.focus:redraw() end end):add() + +-- Layout manipulation +keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add() +keybinding({ modkey }, "h", function () awful.tag.incmwfact(-0.05) end):add() +keybinding({ modkey, "Shift" }, "h", function () awful.tag.incnmaster(1) end):add() +keybinding({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end):add() +keybinding({ modkey, "Control" }, "h", function () awful.tag.incncol(1) end):add() +keybinding({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end):add() +keybinding({ modkey }, "space", function () awful.layout.inc(layouts, 1) end):add() +keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end):add() + +-- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them +keybinding({ modkey }, "t", awful.client.togglemarked):add() + +for i = 1, keynumber do + keybinding({ modkey, "Shift" }, "F" .. i, + function () + local screen = mouse.screen + if tags[screen][i] then + for k, c in pairs(awful.client.getmarked()) do + awful.client.movetotag(tags[screen][i], c) + end + end + end):add() +end diff --git a/keymaps/spawn.lua b/keymaps/spawn.lua new file mode 100644 index 0000000..93c88fe --- /dev/null +++ b/keymaps/spawn.lua @@ -0,0 +1,73 @@ + + +keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add() +keybinding({ modkey }, "f", function () awful.util.spawn("firefox") end):add() +keybinding({ }, "XF86AudioLowerVolume", function () awful.util.spawn("voldown 3") end):add() +keybinding({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("volup 3") end):add() +keybinding({ "Shift" }, "XF86AudioLowerVolume", function () awful.util.spawn("voldown 10") end):add() +keybinding({ "Shift" }, "XF86AudioRaiseVolume", function () awful.util.spawn("volup 10") end):add() +keybinding({ modkey }, "XF86Mail", function () awful.util.spawn("xset dpms force off") end):add() +keybinding({ modkey }, "XF86WWW", function () awful.util.spawn(terminal .. " -e apselect") end):add() + + +keybinding({ }, "XF86AudioPlay", function () awful.util.spawn("mpc toggle") end):add() +keybinding({ }, "XF86AudioNext", function () awful.util.spawn("mpc next") end):add() +keybinding({ }, "XF86AudioPrev", function () awful.util.spawn("mpc prev") end):add() +keybinding({ }, "XF86AudioStop", function () awful.util.spawn("mpc stop") end):add() +keybinding({ modkey }, "XF86AudioStop", function () awful.util.spawn("mpc clear") end):add() +keybinding({ modkey }, "XF86AudioPlay", function () + awful.prompt.run({ prompt = "Play Band: " }, + mypromptbox[mouse.screen], playband, + awful.completion.bash, + awful.util.getdir("cache") .. "/history") +end):add() + +function playband(b) + return awful.util.spawn("playband " .. b) +end + + +keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add() + +keybinding({ modkey }, "F1", function () + awful.prompt.run({ prompt = "Run: " }, + mypromptbox[mouse.screen], awful.util.spawn, + awful.completion.bash, + awful.util.getdir("cache") .. "/history") +end):add() + +keybinding({ modkey }, "F4", function () + awful.prompt.run({ prompt = "Run Lua code: " }, + mypromptbox[mouse.screen], + awful.util.eval, + awful.prompt.bash, + awful.util.getdir("cache") .. "/history_eval") +end):add() + +keybinding({ modkey, "Ctrl" }, "i", function () + local s = mouse.screen + if mypromptbox[s].text then + mypromptbox[s].text = nil + elseif client.focus then + mypromptbox[s].text = nil + if client.focus.class then + mypromptbox[s].text = "Class: " .. client.focus.class .. " " + end + if client.focus.instance then + mypromptbox[s].text = mypromptbox[s].text .. "Instance: " + .. client.focus.instance .. " " + end + if client.focus.role then + mypromptbox[s].text = mypromptbox[s].text .. "Role: " + .. client.focus.role + end + end + end):add() + + +keybinding({}, "F12", function () + + tags[1][10].selected = not tags[1][10].selected; + +end):add() + diff --git a/keymaps/wmbase.lua b/keymaps/wmbase.lua new file mode 100644 index 0000000..e6d47aa --- /dev/null +++ b/keymaps/wmbase.lua @@ -0,0 +1,49 @@ + +-- Bind keyboard digits +-- Compute the maximum number of digit we need, limited to 9 +keynumber = 0 +for s = 1, screen.count() do + keynumber = math.min(9, math.max(#tags[s], keynumber)); +end + +for i = 1, keynumber do + keybinding({ modkey }, i, + function () + local screen = mouse.screen + if tags[screen][i] then + awful.tag.viewonly(tags[screen][i]) + end + end):add() + keybinding({ modkey, "Control" }, i, + function () + local screen = mouse.screen + if tags[screen][i] then + tags[screen][i].selected = not tags[screen][i].selected + end + end):add() + keybinding({ modkey, "Shift" }, i, + function () + if client.focus then + if tags[client.focus.screen][i] then + awful.client.movetotag(tags[client.focus.screen][i]) + end + end + end):add() + keybinding({ modkey, "Control", "Shift" }, i, + function () + if client.focus then + if tags[client.focus.screen][i] then + awful.client.toggletag(tags[client.focus.screen][i]) + end + end + end):add() +end + +keybinding({ modkey }, "Left", awful.tag.viewprev):add() +keybinding({ modkey }, "Right", awful.tag.viewnext):add() +keybinding({ modkey }, "Escape", awful.tag.history.restore):add() + +keybinding({ modkey, "Control" }, "r", function () + mypromptbox[mouse.screen].text = awful.util.escape(awful.util.restart()) + end):add() +keybinding({ modkey, "Shift" }, "q", awesome.quit):add() diff --git a/obvious b/obvious index e3a3e05..ff150db 160000 --- a/obvious +++ b/obvious @@ -1 +1 @@ -Subproject commit e3a3e05405d6c622326f3faba6ce6b7c188bf1e9 +Subproject commit ff150db20a89fa2e086cc4fbb75fefa7cfd16f88 diff --git a/rc.lua b/rc.lua index a3ee0bb..c935d02 100644 --- a/rc.lua +++ b/rc.lua @@ -1,5 +1,5 @@ -terminal = "sakura -e screen" -editor_cmd = "sakura -e vim" +terminal = "urxvtc -e screen" +editor_cmd = "urxvtc -e vim" modkey = "Mod4" hyper = "Mod3" @@ -14,8 +14,6 @@ require("obvious.popup_run_prompt") require("vicious") require("aweswt") - - MY_PATH = os.getenv("HOME") .. "/.config/awesome/" WALLPATH = MY_PATH .. "walls/" @@ -35,7 +33,6 @@ layouts = awful.layout.suit.floating } - dofile (MY_PATH .. "helpers.lua") dofile (MY_PATH .. "tags.lua") dofile (MY_PATH .. "wibox.lua") @@ -43,4 +40,3 @@ dofile (MY_PATH .. "bindings.lua") dofile (MY_PATH .. "rules.lua") dofile (MY_PATH .. "signals.lua") dofile (MY_PATH .. "wallpaper.lua") - diff --git a/rules.lua b/rules.lua index 71cb7f5..9986c4d 100644 --- a/rules.lua +++ b/rules.lua @@ -17,7 +17,7 @@ awful.rules.rules = { ontop = true, focus = true } }, { rule = { class = "Teardrop" }, - properties = { floating = true } }, + properties = { floating = true, tag = tags[1][12] } }, { rule = { class = "pinentry" }, properties = { floating = true } }, { rule = { class = "gimp" }, diff --git a/vicious b/vicious index ca1d8d7..c532c0b 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit ca1d8d79e55b7addc28dc442832815692b01b894 +Subproject commit c532c0b0803c98a26d56875f0955ed43132bfed2 diff --git a/wibox.lua b/wibox.lua index a640906..7a99b9c 100644 --- a/wibox.lua +++ b/wibox.lua @@ -19,19 +19,29 @@ clock = widget({ type = "textbox" }) vicious.register(clock, vicious.widgets.date, "%b %d, %R", 60) memwidget = widget({ type = "textbox" }) -vicious.register(memwidget, vicious.widgets.mem, "⌸ $1% ($2MB / $3MB) ", 13) +vicious.register(memwidget, vicious.widgets.mem, "RAM: $1% ($2MB / $3MB) ", 13) --batwidget = obvious.battery(); +--batwidget = awful.widget.progressbar() +--batwidget:set_width(60) +--batwidget:set_height(15) +--batwidget:set_vertical(false) +--batwidget:set_background_color("#494B4F") +--batwidget:set_border_color(nil) +--batwidget:set_color("#AECF96") +--batwidget:set_gradient_colors({ "#AECF96", "#88A175", "#FF5656" }) batwidget = widget({ type = "textbox" }) -vicious.register(batwidget, vicious.widgets.bat, "⌁ $1$2% - $3", 61) +--vicious.register(batwidget, vicious.widgets.bat, "BAT: $2%", 61, "BAT1") +vicious.register(batwidget, vicious.widgets.bat, "BAT1: $1$2% - $3", 61, "BAT1") + +--cpuwidget = awful.widget.progressbar() +--cpuwidget:set_width(50) +--cpuwidget:set_background_color("#494B4F") +--cpuwidget:set_color("#FF5656") +--cpuwidget:set_gradient_colors({ "#FF5656", "#88A175", "#AECF96" }) +--vicious.register(cpuwidget, vicious.widgets.cpu, "$1",41) -cpuwidget = awful.widget.progressbar() cpulabel = widget({ type = "textbox" }) -cpuwidget:set_width(50) -cpuwidget:set_background_color("#494B4F") -cpuwidget:set_color("#FF5656") -cpuwidget:set_gradient_colors({ "#FF5656", "#88A175", "#AECF96" }) -vicious.register(cpuwidget, vicious.widgets.cpu, "$1",41) vicious.register(cpulabel, vicious.widgets.cpu, "CPU: $1%") diff --git a/zenburn/theme.lua b/zenburn/theme.lua index 8da8b9d..121252d 100644 --- a/zenburn/theme.lua +++ b/zenburn/theme.lua @@ -8,7 +8,7 @@ -- {{{ Main theme = {} -theme.wallpaper_cmd = { "/bin/true" } +theme.wallpaper_cmd = { "awsetbg -l" } -- }}} -- {{{ Styles