Commit 9bb910fd authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix broken Awesome wallpaper settings 

The default rc.lua is not very good with theme changes.
parent 8d3ac521

.config/awesome/rc.lua

+4 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ end 


-- {{{ Variable definitions

-- Themes define colours, icons, font and wallpapers.

beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")

beautiful.init(awful.util.get_configuration_dir() .. "theme.lua")



-- This is used later as the default terminal and editor to run.

terminal = "xterm"
@@ -170,9 +170,11 @@ local function set_wallpaper(s) 
        if type(wallpaper) == "function" then

            wallpaper = wallpaper(s)

        end

        if wallpaper ~= nil then

            gears.wallpaper.maximized(wallpaper, s, true)

        end

    end

end



-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)

screen.connect_signal("property::geometry", set_wallpaper)

.config/awesome/theme.lua

0 → 100644
+113 −0
Original line number Diff line number Diff line 
---------------------------

-- Default awesome theme --

---------------------------



local theme = {}



theme.font          = "sans 8"



theme.bg_normal     = "#222222"

theme.bg_focus      = "#535d6c"

theme.bg_urgent     = "#ff0000"

theme.bg_minimize   = "#444444"

theme.bg_systray    = theme.bg_normal



theme.fg_normal     = "#aaaaaa"

theme.fg_focus      = "#ffffff"

theme.fg_urgent     = "#ffffff"

theme.fg_minimize   = "#ffffff"



theme.useless_gap   = 0

theme.border_width  = 1

theme.border_normal = "#000000"

theme.border_focus  = "#535d6c"

theme.border_marked = "#91231c"



-- There are other variable sets

-- overriding the default one when

-- defined, the sets are:

-- taglist_[bg|fg]_[focus|urgent|occupied|empty]

-- tasklist_[bg|fg]_[focus|urgent]

-- titlebar_[bg|fg]_[normal|focus]

-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]

-- mouse_finder_[color|timeout|animate_timeout|radius|factor]

-- Example:

--theme.taglist_bg_focus = "#ff0000"



-- Display the taglist squares

theme.taglist_squares_sel   = "/usr/share/awesome/themes/default/taglist/squarefw.png"

theme.taglist_squares_unsel = "/usr/share/awesome/themes/default/taglist/squarew.png"



-- Variables set for theming the menu:

-- menu_[bg|fg]_[normal|focus]

-- menu_[border_color|border_width]

theme.menu_submenu_icon = "/usr/share/awesome/themes/default/submenu.png"

theme.menu_height = 15

theme.menu_width  = 100



-- You can add as many variables as

-- you wish and access them by using

-- beautiful.variable in your rc.lua

--theme.bg_widget = "#cc0000"



-- Define the image to load

theme.titlebar_close_button_normal = "/usr/share/awesome/themes/default/titlebar/close_normal.png"

theme.titlebar_close_button_focus  = "/usr/share/awesome/themes/default/titlebar/close_focus.png"



theme.titlebar_minimize_button_normal = "/usr/share/awesome/themes/default/titlebar/minimize_normal.png"

theme.titlebar_minimize_button_focus  = "/usr/share/awesome/themes/default/titlebar/minimize_focus.png"



theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png"

theme.titlebar_ontop_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png"

theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/default/titlebar/ontop_normal_active.png"

theme.titlebar_ontop_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/ontop_focus_active.png"



theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png"

theme.titlebar_sticky_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png"

theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/default/titlebar/sticky_normal_active.png"

theme.titlebar_sticky_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/sticky_focus_active.png"



theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png"

theme.titlebar_floating_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png"

theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/default/titlebar/floating_normal_active.png"

theme.titlebar_floating_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/floating_focus_active.png"



theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png"

theme.titlebar_maximized_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png"

theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png"

theme.titlebar_maximized_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png"



theme.wallpaper = "/usr/share/awesome/themes/default/background.png"



local util = require("awful.util")

if util.file_readable('.local/etc/awesome/wallpaper.lua') then

    theme.wallpaper = dofile('.local/etc/awesome/wallpaper.lua')

end



-- You can use your own layout icons like this:

theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png"

theme.layout_fairv = "/usr/share/awesome/themes/default/layouts/fairvw.png"

theme.layout_floating  = "/usr/share/awesome/themes/default/layouts/floatingw.png"

theme.layout_magnifier = "/usr/share/awesome/themes/default/layouts/magnifierw.png"

theme.layout_max = "/usr/share/awesome/themes/default/layouts/maxw.png"

theme.layout_fullscreen = "/usr/share/awesome/themes/default/layouts/fullscreenw.png"

theme.layout_tilebottom = "/usr/share/awesome/themes/default/layouts/tilebottomw.png"

theme.layout_tileleft   = "/usr/share/awesome/themes/default/layouts/tileleftw.png"

theme.layout_tile = "/usr/share/awesome/themes/default/layouts/tilew.png"

theme.layout_tiletop = "/usr/share/awesome/themes/default/layouts/tiletopw.png"

theme.layout_spiral  = "/usr/share/awesome/themes/default/layouts/spiralw.png"

theme.layout_dwindle = "/usr/share/awesome/themes/default/layouts/dwindlew.png"

theme.layout_cornernw = "/usr/share/awesome/themes/default/layouts/cornernww.png"

theme.layout_cornerne = "/usr/share/awesome/themes/default/layouts/cornernew.png"

theme.layout_cornersw = "/usr/share/awesome/themes/default/layouts/cornersww.png"

theme.layout_cornerse = "/usr/share/awesome/themes/default/layouts/cornersew.png"



theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"



-- Define the icon theme for application icons. If not set then the icons

-- from /usr/share/icons and /usr/share/icons/hicolor will be used.

theme.icon_theme = nil



return theme



-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

.config/awesome/user-defined.lua

+0 −20
Original line number Diff line number Diff line
@@ -52,26 +52,6 @@ for _, v in ipairs(main_menu) do mymainmenu:add(v) end 
-- }}}





-- {{{ Wallpaper command



if beautiful.wallpaper then

    for s = 1, screen.count() do

        gears.wallpaper.maximized(beautiful.wallpaper, s, true)

    end

end

if beautiful.wallpaper_cmd then

	if type(beautiful.wallpaper_cmd) == "table" then

		for i,cmd in ipairs(beautiful.wallpaper_cmd) do

			awful.util.spawn(cmd)

		end

	else

		awful.util.spawn(beautiful.wallpaper_cmd)

	end

end



-- }}}





-- {{{ Global rules



rules.add_rule{