Minor edits

assets/apps.lua

@@ -9,4 +9,5 @@ return {
 	thunderbird = conf_dir .. "assets/apps/thunderbird.svg",
 	writer = conf_dir .. "assets/apps/writer.svg",
 	phone = conf_dir .. "assets/apps/phone.svg",
+	code = conf_dir .. "assets/apps/code.svg",
 }

assets/apps/code.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1">
+ <rect style="opacity:0.2" width="56" height="48" x="4" y="9" rx="2.8" ry="2.4"/>
+ <rect style="fill:#167abf" width="56" height="48" x="4" y="8" rx="2.8" ry="2.4"/>
+ <path style="fill:#ffffff;opacity:0.1" d="M 6.8007812 8 C 5.2495813 8 4 9.0707908 4 10.400391 L 4 11.400391 C 4 10.070791 5.2495813 9 6.8007812 9 L 57.199219 9 C 58.750419 9 60 10.070791 60 11.400391 L 60 10.400391 C 60 9.0707908 58.750419 8 57.199219 8 L 6.8007812 8 z"/>
+ <path style="opacity:0.2" d="m 6.8,7.9999992 c -1.5512,0 -2.8,1.0692973 -2.8,2.3988968 v 43.202207 c 0,1.3296 1.2488,2.398898 2.8,2.398898 H 22.2 V 7.9999992 Z"/>
+ <path style="opacity:0.2" d="M 21.955078,4.9143037 A 3.0003,3.0003 0 0 0 19,7.9572725 V 57.957273 a 3.0003,3.0003 0 1 0 6,0 V 7.9572725 A 3.0003,3.0003 0 0 0 21.955078,4.9143037 Z m 8.087891,7.0429693 a 3.0003,3.0003 0 1 0 0,6 H 41 a 3.0003,3.0003 0 1 0 0,-6 z m 4,9 a 3.0003,3.0003 0 1 0 0,6 H 48 a 3.0003,3.0003 0 1 0 0,-6 z m 0,9 a 3.0003,3.0003 0 1 0 0,6 H 48 a 3.0003,3.0003 0 1 0 0,-6 z m 0,9 a 3.0003,3.0003 0 1 0 0,6 H 48 a 3.0003,3.0003 0 1 0 0,-6 z m -4,9 a 3.0003,3.0003 0 1 0 0,6 H 41 a 3.0003,3.0003 0 1 0 0,-6 z"/>
+ <path style="fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round" d="M 22,7 V 57"/>
+ <path style="fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round" d="M 30.042727,13.9994 H 41"/>
+ <path style="fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round" d="M 34.042727,22.9997 H 48"/>
+ <path style="fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round" d="M 34.042727,31.9997 H 48"/>
+ <path style="fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round" d="M 34.042727,40.9997 H 48"/>
+ <path style="fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round" d="M 30.042727,49.9997 H 41"/>
+</svg>

assets/icons.lua

