From 35fea860e0e5c6e39342e60619683438ae1cf4aa Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Thu, 12 Sep 2024 01:03:30 +0300
Subject: [PATCH] Sway : Add brightness key.

---
 .readme/keyd/system/keyboard-layout.json | 24 ++++++++++++------------
 Readme.md                                |  2 +-
 home/config/sway/default.nix             |  1 -
 home/config/sway/module/Brightness.nix   |  8 --------
 home/config/sway/module/System.nix       |  6 ++++++
 host/x86_64-linux/work/default.nix       |  4 ++--
 6 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 home/config/sway/module/Brightness.nix

diff --git a/.readme/keyd/system/keyboard-layout.json b/.readme/keyd/system/keyboard-layout.json
index 1fd3e9b..07d2f0d 100644
--- a/.readme/keyd/system/keyboard-layout.json
+++ b/.readme/keyd/system/keyboard-layout.json
@@ -30,7 +30,13 @@
     },
     "Tab",
     "Q",
-    "W",
+    {
+      "c": "#8ec07c"
+    },
+    "Bright- ness Up",
+    {
+      "c": "#cccccc"
+    },
     "E",
     "R",
     "T",
@@ -58,16 +64,16 @@
     },
     "Caps Lock",
     "A",
-    "S",
-    "D",
-    "F",
     {
       "c": "#8ec07c"
     },
-    "Toggle Gaming",
+    "Bright-ness Down",
     {
       "c": "#cccccc"
     },
+    "D",
+    "F",
+    "G",
     "H",
     "J",
     "K",
@@ -102,13 +108,7 @@
     },
     "B",
     "N",
-    {
-      "c": "#8ec07c"
-    },
-    "Toggle moni-tors",
-    {
-      "c": "#cccccc"
-    },
+    "M",
     "<\n,",
     ">\n.",
     "?\n/",
diff --git a/Readme.md b/Readme.md
index eb61a5d..2e61cce 100644
--- a/Readme.md
+++ b/Readme.md
@@ -99,7 +99,7 @@ Tmux:<br>
 
 <details>
 <summary>System controls</summary>
-<img src="https://i.imgur.com/wZOTRCm.png" />
+<img src="https://i.imgur.com/VmpOq6d.png" />
 </details>
 
 [Link](http://www.keyboard-layout-editor.com) / [Source](https://github.com/ijprest/keyboard-layout-editor) of the tool I used to draw the images.
diff --git a/home/config/sway/default.nix b/home/config/sway/default.nix
index 87f1216..5907de8 100644
--- a/home/config/sway/default.nix
+++ b/home/config/sway/default.nix
@@ -9,7 +9,6 @@
 		./module/Launcher.nix
 		./module/Terminal.nix
 		./module/TitleBar.nix
-		./module/Brightness.nix
 		./module/Navigation.nix
 		./module/Notification.nix
 		./module/Resize.nix
diff --git a/home/config/sway/module/Brightness.nix b/home/config/sway/module/Brightness.nix
deleted file mode 100644
index 88a8c56..0000000
--- a/home/config/sway/module/Brightness.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }: let
-	step = 5;
-in {
-	text = ''
-		bindsym XF86MonBrightnessDown exec light -U ${toString step}
-		bindsym XF86MonBrightnessUp   exec light -A ${toString step}
-	'';
-}
diff --git a/home/config/sway/module/System.nix b/home/config/sway/module/System.nix
index 594aa49..99fa3ef 100644
--- a/home/config/sway/module/System.nix
+++ b/home/config/sway/module/System.nix
@@ -1,5 +1,6 @@
 { ... }: let
 	mod = "print";
+	brstep = 5;
 in {
 	text = ''
 		bindsym ${mod} input * xkb_switch_layout 0
@@ -10,5 +11,10 @@ in {
 		bindsym --to-code ${mod}+v exec 'swayscript vpntoggle'
 		bindsym --to-code ${mod}+x exec 'systemctl poweroff -i'
 		bindsym --to-code ${mod}+z exec 'systemctl suspend -i'
+
+		bindsym --to-code ${mod}+w    exec light -U ${toString brstep}
+		bindsym XF86MonBrightnessDown exec light -U ${toString brstep}
+		bindsym --to-code ${mod}+s    exec light -A ${toString brstep}
+		bindsym XF86MonBrightnessUp   exec light -A ${toString brstep}
 	'';
 }
diff --git a/host/x86_64-linux/work/default.nix b/host/x86_64-linux/work/default.nix
index 5ceaa05..988e9d9 100644
--- a/host/x86_64-linux/work/default.nix
+++ b/host/x86_64-linux/work/default.nix
@@ -4,7 +4,7 @@
 	];
 
 	# Keyd Print to Macro remap.
-	services.keyd.keyboards.default.settings.main.print = "layer(layer_macro)";
+	services.keyd.keyboards.default.settings.main.print = "layer(layer_number)";
 
 	home.nixos.enable = true;
 	user = {
@@ -17,7 +17,7 @@
 		builder.client.enable      = true;
 		desktop.sway.enable        = true;
 		kernel.enable              = true;
-		keyd.enable           = true;
+		keyd.enable                = true;
 		powerlimit.thinkpad.enable = true;
 		print.enable               = true;
 		intel.cpu = {