theme: rename files for better coherency

Our `theme.lua` is now really a theme and its previous content is
moved in `apparance.lua`. Moreover, we play a bit with window borders.

README.md

@@ -26,7 +26,7 @@ Here some of the things you may be interested in:
    useless but I keep it.
  - I am using `xautolock` + `i3lock` as a screensaver. Nothing fancy
    but I reuse the wallpaper built above.
- - In `rc/theme.lua`, you may be interested by the way I configure
+ - In `rc/apparance.lua`, you may be interested by the way I configure
    GTK2 and GTK3 to have an unified look. It works and it does not
    need `gnome-control-center`.
  - I am sharing tags between screen with

rc.lua

@@ -36,7 +36,7 @@ config.layouts = {
 config.hostname = awful.util.pread('uname -n'):gsub('\n', '')
 
 -- Remaining modules
-loadrc("theme")
+loadrc("apparance")
 loadrc("start")
 loadrc("bindings")
 loadrc("wallpaper")

rc/apparance.lua

@@ -0,0 +1,34 @@
+-- Theme
+beautiful.init(awful.util.getdir("config") .. "/rc/theme.lua")
+
+-- GTK stuff: we choose Adwaita theme which seems to be the only one
+-- kept up-to-date with GTK2 and GTK3...
+
+-- Also see: http://developer.gnome.org/gtk3/3.2/GtkSettings.html
+local gtk = 'gtk-font-name="' .. beautiful.font .. '"' .. [[
+
+gtk-theme-name="Adwaita"
+gtk-icon-theme-name="gnome-wine"
+gtk-cursor-theme-name="oxy-cherry"
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=1
+gtk-menu-images=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle="hintfull"
+gtk-xft-rgba="rgb"
+gtk-key-theme-name="Emacs"
+]]
+
+local gtk2 = io.open(os.getenv("HOME") .. "/.gtkrc-2.0", "w")
+gtk2:write(gtk)
+gtk2:close()
+
+-- GTK3 is the same, but no double quotes for strings
+local gtk3 = io.open(os.getenv("HOME") .. "/.config/gtk-3.0/settings.ini", "w")
+gtk, _ = gtk:gsub('"', '')
+gtk3:write("[Settings]\n")
+gtk3:write(gtk)
+gtk3:close()

rc/theme.lua

@@ -1,34 +1,27 @@
--- Theme
+-- Small modifications to anrxc's zenburn theme
-beautiful.init(awful.util.getdir("config") .. "/themes/custom.lua")
 
--- GTK stuff: we choose Adwaita theme which seems to be the only one
+local theme = loadrc("../themes/nice-and-clean-theme/theme")
--- kept up-to-date with GTK2 and GTK3...
+if theme then
+   theme.wallpaper_cmd = { "/bin/true" }
+   theme.font = "Cantarell 9"
+   theme.border_width = 2
+   theme.border_normal = "#00000000"
+   theme.border_focus = theme.border_focus .. "66"
+   theme.border_marked = theme.border_marked .. "66"
 
--- Also see: http://developer.gnome.org/gtk3/3.2/GtkSettings.html
+   theme.bg_normal        = theme.bg_normal .. "99"
-local gtk = 'gtk-font-name="' .. beautiful.font .. '"' .. [[
+   theme.bg_focus         = theme.bg_focus .. "99"
-
+   theme.bg_urgent        = theme.bg_urgent .. "99"
-gtk-theme-name="Adwaita"
+   theme.bg_minimize      = theme.bg_minimize .. "99"
-gtk-icon-theme-name="gnome-wine"
+   theme.bg_widget        = "#00000099"
-gtk-cursor-theme-name="oxy-cherry"
+   theme.fg_widget_label  = "#708090"
-gtk-cursor-theme-size=0
+   theme.fg_widget_value  = "#FFFFFF"
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
+   theme.fg_widget_value_important  = "#FF2222"
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+   theme.fg_widget_sep    = "#FFFFFF"
-gtk-button-images=1
+   theme.fg_widget_border = "#FFFFFF"
-gtk-menu-images=1
+   theme.fg_widget_clock  = "#FF7F00"
-gtk-xft-antialias=1
+   theme.fg_widget_end    = "#FFFFFF"
-gtk-xft-hinting=1
+   theme.fg_widget_center = "#FFCCCC"
-gtk-xft-hintstyle="hintfull"
+   theme.fg_widget_start  = "#FF0000"
-gtk-xft-rgba="rgb"
+   return theme
-gtk-key-theme-name="Emacs"
+end
-]]
-
-local gtk2 = io.open(os.getenv("HOME") .. "/.gtkrc-2.0", "w")
-gtk2:write(gtk)
-gtk2:close()
-
--- GTK3 is the same, but no double quotes for strings
-local gtk3 = io.open(os.getenv("HOME") .. "/.config/gtk-3.0/settings.ini", "w")
-gtk, _ = gtk:gsub('"', '')
-gtk3:write("[Settings]\n")
-gtk3:write(gtk)
-gtk3:close()

themes/custom.lua

@@ -1,23 +0,0 @@
--- Small modifications to anrxc's zenburn theme
-
-local theme = loadrc("../themes/nice-and-clean-theme/theme")
-if theme then
-   theme.wallpaper_cmd = { "/bin/true" }
-   theme.font = "Cantarell 9"
-
-   theme.bg_normal        = theme.bg_normal .. "99"
-   theme.bg_focus         = theme.bg_focus .. "99"
-   theme.bg_urgent        = theme.bg_urgent .. "99"
-   theme.bg_minimize      = theme.bg_minimize .. "99"
-   theme.bg_widget        = "#00000099"
-   theme.fg_widget_label  = "#708090"
-   theme.fg_widget_value  = "#FFFFFF"
-   theme.fg_widget_value_important  = "#FF2222"
-   theme.fg_widget_sep    = "#FFFFFF"
-   theme.fg_widget_border = "#FFFFFF"
-   theme.fg_widget_clock  = "#FF7F00"
-   theme.fg_widget_end    = "#FFFFFF"
-   theme.fg_widget_center = "#FFCCCC"
-   theme.fg_widget_start  = "#FF0000"
-   return theme
-end