Config lain and freedesktop, switch default theme

3 files changed, 26 insertions, 12 deletions

diff --git a/config.dot/awesome.link/rc.lua b/config.dot/awesome.link/rc.lua
index 3dcd828..0998e3b 100644
--- a/config.dot/awesome.link/rc.lua
+++ b/config.dot/awesome.link/rc.lua
@@ -4,16 +4,17 @@ configdir  = homedir   .. "/.config/awesome"
 themes_dir = configdir .. "/themes"
 
 -- Awesome library dependencies
-gears     = require("gears")
-awful     = require("awful")
-wibox     = require("wibox")
-autofocus = require("awful.autofocus")
-beautiful = require("beautiful")
-naughty   = require("naughty")
+gears       = require("gears")
+awful       = require("awful")
+wibox       = require("wibox")
+autofocus   = require("awful.autofocus")
+beautiful   = require("beautiful")
+naughty     = require("naughty")
+lain        = require("lain")
+freedesktop = require("freedesktop")
 
--- Theme
---beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
-beautiful.init(awful.util.get_themes_dir() .. "zenburn/theme.lua")
+-- Variables
+dofile(configdir .. "/variables.lua")
 
 -- Load Debian menu entries
 require("debian.menu")
@@ -23,8 +24,10 @@ if awful.util.file_readable(homedir .. "/.custom/awesome/settings.lua") then
   dofile(homedir .. "/.custom/awesome/settings.lua")
 end
 
--- Variables
-dofile(configdir .. "/variables.lua")
+-- Theme
+--beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
+--beautiful.init(awful.util.get_themes_dir() .. "zenburn/theme.lua")
+beautiful.init(themes_dir .. "/multicolor/theme.lua")
 
 -- Layout
 dofile(configdir .. "/layout.lua")
diff --git a/config.dot/awesome.link/variables.lua b/config.dot/awesome.link/variables.lua
index 615f6f0..ca6bcba 100644
--- a/config.dot/awesome.link/variables.lua
+++ b/config.dot/awesome.link/variables.lua
@@ -10,3 +10,14 @@ editor_cmd = terminal .. " " .. editor
 -- 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"
+
+-- Lain
+lain.layout.termfair.nmaster           = 3
+lain.layout.termfair.ncol              = 1
+lain.layout.termfair.center.nmaster    = 3
+lain.layout.termfair.center.ncol       = 1
+lain.layout.cascade.tile.offset_x      = 2
+lain.layout.cascade.tile.offset_y      = 32
+lain.layout.cascade.tile.extra_padding = 5
+lain.layout.cascade.tile.nmaster       = 5
+lain.layout.cascade.tile.ncol          = 2
diff --git a/config.dot/awesome.link/wibar.lua b/config.dot/awesome.link/wibar.lua
index 3a452ed..0f87068 100644
--- a/config.dot/awesome.link/wibar.lua
+++ b/config.dot/awesome.link/wibar.lua
@@ -102,9 +102,9 @@ awful.screen.connect_for_each_screen(function(s)
         { -- Right widgets
             layout = wibox.layout.fixed.horizontal,
             mykeyboardlayout,
-            wibox.widget.systray(),
             mytextclock,
             s.mylayoutbox,
+            wibox.widget.systray(),
         },
     }
 end)