Moved theme assets

assets/icons.lua

@@ -1,78 +1,79 @@
-local brightnessdir = conf.icon_dir .. "brightness/clockwise/"
-local layoutdir = conf.icon_dir .. "layout/"
-local batterydir = conf.icon_dir .. "battery/"
-local volumedir = conf.icon_dir .. "volume/"
-local tagdir = conf.icon_dir .. "tags/"
-local titlebardir = conf.icon_dir .. "titlebar/"
+local gears = require("gears")
+local conf_dir = gears.filesystem.get_configuration_dir()
+
+-- Some subdir variables,
+-- to make switching icon sets easy.
+local brightnessdir = conf_dir .. "assets/icons/brightness/clockwise/"
+local titlebardir = conf_dir .. "assets/icons/titlebar/"
 
 return {
-	submenu = conf.icon_dir .. "submenu.svg",
-	launcher = conf.icon_dir .. "arch.svg",
+	submenu = conf_dir .. "assets/icons/submenu.svg",
+	launcher = conf_dir .. "assets/icons/arch.svg",
 
-	-- must be a png for i3lock
-	lockicon = conf.icon_dir .. "arch.png",
+	-- Used for i3lock, MUST be a png.
+	lockicon = conf_dir .. "assets/icons/arch.png",
 
 	music = {
 		grey = {
-			playing = conf.icon_dir .. "music/pause-grey.svg",
-			paused = conf.icon_dir .. "music/play-grey.svg",
-			stopped = conf.icon_dir .. "music/stop-grey.svg"
+			playing = conf_dir .. "assets/icons/music/pause-grey.svg",
+			paused = conf_dir .. "assets/icons/music/play-grey.svg",
+			stopped = conf_dir .. "assets/icons/music/stop-grey.svg"
 		},
 
 		blue = {
-			playing = conf.icon_dir .. "music/pause-blue.svg",
-			paused = conf.icon_dir .. "music/play-blue.svg",
-			stopped = conf.icon_dir .. "music/stop-blue.svg"
+			playing = conf_dir .. "assets/icons/music/pause-blue.svg",
+			paused = conf_dir .. "assets/icons/music/play-blue.svg",
+			stopped = conf_dir .. "assets/icons/music/stop-blue.svg"
 		}
 	},
 
 	-- Layout icons
 	layout = {
-		cornerne = layoutdir .. "cornerne.svg",
-		cornernw = layoutdir .. "cornernw.svg",
-		cornerse = layoutdir .. "cornerse.svg",
-		cornersw = layoutdir .. "cornersw.svg",
-		dwindle = layoutdir .. "dwindle.svg",
-		fairh = layoutdir .. "fairh.svg",
-		fairv = layoutdir .. "fairv.svg",
-		floating = layoutdir .. "floating.svg",
-		fullscreen = layoutdir .. "fullscreen.svg",
-		magnifier = layoutdir .. "magnifier.svg",
-		max = layoutdir .. "max.svg",
-		spiral = layoutdir .. "spiral.svg",
-		tile = layoutdir .. "tile.svg",
-		tilebottom = layoutdir .. "tilebottom.svg",
-		tileleft = layoutdir .. "tileleft.svg",
-		tiletop = layoutdir .. "tiletop.svg"
+		cornerne = conf_dir .. "assets/icons/layout/cornerne.svg",
+		cornernw = conf_dir .. "assets/icons/layout/cornernw.svg",
+		cornerse = conf_dir .. "assets/icons/layout/cornerse.svg",
+		cornersw = conf_dir .. "assets/icons/layout/cornersw.svg",
+		dwindle = conf_dir .. "assets/icons/layout/dwindle.svg",
+		fairh = conf_dir .. "assets/icons/layout/fairh.svg",
+		fairv = conf_dir .. "assets/icons/layout/fairv.svg",
+		floating = conf_dir .. "assets/icons/layout/floating.svg",
+		fullscreen = conf_dir .. "assets/icons/layout/fullscreen.svg",
+		magnifier = conf_dir .. "assets/icons/layout/magnifier.svg",
+		max = conf_dir .. "assets/icons/layout/max.svg",
+		spiral = conf_dir .. "assets/icons/layout/spiral.svg",
+		tile = conf_dir .. "assets/icons/layout/tile.svg",
+		tilebottom = conf_dir .. "assets/icons/layout/tilebottom.svg",
+		tileleft = conf_dir .. "assets/icons/layout/tileleft.svg",
+		tiletop = conf_dir .. "assets/icons/layout/tiletop.svg"
 	},
 
 	-- Battery icons
 	battery = {
-		missing = batterydir .. "missing.svg",
+		missing = conf_dir .. "assets/icons/battery/missing.svg",
 
 		charging = {
-			full = batterydir .. "full-charging.svg",
-			good = batterydir .. "good-charging.svg",
-			low = batterydir .. "low-charging.svg",
-			caution = batterydir .. "caution-charging.svg",
-			empty = batterydir .. "empty-charging.svg"
+			full = conf_dir .. "assets/icons/battery/full-charging.svg",
+			good = conf_dir .. "assets/icons/battery/good-charging.svg",
+			low = conf_dir .. "assets/icons/battery/low-charging.svg",
+			caution = conf_dir .. "assets/icons/battery/caution-charging.svg",
+			empty = conf_dir .. "assets/icons/battery/empty-charging.svg"
 		},
 
-		full = batterydir .. "full.svg",
-		good = batterydir .. "good.svg",
-		low = batterydir .. "low.svg",
-		caution = batterydir .. "caution.svg",
-		empty = batterydir .. "empty.svg"
+		full = conf_dir .. "assets/icons/battery/full.svg",
+		good = conf_dir .. "assets/icons/battery/good.svg",
+		low = conf_dir .. "assets/icons/battery/low.svg",
+		caution = conf_dir .. "assets/icons/battery/caution.svg",
+		empty = conf_dir .. "assets/icons/battery/empty.svg"
 	},
 
 	-- Volume indicator
 	volume = {
-		high = volumedir .. "high.svg",
-		medium = volumedir .. "medium.svg",
-		low = volumedir .. "low.svg",
-		off = volumedir .. "off.svg",
-		mute = volumedir .. "mute-red.svg",
-		error = volumedir .. "error.svg"
+		high = conf_dir .. "assets/icons/volume/high.svg",
+		medium = conf_dir .. "assets/icons/volume/medium.svg",
+		low = conf_dir .. "assets/icons/volume/low.svg",
+		off = conf_dir .. "assets/icons/volume/off.svg",
+		mute = conf_dir .. "assets/icons/volume/mute-red.svg",
+		error = conf_dir .. "assets/icons/volume/error.svg"
 	},
 
 	-- Brightness icons
@@ -91,12 +92,12 @@ return {
 	-- RAID status
 	raid = {
 		healthy = {
-			normal = conf.icon_dir .. "raid/healthy.svg",
-			recover = conf.icon_dir .. "raid/healthy-recover.svg"
+			normal = conf_dir .. "assets/icons/raid/healthy.svg",
+			recover = conf_dir .. "assets/icons/raid/healthy-recover.svg"
 		},
 		degraded = {
-			normal = conf.icon_dir .. "raid/degraded.svg",
-			recover = conf.icon_dir .. "raid/degraded-recover.svg"
+			normal = conf_dir .. "assets/icons/raid/degraded.svg",
+			recover = conf_dir .. "assets/icons/raid/degraded-recover.svg"
 		}
 	},
 

assets/init.lua

@@ -1,5 +1,14 @@
-local sounds = require("theme.resources.sounds")
-local icons = require("theme.resources.icons")
+-- DESKTOP ASSETS
+--
+-- This directory contains all media files used by awesome,
+-- and this script configures their paths.
+--
+-- Raw file paths should NEVER be referenced anywhere else.
+-- Use the `assets.*` table.
+
+local sounds = require("assets.sounds")
+local icons = require("assets.icons")
+
 
 local overrides = function(theme)
 	theme.sounds = sounds

assets/sounds.lua

@@ -0,0 +1,7 @@
+local gears = require("gears")
+local conf_dir = gears.filesystem.get_configuration_dir()
+
+return {
+	volume_up = conf_dir .. "assets/sounds/volumeup-click.mp3",
+	volume_down = conf_dir .. "assets/sounds/volumedown-click.mp3"
+}

bin/configs/compton.conf

@@ -1,79 +0,0 @@
-backend = "glx";
-mark-wmwin-focused = true;
-mark-ovredir-focused = true;
-detect-rounded-corners = true;
-detect-client-opacity = true;
-refresh-rate = 0;
-vsync = "none";
-dbe = false;
-paint-on-overlay = true;
-
-focus-exclude = [
-	"class_g = 'Firefox Developer Edition'",
-	"class_g = 'Firefox-esr'"
-];
-
-detect-transient = true;
-detect-client-leader = true;
-invert-color-include = [ ];
-glx-copy-from-front = false;
-glx-swap-method = "undefined";
-
-wintypes:
-{
-	tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; };
-};
-
-
-
-shadow = true;
-no-dnd-shadow = true;
-no-dock-shadow = false;
-clear-shadow = true;
-shadow-radius = 10;
-shadow-offset-x = -7;
-shadow-offset-y = -7;
-shadow-opacity = 0.3;
-shadow-exclude = [
-	#"!(class_g = 'kitty-noblur')"
-];
-
-
-
-fading = true;
-fade-in-step=0.02;
-fade-out-step=0.03;
-fade-delta=5;
-fade-exclude = [
-	"(!class_g = 'awesome') && (!class_g = 'Rofi')"
-]
-
-
-opacity = false
-active-opacity = 1;
-inactive-opacity = 1;
-frame-opacity = 1;
-
-opacity-rule = [
-	# Kitty already has a transparent background.
-	# 99% opacity to make text opaque
-	"99:class_g = 'kitty'"
-];
-
-
-
-## blur
-blur-background = true;
-blur-background-frame = false;
-blur-background-fixed = false;
-blur-kern = "3x3box";
-blur-method = "kawase";
-blur-strength = 16;
-
-blur-background-exclude = [
-	"window_type = 'desktop'",
-	"name = 'awesome'",
-	"name = 'Zoom Meeting'",
-	#"(class_g = 'awesome') && !(window_type = 'normal')",
-	"class_g = 'kitty-noblur'"
-];

theme/init.lua

@@ -5,7 +5,7 @@
 
 local bar = require("theme.bar")
 local clients = require("theme.clients")
-local resources = require("theme.resources")
+local assets = require("assets")
 local notifications = require("theme.notifications")
 
 local theme = {}
@@ -13,7 +13,8 @@ theme.dpi = beautiful.xresources.apply_dpi
 theme.color = require("theme.color")
 
 -- Execute overrides
-local theme = resources(theme) -- Must be first!
+-- `assets` override MUST be first!
+local theme = assets(theme)
 local theme = bar(theme)
 local theme = clients(theme)
 local theme = notifications(theme)

theme/resources/sounds.lua

@@ -1,4 +0,0 @@
-return {
-	volume_up = conf.sound_dir .. "volumeup-click.mp3",
-	volume_down = conf.sound_dir .. "volumedown-click.mp3"
-}