API updates and async calls.

.gitignore

@@ -0,0 +1,3 @@
+#Temp files
+*swp
+*swo

README.md

@@ -0,0 +1,12 @@
+# Masterkorp's Awesome configuration
+
+This is my Awesome WM config, originaly based on Guff's config.
+
+### Testing
+You can test the config with the debug.sh script on the scripts folder. Opens a
+nested X session, so it can be tested within another WM
+
+### Dependencies
+[Awesome WM](http://awesome.naquadah.org/) 3.5 or higher
+
+[Xephyr](http://www.freedesktop.org/wiki/Software/Xephyr) for the debug script

cfg/client-bindings.lua

@@ -1,4 +1,7 @@
-clientkeys = awful.util.table.join(
+local awful = require("awful")
+
+local clientbinds = {}
+clientbinds.keys = awful.util.table.join(
     awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
     awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
     awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
@@ -16,9 +19,9 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey,           }, "/",      awful.mouse.client.resize)
 )
 
-clientbuttons = awful.util.table.join(
+clientbinds.buttons = awful.util.table.join(
     awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
     awful.button({ modkey }, 1, awful.mouse.client.move),
     awful.button({ modkey }, 3, awful.mouse.client.resize))
 
-shifty.config.clientkeys = clientkeys
+return clientbinds

cfg/global-bindings.lua

@@ -1,39 +1,30 @@
-require("misc.dict")
+local awful = require("awful")
+local brightness = require("cfg.widgets.brightness")
+local volume = require("cfg.widgets.volume")
 
-globalkeys = awful.util.table.join(
+local globalkeys = awful.util.table.join(
     -- Special function keys
-    awful.key({ }, "XF86MonBrightnessUp", brightness_up),
-    awful.key({ }, "XF86MonBrightnessDown", brightness_down),
-    awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("lualock -n") end),
-    awful.key({ }, "XF86AudioLowerVolume", volume_down_and_update),
-    awful.key({ }, "XF86AudioRaiseVolume", volume_up_and_update),
-    awful.key({ }, "XF86AudioMute", volume_mute_and_update),
-    awful.key({ }, "Print", function () awful.util.spawn("scrot -e 'mv $f ~/Pictures/ && xdg-open ~/Pictures/$f'") end),
-
+    -- Briteness is controled by hardware on this laptop
+    awful.key({ }, "XF86MonBrightnessDown", function () brightness:down(5) end),
+    awful.key({ }, "XF86MonBrightnessUp", function () brightness:up(5) end),
+    awful.key({ modkey,           }, "f", function () awful.spawn.spawn("xscreensaver-command --lock") end),
+    awful.key({ modkey,           }, "F12", function () volume:set(5) end),
+    awful.key({ modkey,           }, "F11", function () volume:set(-5) end),
+    awful.key({ modkey,           }, "F10", function () volume:mute() end),
+    awful.key({ }, "Print", function () awful.spawn.spawn("scrot -e 'mv $f ~/Pictures/ && xdg-open ~/Pictures/$f'") end),
+
     -- MPD keys
-    awful.key({ modkey, "Shift"   }, "Up", function () awful.util.spawn("ncmpcpp toggle") end),
-    awful.key({ modkey, "Shift"   }, "Down", function () awful.util.spawn("ncmpcpp stop") end),
-    awful.key({ modkey, "Shift"   }, "Left", function () awful.util.spawn("ncmpcpp prev") end),
-    awful.key({ modkey, "Shift"   }, "Right", function () awful.util.spawn("ncmpcpp next") end),
+    awful.key({ modkey, "Shift"   }, "Up", function () awful.spawn.spawn("ncmpcpp toggle") end),
+    awful.key({ modkey, "Shift"   }, "Down", function () awful.spawn.spawn("ncmpcpp stop") end),
+    awful.key({ modkey, "Shift"   }, "Left", function () awful.spawn.spawn("ncmpcpp prev") end),
+    awful.key({ modkey, "Shift"   }, "Right", function () awful.spawn.spawn("ncmpcpp next") end),
 
-    -- Shifty keys
-    awful.key({ modkey, "Control" }, "t", function() shifty.add({ rel_index = 1 }) end),
-    awful.key({ modkey, "Shift"   }, "t", function() shifty.add({ rel_index = 1, nopopup = true }) end),
-    awful.key({ modkey, "Control" }, "g",           shifty.rename),
-    awful.key({ modkey, "Control" }, "w",           shifty.del),
-
     -- Launch my terminal setup
-    awful.key({ modkey,           }, "g",
-        function()
-            awful.util.spawn("sakura")
-            awful.util.spawn("sakura -f \"Terminus (TTF) 9\"")
-            awful.util.spawn("sakura -f \"Terminus (TTF) 9\"")
-        end
-    ),
+    awful.key({ modkey,           }, "Return", function() awful.spawn.spawn("urxvt") end ),
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-    awful.key({ modkey,           }, "e", function () awful.util.spawn("thunar") end),
+    awful.key({ modkey,           }, "e", function () awful.spawn.spawn("urxvt -e ranger") end),
     awful.key({ modkey,           }, "j",
         function ()
             awful.client.focus.byidx( 1)
@@ -61,7 +52,6 @@ globalkeys = awful.util.table.join(
         end),
 
     -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
     awful.key({ modkey, "Control" }, "r", awesome.restart),
     awful.key({ modkey, "Shift"   }, "q", awesome.quit),
 
@@ -75,25 +65,6 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(layouts, -1) end),
 
     -- Prompt
-    awful.key({ modkey,           }, ";",
-        function ()
-            awful.prompt.run({ prompt = "Dict: " }, mypromptbox[mouse.screen].widget,
-            function(word)
-                local definition = awful.util.pread("dict " .. word .. " 2>&1")
-                naughty.notify({ text = definition, timeout = 13, title = word,
-                    width = 400, font = "Sans 7" })
-            end, dict_cb, awful.util.getdir("cache") .. "/dict")
-        end
-    ),
-    awful.key({ modkey, "Control" }, ";",
-        function ()
-            if selection() then
-                definition = awful.util.pread("dict " .. selection() .. " 2>&1")
-                naughty.notify({ text = definition, timeout = 13,
-                    title = selection(), width = 400, font = "Sans 7" })
-            end
-        end
-    ),
     awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
 
     awful.key({ modkey }, "x",
@@ -103,8 +74,8 @@ globalkeys = awful.util.table.join(
                   awful.util.eval, nil,
                   awful.util.getdir("cache") .. "/history_eval")
               end),
-    -- all minimized clients are restored 
-    awful.key({ modkey, "Shift"   }, "n", 
+    -- all minimized clients are restored
+    awful.key({ modkey, "Shift"   }, "n",
         function()
             local tags = awful.tag.selectedlist()
             for j=1, #tags do
@@ -115,7 +86,7 @@ globalkeys = awful.util.table.join(
             end
         end),
     -- show desktop/unminimize
-    awful.key({ modkey            }, "d", 
+    awful.key({ modkey            }, "d",
         function()
             local tag = awful.tag.selected()
             for i=1, #tag:clients() do
@@ -127,38 +98,46 @@ globalkeys = awful.util.table.join(
         end)
 )
 
-for i=1, ( shifty.config.maxtags or 9 ) do
-
-    globalkeys = awful.util.table.join(globalkeys, awful.key({ modkey }, i,
-        function ()
-            local t = awful.tag.viewonly(shifty.getpos(i))
-        end))
-    globalkeys = awful.util.table.join(globalkeys, awful.key({ modkey, "Control" }, i,
-        function ()
-            local t = shifty.getpos(i)
-            t.selected = not t.selected
-        end))
-    globalkeys = awful.util.table.join(globalkeys, awful.key({ modkey, "Control", "Shift" }, i,
-        function ()
-            if client.focus then
-            awful.client.toggletag(shifty.getpos(i))
+for i = 1, 9 do
+  globalkeys = awful.util.table.join(globalkeys,
+    -- Move to another tag
+    awful.key({ modkey }, "#" .. i + 9,
+      function ()
+        local screen = mouse.screen
+        local tag = screen.tags[i]
+        if tag then
+          tag:view_only()
         end
-    end))
-    -- move clients to other tags
-    globalkeys = awful.util.table.join(globalkeys, awful.key({ modkey, "Shift" }, i,
-    function ()
-        if client.focus then
-            local t = shifty.getpos(i)
-            awful.client.movetotag(t)
-            --awful.tag.viewonly(t)
+      end
+    ),
+    -- Merge two tags
+    awful.key({ modkey, "Control" }, "#" .. i + 9,
+      function ()
+        local screen = mouse.screen
+        local tag = screen.tags[i]
+        if tag then
+          awful.tag.viewtoggle(tag)
+        end
+      end
+    ),
+    -- Move client to tag
+    awful.key({ modkey, "Shift" }, "#" .. i + 9,
+      function ()
+        local tag = client.focus.screen.tags[i]
+        if client.focus and tag then
+          awful.client.movetotag(tag)
         end
-    end))
+      end
+    ),
+    -- Toggle client on another tag too
+    awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+      function ()
+        local tag = client.focus.screen.tags[i]
+        if client.focus and tag then
+          awful.client.toggletag(tag)
+        end
+      end
+    )
+  )
 end
-
-globalbuttons = awful.util.table.join(
-    awful.button({ }, 3, function () mymainmenu:toggle() end),
-    awful.button({ }, 4, awful.tag.viewnext),
-    awful.button({ }, 5, awful.tag.viewprev)
-)
-
-shifty.config.globalkeys = globalkeys
+root.keys(globalkeys)

cfg/rules.lua

@@ -1,21 +1,30 @@
-client.add_signal("manage", function (c, startup)
+local awful = require("awful")
+awful.rules = require("awful.rules")
+local beautiful = require("beautiful")
+local clientbinds = require("cfg.client-bindings")
 
-    -- Enable sloppy focus
-    c:add_signal("mouse::enter", function(c)
-        if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-            and awful.client.focus.filter(c) then
-            client.focus = c
-        end
-    end)
+awful.rules.rules = {
+  -- Rules to all the clients
+  { rule = { },
+    properties = {
+      border_width = beautiful.border_width,
+      border_color = beautiful.border_normal,
+      focus = awful.client.focus.filter,
+      keys = clientbinds.keys,
+      buttons = clientbinds.buttons
+    }
+  },
+  { rule = { class = "mpv" },
+    properties = {
+      floating = true,
+      centered = true
+    }
+  },
+  { rule = { class = "Xephyr" },
+    properties = {
+      floating = true,
+      centered = true
+    }
+  }
+}
 
-    if not startup then
-        -- Put windows in a smart way, only if they does not set an initial position.
-        if not c.size_hints.user_position and not c.size_hints.program_position then
-            awful.placement.no_overlap(c)
-            awful.placement.no_offscreen(c)
-        end
-    end
-end)
-
-client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)
-client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)

cfg/signals.lua

@@ -0,0 +1,61 @@
+local awful = require("awful")
+local wibox = require("wibox")
+local beautiful = require("beautiful")
+
+client.connect_signal("manage", function (c, startup)
+  -- Enable sloppy focus
+  c:connect_signal("mouse::enter", function(c)
+    if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier and awful.client.focus.filter(c) then
+      client.focus = c
+    end
+  end)
+
+  if not startup then
+    -- Put windows in a smart way, only if they does not set an initial position.
+    if not c.size_hints.user_position and not c.size_hints.program_position then
+      awful.placement.no_overlap(c)
+      awful.placement.no_offscreen(c)
+    end
+  end
+
+  local titlebars_enabled = false
+  if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
+    -- Widgets that are aligned to the left
+    local left_layout = wibox.layout.fixed.horizontal()
+    left_layout:add(awful.titlebar.widget.iconwidget(c))
+
+    -- Widgets that are aligned to the right
+    local right_layout = wibox.layout.fixed.horizontal()
+    right_layout:add(awful.titlebar.widget.floatingbutton(c))
+    right_layout:add(awful.titlebar.widget.maximizedbutton(c))
+    right_layout:add(awful.titlebar.widget.stickybutton(c))
+    right_layout:add(awful.titlebar.widget.ontopbutton(c))
+    right_layout:add(awful.titlebar.widget.closebutton(c))
+
+    -- The title goes in the middle
+    local title = awful.titlebar.widget.titlewidget(c)
+    title:buttons(awful.util.table.join(
+      awful.button({ }, 1, function()
+        client.focus = c
+        c:raise()
+        awful.mouse.client.move(c)
+      end),
+      awful.button({ }, 3, function()
+        client.focus = c
+        c:raise()
+      awful.mouse.client.resize(c)
+      end)
+      )
+    )
+
+    -- Now bring it all together
+    local layout = wibox.layout.align.horizontal()
+    layout:set_left(left_layout)
+    layout:set_right(right_layout)
+    layout:set_middle(title)
+    awful.titlebar(c):set_widget(layout)
+  end
+end)
+
+client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)