@@ -7,6 +7,7 @@ return {
 	submenu = conf_dir .. "assets/icons/submenu.svg",
 	arch = conf_dir .. "assets/icons/arch.svg",
 	nix = conf_dir .. "assets/icons/nix.svg",
+	sys76 = conf_dir .. "assets/icons/sys76.svg",
 	nix_grey = conf_dir .. "assets/icons/nix-grey.svg",
 	arch_grey = conf_dir .. "assets/icons/arch-grey.svg",
 

assets/icons/sys76 alt.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 480.00001 480"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   sodipodi:docname="sys76.svg"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs4" /><sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.0844886"
+     inkscape:cx="301.5246"
+     inkscape:cy="154.91172"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1362"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showguides="true" /><metadata
+     id="metadata7"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="print-logo"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-132.5822,958.04022)"><circle
+       style="display:inline;fill:#faa41a;fill-opacity:1;stroke-width:1.00645"
+       id="path2-6"
+       cx="372.58221"
+       cy="-718.04022"
+       r="239.99998" /><circle
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.884138"
+       id="path2"
+       cx="372.58221"
+       cy="-718.04022"
+       r="210.83322" /><path
+       d="m 365.13622,-928.75782 a 210.72083,210.72083 0 0 0 -141.52888,359.73483 l 2.17872,2.12607 114.76933,-212.77665 h -122.7814 l 21.55875,36.30037 a 11.104441,11.104441 0 0 1 1.33626,8.60935 11.895105,11.895105 0 0 1 -11.4206,8.89068 11.174722,11.174722 0 0 1 -9.55826,-5.23605 l -32.03063,-53.90572 a 11.122011,11.122011 0 0 1 -1.66988,-6.00897 v -0.47419 a 11.385566,11.385566 0 0 1 11.28023,-11.03414 h 162.63086 c 2.9342,0 6.46588,1.05328 8.25795,2.45989 l 0.16869,0.13116 a 12.879043,12.879043 0 0 1 3.86547,16.55133 l -124.20465,230.29411 a 12.879043,12.879043 0 0 1 -2.45982,3.19789 210.73839,210.73839 0 0 0 249.93781,3.25037 h -98.95603 a 13.072317,13.072317 0 0 1 -13.07231,-13.07231 v -0.26427 a 13.072317,13.072317 0 0 1 13.07231,-13.07231 h 129.17699 a 210.73839,210.73839 0 0 0 -4.07632,-294.00417 211.89803,211.89803 0 0 0 -28.42886,-23.86044 l -0.0563,0.11245 -0.57911,1.73929 c -4.09375,7.60782 -51.67416,93.64964 -67.4348,122.1312 l -5.78069,10.45431 c -13.23049,22.87663 -19.30972,48.61701 -16.25259,68.87563 a 66.327949,66.327949 0 0 0 11.54374,28.5342 68.770224,68.770224 0 0 0 44.80443,27.98956 71.30035,71.30035 0 0 0 11.98287,1.01954 69.947434,69.947434 0 0 0 42.25665,-14.02101 66.626645,66.626645 0 0 0 26.00407,-42.3796 66.486082,66.486082 0 0 0 -12.29922,-50.81337 70.544824,70.544824 0 0 0 -45.38408,-27.77871 76.905277,76.905277 0 0 0 -3.11,-0.45731 12.281653,12.281653 0 0 1 -10.78827,-12.61559 12.123519,12.123519 0 0 1 4.09393,-8.83782 12.387074,12.387074 0 0 1 9.64616,-3.02209 95.055416,95.055416 0 0 1 65.62509,38.33834 91.014244,91.014244 0 0 1 16.55133,69.27991 91.014244,91.014244 0 0 1 -38.3033,60.05526 94.756727,94.756727 0 0 1 -54.25714,16.92015 h -0.0175 a 96.267769,96.267769 0 0 1 -16.0768,-1.37001 93.175398,93.175398 0 0 1 -61.00415,-38.19795 98.095086,98.095086 0 0 1 -7.46743,-12.40457 c -12.59797,-24.87957 -13.23049,-53.94094 -1.79171,-84.074 a 323.99665,323.99665 0 0 1 13.3184,-29.48291 l 71.65167,-130.89902 1.68675,-2.05571 0.0748,-0.14996 a 211.54663,211.54663 0 0 0 -17.21892,-8.20527 210.72083,210.72083 0 0 0 -89.48549,-16.51606 z"
+       id="path1"
+       style="fill:#000000;fill-opacity:1;stroke-width:17.5703" /></g></svg>

clients/binds/keys.lua

@@ -36,6 +36,32 @@ return gears.table.join(
 		}
 	),
 
+
+
+
+	awful.key( {"Mod4"}, "Right",
+		function ()
+			awful.client.focus.byidx(1)
+		end,
+		{
+			description = "Focus next",
+			group = "Client"
+		}
+	),
+
+	awful.key( {"Mod4"}, "Left",
+		function ()
+			awful.client.focus.byidx(-1)
+		end,
+		{
+			description = "Focus previous",
+			group = "Client"
+		}
+	),
+
+
+
+
 	awful.key( {"Mod4", "Shift"}, "c",
 		function (c)
 			c:kill()

core/keybinds.lua

@@ -156,32 +156,8 @@ return gears.table.join(
 			description = "Down",
 			group = "Tags"
 		}
-	),
-
-
-
-	-- Clients
-	awful.key( {"Mod4"}, "Left",
-		function ()
-			awful.client.focus.byidx( 1)
-		end,
-		{
-			description = "Focus next",
-			group = "Client"
-		}
-	),
-
-	awful.key( {"Mod4"}, "Right",
-		function ()
-			awful.client.focus.byidx(-1)
-		end,
-		{
-			description = "Focus previous",
-			group = "Client"
-		}
 	)
 
