awesome: switch to lain uselessgaps

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 7dd4696ea5fd38d64d82253261a6bb3be9c178c9..d29c6285fadb9c79105110edc22979ce4fc41a6f 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -1,17 +1,14 @@
--- Standard awesome library
+-- Standard awesome library {{{1
 gears = require("gears")
 awful = require("awful")
 awful.rules = require("awful.rules")
 require("awful.autofocus")
--- Theme handling library
 beautiful = require("beautiful")
--- Notification library
 naughty = require("naughty")
 menubar = require("menubar")
--- Pulseaudio widget
---local APW = require("apw/widget")
+lain = require("lain")
 
--- {{{ Error handling
+-- Error handling {{{1
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
@@ -34,52 +31,33 @@ do
         in_error = false
     end)
 end
--- }}}
 
--- {{{ Variable definitions
+-- Variable definitions {{{1
 -- Themes define colours, icons, and wallpapers
-beautiful.init("/usr/share/awesome/themes/default/theme.lua")
+beautiful.init(awful.util.getdir("config").."/themes/mlp/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
-terminal = "konsole"
+terminal = "urxvtc"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
-
--- Tags
-require("tags")
--- }}}
-
--- {{{ Wallpaper
+-- Wallpaper {{{1
 if beautiful.wallpaper then
     for s = 1, screen.count() do
         gears.wallpaper.maximized(beautiful.wallpaper, s, true)
     end
 end
--- }}}
 
---Menu
+-- Require files {{{1
+require("tags")
 require("menu")
-
--- Topbar
 require("topbar")
-
--- Mouse/Key Bindings
 require("bindings")
-
--- Rules
 require("rules")
-
--- conky
 require("conky")
+require("autostart")
 
--- {{{ Signals
+-- Signals {{{1
 -- Signal function to execute when a new client appears.
 client.connect_signal("manage", function (c, startup)
     -- Enable sloppy focus
@@ -93,7 +71,7 @@ client.connect_signal("manage", function (c, startup)
     if not startup then
         -- Set the windows at the slave,
         -- i.e. put it at the end of others instead of setting it master.
-        -- awful.client.setslave(c)
+        awful.client.setslave(c)
 
         -- 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
@@ -105,11 +83,6 @@ 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)
--- }}}
 
 -- Set keys
 root.keys(globalkeys)
-
--- {{{ Autostart applications
-require("autostart")
--- }}}