Minor cleanup

assets/apps.lua

@@ -7,5 +7,6 @@ return {
 	signal = conf_dir .. "assets/apps/signal.svg",
 	terminal = conf_dir .. "assets/apps/terminal.svg",
 	thunderbird = conf_dir .. "assets/apps/thunderbird.svg",
-	writer = conf_dir .. "assets/apps/writer.svg"
+	writer = conf_dir .. "assets/apps/writer.svg",
+	phone = conf_dir .. "assets/apps/phone.svg",
 }

assets/apps/phone.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1">
+ <rect style="opacity:0.2" width="40" height="60" x="12" y="3" rx="3" ry="3"/>
+ <path style="fill:#595959" d="M 15 2 C 13.338 2 12 3.338 12 5 L 12 8 L 52 8 L 52 5 C 52 3.338 50.662 2 49 2 L 15 2 z M 12 54 L 12 59 C 12 60.662 13.338 62 15 62 L 49 62 C 50.662 62 52 60.662 52 59 L 52 54 L 12 54 z"/>
+ <rect style="fill:#333333" width="40" height="46" x="12" y="8"/>
+ <path style="fill:#333333" d="M 28.25 4 C 27.5575 4 27 4.446 27 5 C 27 5.554 27.5575 6 28.25 6 L 35.75 6 C 36.4425 6 37 5.554 37 5 C 37 4.446 36.4425 4 35.75 4 L 28.25 4 z M 40 4 A 1 1 0 0 0 39 5 A 1 1 0 0 0 40 6 A 1 1 0 0 0 41 5 A 1 1 0 0 0 40 4 z M 30.5 55 C 29.669 55 29 55.669 29 56.5 L 29 59.5 C 29 60.331 29.669 61 30.5 61 L 33.5 61 C 34.331 61 35 60.331 35 59.5 L 35 56.5 C 35 55.669 34.331 55 33.5 55 L 30.5 55 z M 19.5 56 C 18.669 56 18 56.669 18 57.5 C 18 58.331 18.669 59 19.5 59 L 22.5 59 C 23.331 59 24 58.331 24 57.5 C 24 56.669 23.331 56 22.5 56 L 19.5 56 z M 41.5 56 C 40.669 56 40 56.669 40 57.5 C 40 58.331 40.669 59 41.5 59 L 44.5 59 C 45.331 59 46 58.331 46 57.5 C 46 56.669 45.331 56 44.5 56 L 41.5 56 z"/>
+ <path style="fill:#ffffff;opacity:0.1" d="M 15 2 C 13.338 2 12 3.338 12 5 L 12 6 C 12 4.338 13.338 3 15 3 L 49 3 C 50.662 3 52 4.338 52 6 L 52 5 C 52 3.338 50.662 2 49 2 L 15 2 z"/>
+ <rect style="opacity:0.2" width="40" height="1" x="12" y="8"/>
+</svg>

clients/rules.lua

@@ -28,7 +28,8 @@ return {
 				"feh",
 				"Tor Browser",		-- Needs a fixed window size to avoid fingerprinting by screen size.
 				"zoom",
-				"flameshot"
+				"flameshot",
+				"scrcpy"
 			},
 
 			role = {

config-template.lua

@@ -1,5 +1,3 @@
-local config = {}
-
 -- Copy this file to `config.lua` before starting awesome.
 
 -- To enable a module, add a line like the ones below.
@@ -178,9 +176,4 @@ config.ibus = {
 			ibus_engine = "xkb:ru::rus"
 		}
 	}
-}
-
-
-
-
-return config
+}

core/start.lua

@@ -95,14 +95,6 @@ local function start()
 	-- Prepare screens
 	awful.screen.connect_for_each_screen(
 		function(s)
-
-			-- Run module screen initialization methods
-			for _, mod in pairs(modules) do
-				if (mod["for_each_screen"] ~= nil) then
-					mod["for_each_screen"](s)
-				end
-			end
-
 			-- Create tag table
 			s.tagger = tagger:new(s)
 
@@ -223,6 +215,14 @@ local function start()
 					rightside
 				}
 			}
+
+
+			-- Run module screen initialization methods
+			for _, mod in pairs(modules) do
+				if (mod["for_each_screen"] ~= nil) then
+					mod["for_each_screen"](s)
+				end
+			end
 		end
 	)
 end

modules/volume/util.lua

@@ -96,6 +96,8 @@ volume.commands = {
 					value = tonumber(string.format("% 3d", value))
 				end
 
+				-- Value will be "false" if audio not connected,
+				-- needs to be handled gracefully
 				callback({
 					mute = muted,
 					value = value

rc.lua

@@ -23,7 +23,15 @@ debug_message = function(msg)
 end
 
 -- Order matters.
-config = require("config")
+conf_env = os.getenv("AWESOMEWM_CONFIG")
+config = {}
+if (conf_env == nil) then
+	-- Default location: in this directory
+	dofile(conf_dir .. "/config.lua")
+else
+	dofile(conf_env)
+end
+
 beautiful.init(require("theme"))