X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/13d37456af0c7e9a2aaa2e0bedd80def8f51d0f8..a6ea1a1fa2e612852376b6deab07cb2388608fc8:/awesome/rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index b716457..93a28f0 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -1,19 +1,14 @@
--- Standard awesome library
+-- Awesome libraries {{{1
 gears = require("gears")
 awful = require("awful")
 awful.rules = require("awful.rules")
 require("awful.autofocus")
--- Widget and layout library
-wibox = require("wibox")
--- Theme handling library
 beautiful = require("beautiful")
--- Notification library
 naughty = require("naughty")
 menubar = require("menubar")
--- Pulseaudio widget
---local APW = require("apw/widget")
+require("awful.remote")
 
--- {{{ 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
@@ -32,80 +27,28 @@ do
 
         naughty.notify({ preset = naughty.config.presets.critical,
                          title = "Oops, an error happened!",
-                         text = err })
+                         text = tostring(err) })
         in_error = false
     end)
 end
--- }}}
 
--- {{{ Variable definitions
--- Themes define colours, icons, and wallpapers
-beautiful.init("/usr/share/awesome/themes/default/theme.lua")
+-- Variable definitions {{{1
+-- Themes define colours, icons, font and wallpapers.
+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 files {{{1
+require("bindings")
 require("tags")
--- }}}
-
--- {{{ Wallpaper
-if beautiful.wallpaper then
-    for s = 1, screen.count() do
-        gears.wallpaper.maximized(beautiful.wallpaper, s, true)
-    end
-end
--- }}}
-
---Menu
 require("menu")
-
--- Topbar
 require("topbar")
-
--- Mouse/Key Bindings
-require("bindings")
-
--- Rules
 require("rules")
+-- require("conky")
+require("signals")
 
--- {{{ Signals
--- Signal function to execute when a new client appears.
-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
-        -- Set the windows at the slave,
-        -- i.e. put it at the end of others instead of setting it master.
-        -- 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
-            awful.placement.no_overlap(c)
-            awful.placement.no_offscreen(c)
-        end
-    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)
--- }}}
-
--- {{{ Autostart applications
-require("autostart")
--- }}}
+-- Set keys
+root.keys(globalkeys)