refactor: themes cleanup

6 files changed, 38 insertions, 39 deletions

diff --git a/.config/awesome/themes/adwaita/30times3.png b/.config/awesome/themes/adwaita/30times3.png
deleted file mode 100644
index b0861e9..0000000
--- a/.config/awesome/themes/adwaita/30times3.png
+++ /dev/null
diff --git a/.config/awesome/themes/adwaita/adwaita-night.jpg b/.config/awesome/themes/adwaita/adwaita-night.jpg
deleted file mode 100644
index 42239c1..0000000
--- a/.config/awesome/themes/adwaita/adwaita-night.jpg
+++ /dev/null
diff --git a/.config/awesome/themes/adwaita/background.png b/.config/awesome/themes/adwaita/background.png
index 8f52b6b..b0861e9 100644
--- a/.config/awesome/themes/adwaita/background.png
+++ b/.config/awesome/themes/adwaita/background.png
diff --git a/.config/awesome/themes/adwaita/background_white.png b/.config/awesome/themes/adwaita/background_white.png
deleted file mode 100644
index bb0c5d0..0000000
--- a/.config/awesome/themes/adwaita/background_white.png
+++ /dev/null
diff --git a/.config/awesome/themes/adwaita/arch-submenu.png b/.config/awesome/themes/adwaita/submenu.png
index ec99596..ec99596 100644
--- a/.config/awesome/themes/adwaita/arch-submenu.png
+++ b/.config/awesome/themes/adwaita/submenu.png
diff --git a/.config/awesome/themes/adwaita/theme.lua b/.config/awesome/themes/adwaita/theme.lua
index d970e00..2988837 100644
--- a/.config/awesome/themes/adwaita/theme.lua
+++ b/.config/awesome/themes/adwaita/theme.lua
@@ -62,7 +62,7 @@ theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
 -- Variables set for theming the menu:
 -- menu_[bg|fg]_[normal|focus]
 -- menu_[border_color|border_width]
-theme.menu_submenu_icon = themes_path_system.."default/submenu.png"
+theme.menu_submenu_icon = themes_path_system.."adwaita/submenu.png"
 theme.menu_height = dpi(20)
 theme.menu_width  = dpi(170)
 
@@ -72,52 +72,51 @@ theme.menu_width  = dpi(170)
 --theme.bg_widget = "#cc0000"
 
 -- Define the image to load
-theme.titlebar_close_button_normal = themes_path.."default/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = themes_path.."default/titlebar/close_focus.png"
+theme.titlebar_close_button_normal = themes_path.."adwaita/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themes_path.."adwaita/titlebar/close_focus.png"
 
-theme.titlebar_minimize_button_normal = themes_path.."default/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path.."default/titlebar/minimize_focus.png"
+theme.titlebar_minimize_button_normal = themes_path.."adwaita/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = themes_path.."adwaita/titlebar/minimize_focus.png"
 
-theme.titlebar_ontop_button_normal_inactive = themes_path.."default/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path.."default/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path.."default/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = themes_path.."default/titlebar/ontop_focus_active.png"
+theme.titlebar_ontop_button_normal_inactive = themes_path.."adwaita/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themes_path.."adwaita/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."adwaita/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themes_path.."adwaita/titlebar/ontop_focus_active.png"
 
-theme.titlebar_sticky_button_normal_inactive = themes_path.."default/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path.."default/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path.."default/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = themes_path.."default/titlebar/sticky_focus_active.png"
+theme.titlebar_sticky_button_normal_inactive = themes_path.."adwaita/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themes_path.."adwaita/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."adwaita/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themes_path.."adwaita/titlebar/sticky_focus_active.png"
 
-theme.titlebar_floating_button_normal_inactive = themes_path.."default/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path.."default/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path.."default/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = themes_path.."default/titlebar/floating_focus_active.png"
+theme.titlebar_floating_button_normal_inactive = themes_path.."adwaita/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themes_path.."adwaita/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."adwaita/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themes_path.."adwaita/titlebar/floating_focus_active.png"
 
-theme.titlebar_maximized_button_normal_inactive = themes_path.."default/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path.."default/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/maximized_focus_active.png"
+theme.titlebar_maximized_button_normal_inactive = themes_path.."adwaita/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themes_path.."adwaita/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."adwaita/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themes_path.."adwaita/titlebar/maximized_focus_active.png"
 
--- theme.wallpaper = themes_path.."default/background.png"
-theme.wallpaper = "/home/kylert/.config/awesome/themes/adwaita/30times3.png"
+theme.wallpaper = themes_path.."adwaita/background.png"
 
 -- You can use your own layout icons like this:
-theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
-theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
-theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
-theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
-theme.layout_max = themes_path.."default/layouts/maxw.png"
-theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path.."default/layouts/tileleftw.png"
-theme.layout_tile = themes_path.."default/layouts/tilew.png"
-theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path.."default/layouts/spiralw.png"
-theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
-theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
-theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
-theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
+theme.layout_fairh = themes_path.."adwaita/layouts/fairhw.png"
+theme.layout_fairv = themes_path.."adwaita/layouts/fairvw.png"
+theme.layout_floating  = themes_path.."adwaita/layouts/floatingw.png"
+theme.layout_magnifier = themes_path.."adwaita/layouts/magnifierw.png"
+theme.layout_max = themes_path.."adwaita/layouts/maxw.png"
+theme.layout_fullscreen = themes_path.."adwaita/layouts/fullscreenw.png"
+theme.layout_tilebottom = themes_path.."adwaita/layouts/tilebottomw.png"
+theme.layout_tileleft   = themes_path.."adwaita/layouts/tileleftw.png"
+theme.layout_tile = themes_path.."adwaita/layouts/tilew.png"
+theme.layout_tiletop = themes_path.."adwaita/layouts/tiletopw.png"
+theme.layout_spiral  = themes_path.."adwaita/layouts/spiralw.png"
+theme.layout_dwindle = themes_path.."adwaita/layouts/dwindlew.png"
+theme.layout_cornernw = themes_path.."adwaita/layouts/cornernww.png"
+theme.layout_cornerne = themes_path.."adwaita/layouts/cornernew.png"
+theme.layout_cornersw = themes_path.."adwaita/layouts/cornersww.png"
+theme.layout_cornerse = themes_path.."adwaita/layouts/cornersew.png"
 
 -- Generate Awesome icon:
 --[[theme.awesome_icon = theme_assets.awesome_icon(