Improved lock module

assets/icons.lua

@@ -7,9 +7,6 @@ return {
 	submenu = conf_dir .. "assets/icons/submenu.svg",
 	launcher = conf_dir .. "assets/icons/arch.svg",
 
-	-- Used for i3lock, MUST be a png.
-	lockicon = conf_dir .. "assets/icons/arch.png",
-
 	music = {
 		grey = {
 			playing = conf_dir .. "assets/icons/music/pause-grey.svg",

config-template.lua

@@ -6,6 +6,7 @@ config.simple_widgets = { enabled = true }
 config.launcher = { enabled = true }
 config.screenshot = { enabled = true }
 config.keymap_popup = { enabled = true }
+config.lock = { enabled = true, type = "i3lock"}
 
 config.core = {
 	wallpaper = "/home/assets/wallpapers/Themed/Stellaris/Gigapixel/City.png",

modules/launcher/launcher.rasi

@@ -1,5 +1,5 @@
 configuration {
-	font: "Inter Regular 10";
+	font: "Inter Regular 25";
 	show-icons: true;
 	icon-theme: "Papirus";
 	drun-display-format: "{name}";
@@ -31,8 +31,8 @@ window {
 	anchor: southwest;
 	x-offset: 4px;
 	y-offset: -50px;
-	height: 500px;
+	height: 800px;
-	width: 400px;
+	width: 800px;
 	orientation: vertical;
 	border-radius: 5px;
 }
@@ -44,7 +44,7 @@ prompt {
 button {
 	action: "ok";
 	str: " ";
-	font: "FantasqueSansMono Nerd Font 11";
+	font: "FantasqueSansMono Nerd Font 25";
 	expand: false;
 	text-color: @foreground;
 	background-color: @transparent;
@@ -53,7 +53,7 @@ button {
 }
 
 entry {
-	font: "Inter Regular 11";
+	font: "Inter Regular 25";
 	background-color: @transparent;
 	text-color: @foreground;
 	expand: true;

modules/lock/dm-tool.bash

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+dm-tool lock

modules/lock/i3lock.bash

@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
-icon=$1
+icon="./arch.png"
 tmpbg="/tmp/lockscreen.png"
 tmpic="/tmp/lockscreenicon.png"
-#(( $# )) && { icon=$1; }
 
 scrot --overwrite "$tmpbg"
 convert "$icon" -scale 25% "$tmpic"

modules/lock/init.lua

@@ -1,11 +1,11 @@
-local script = conf_dir .. "modules/i3lock/lock.fish"
-script = script .. " "
-
 return {
 	keybinds = gears.table.join(
 		awful.key( {"Mod4"}, "l",
 			function ()
-				awful.spawn(script .. beautiful.icons.lockicon, false)
+				awful.spawn(
+					conf_dir .. "modules/lock/" .. config.lock.type .. ".bash",
+					false
+				)
 			end,
 
 			{