-
 	--[[
 	awful.key( {"Mod4", "Shift"}, "j",
 		function ()

defaults.lua

@@ -1,22 +1,58 @@
--- Copy this file to `config.lua` before starting awesome.
+-- Default configuration values.
+-- Override these by creating `config.lua`
+-- Example contents:
+--
+--[[ config.lua
 
--- To enable a module, add a line like the ones below.
--- To disable a module, delete its config table or set
--- enabled to false.
 
-config.picom = { enabled = true }
+-- Override values in defaults.lua.
+-- If you only want to overwrite one, you'll need to do explicitly:
+-- config.core = { wallpaper = "" } will delete all other value in config.core.
+
+config.battery = { enabled = true }
+config.backlight = { enabled = true }
+config.launcher = { enabled = true, icon = "nix"}
+
+config.core.wallpaper = "/home/assets/wallpapers/Themed/Stellaris/upscale/City.png"
+config.core.default_clienticon = "arch_grey"
+config.core.browser = "firefox-developer-edition --new-tab"
+
+config.core.startup_commands = {
+	"ibus-daemon --daemonize --replace --xim",
+	"keepassxc"
+}
+
+
+]]--
+
+
+
+local config = {}
+
+config.launcher = { enabled = true, icon = "arch"}
 config.lock = { enabled = true, type = "i3lock"}
-config.battery = { enabled = false }
-config.backlight = { enabled = false }
-config.simple_widgets = { enabled = true }
-config.launcher = { enabled = true, icon = "arch" } -- available icons: arch, nix
 config.screenshot = { enabled = true }
+config.simple_widgets = { enabled = true }
 config.keymap_popup = { enabled = true }
+config.battery = { enabled = false }
+config.picom = { enabled = true }
+config.backlight = {
+	enabled = false,
+	button_step = 5,
+	scroll_step = 5,
+	backend = "xbacklight"
+}
 
 config.core = {
-	wallpaper = "/home/assets/wallpapers/Themed/Stellaris/Gigapixel/City.png",
-	default_clienticon = "nix_grey"
-	--
+	-- Icon to use when a window doesn't provide one
+	default_clienticon = "arch_grey",
+	continuous_tag_updates = true,
+
+	-- Run these commands in this order when awesome starts.
+	startup_commands = {},
+
+	wallpaper = "",
+
 	-- Dynamic: a table of files and times
 	-- {file = "path", start_time = {hour, minute}}
 	--[[
@@ -24,18 +60,15 @@ config.core = {
 		{ file = "morning-file.png", start_time = {04, 00} },
 		{ file = "noon-file.png", start_time = {11, 00} },
 		{ file = "night-file.png", start_time = {19, 00} },
-	},
+	}
 	]]--
 
-	
 
-	-- Font definitions
 	font = {
 		normal_large = "Hack NF 16",
 		normal_medium = "Hack NF 14",
 		normal = "Hack NF 12",
 		normal_small = "Hack NF 10",
-
 		prompt = "Hack NF 14"
 	},
 
@@ -48,9 +81,9 @@ config.core = {
 	bar_margin = 3,
 
 	-- Preferred terminal.
-	terminal = "kitty",
+	terminal = "alacritty",
 	-- Preferred browser.
-	browser = "firefox-developer-edition --new-tab",
+	browser = "firefox --new-tab",
 
 	-- Table of layouts.
 	-- This is not handled by the regular awesomewm facility.
@@ -90,19 +123,8 @@ config.core = {
 		--awful.layout.suit.corner.se,
 	},
 
-	-- Run these commands, in this order, when awesome starts.
-	startup_commands = {
-		"ibus-daemon --daemonize --replace --xim",
-		"keepassxc"
-	},
 
-	continuous_tag_updates = true,
 
-	-- Format:
-	-- {command, icon-name}
-	--
-	-- Icons files are in assets/apps,
-	-- Icon names are defined in assts/apps.lua.
 	bar_shortcuts = {
 		{
 			"thunar",
@@ -113,12 +135,12 @@ config.core = {
 			"firefox_dev"
 		},
 		{
-			"thunderbird",
-			"thunderbird"
+			"code",
+			"code"
 		},
 		{
-			"onlyoffice-desktopeditors",
-			"writer"
+			"thunderbird",
+			"thunderbird"
 		},
 		{
 			"signal-desktop",
@@ -129,7 +151,6 @@ config.core = {
 			"keepassx"
 		}
 	}
-
 }
 
 config.mpc = {
@@ -145,7 +166,6 @@ config.mpc = {
 }
 
 
-
 config.volume = {
 	enabled = true,
 
@@ -156,11 +176,10 @@ config.volume = {
 	-- The pulse sink volume widgets and keybinds should use.
 	--   To use the default, keep this value an empty string.
 	--   Applies the --sink option to pamixer
-	pamixer_sink = ""
+	pamixer_sink = "",
 }
 
 
-
 config.ibus = {
 	enabled = true,
 
@@ -178,16 +197,18 @@ config.ibus = {
 			indicator_code = "en",
 			ibus_engine = "xkb:us::eng",
 		},
+		{
+			title = "Russian",
+			indicator_code = "ru",
+			ibus_engine = "xkb:ru::rus"
+		},
 		{
 			title = "LaTeX",
 			indicator_code = "∫x",
 			ibus_engine = "table:latex",
 			requires_engine = "xkb:us::eng"
-		},
-		{
-			title = "Russian",
-			indicator_code = "ru",
-			ibus_engine = "xkb:ru::rus"
 		}
 	}
-}
+}
+
+return config

modules/backlight/popup.lua

@@ -129,6 +129,10 @@ return function(s)
 	awesome.connect_signal("module::backlight:update",
 		function(value)
 
+			if value == nil then
+				value = 0
+			end
+
 			-- Update slider
 			widget.
 				container.

modules/backlight/util.lua

@@ -1,6 +1,69 @@
-local backlight = {}
+local brightnessctl = {}
+brightnessctl.parse = function(s)
+	local batpec = string.match(s, ",%d?%d?%d%%,")
+	batpec = batpec:sub(2, batpec:len() - 2)
+	return tonumber(batpec)
+end
 
-backlight.get = function(callback)
+brightnessctl.get = function(callback)
+	awful.spawn.easy_async(
+		"brightnessctl info -m",
+		function(stdout, stderr, exitreason, exitcode)
+			callback(brightnessctl.parse(stdout))
+		end
+	)
+end
+
+brightnessctl.set = function(value)
+	awful.spawn.easy_async(
+		"brightnessctl set " .. value .. "% -m",
+		function(stdout, stderr, exitreason, exitcode)
+			awesome.emit_signal(
+				"module::backlight:update",
+				brightnessctl.parse(stdout)
+			)
+		end
+	)
+end
+
+brightnessctl.watch = function(timeout, callback, widget)
+	awful.widget.watch(
+		"brightnessctl get -m",
+		timeout,
+		function(stdout, stderr, exitreason, exitcode)
+			callback(brightnessctl.parse(stdout))
+		end,
+		widget
+	)
+end
+
+brightnessctl.backlight_up = function(value)
+	awful.spawn.easy_async(
+		"brightnessctl set " .. value .. "%+ -m",
+		function(stdout, stderr, exitreason, exitcode)
+			awesome.emit_signal(
+				"module::backlight:update",
+				brightnessctl.parse(stdout)
+			)
+		end
+	)
+end
+
+brightnessctl.backlight_down = function(value)
+	awful.spawn.easy_async(
+		"brightnessctl set " .. value .. "%- -m",
+		function(stdout, stderr, exitreason, exitcode)
+			awesome.emit_signal(
+				"module::backlight:update",
+				brightnessctl.parse(stdout)
+			)
+		end
+	)
+end
+
+
+local xbacklight = {}
+xbacklight.get = function(callback)
 	awful.spawn.easy_async(
 		"xbacklight -get",
 		function(stdout, stderr, exitreason, exitcode)
@@ -9,11 +72,11 @@ backlight.get = function(callback)
 	)
 end
 
-backlight.set = function(value)
+xbacklight.set = function(value)
 	awful.spawn("xbacklight -set " .. value, false)
 end
 
-backlight.watch = function(timeout, callback, widget)
+xbacklight.watch = function(timeout, callback, widget)
 	awful.widget.watch(
 		"xbacklight -get",
 		timeout,
@@ -23,7 +86,7 @@ backlight.watch = function(timeout, callback, widget)
 end
 
 
-backlight.backlight_up = function(value)
+xbacklight.backlight_up = function(value)
 	awful.spawn.easy_async(
 		"xbacklight -inc " .. value,
 		function(stdout, stderr, exitreason, exitcode)
@@ -32,7 +95,7 @@ backlight.backlight_up = function(value)
 	)
 end
 
-backlight.backlight_down = function(value)
+xbacklight.backlight_down = function(value)
 	awful.spawn.easy_async(
 		"xbacklight -dec " .. value,
 		function(stdout, stderr, exitreason, exitcode)
@@ -41,6 +104,18 @@ backlight.backlight_down = function(value)
 	)
 end
 
+
+local backlight = {}
+if config.backlight.backend == "xbacklight" then
+	backlight = xbacklight
+elseif  config.backlight.backend == "brightnessctl" then
+	backlight = brightnessctl
+else
+	backlight = xbacklight
+end
+
+
+
 awesome.connect_signal("module::backlight:update_read",
 	function()
 		backlight.get(

modules/screenshot/init.lua

@@ -1,6 +1,6 @@
 local function screenshot_action(mode)
 	awful.spawn(
-		conf_dir .. "modules/screenshot/screenshot.fish " .. mode,
+		"fish " .. conf_dir .. "modules/screenshot/screenshot.fish " .. mode,
 		false
 	)
 end

rc.lua

@@ -10,7 +10,8 @@ require("awful.autofocus")
 -- Load configuration
 conf_dir = gears.filesystem.get_configuration_dir()
 conf_env = os.getenv("AWESOMEWM_CONFIG")
-config = {}
+config = require("defaults")
+
 if (conf_env == nil) then
 	-- Default location: in this directory
 	dofile(conf_dir .. "/config.lua")