system/desktop.nix

@@ -87,7 +87,11 @@
     };
     xserver = {
       enable = true;
-      xkb.layout = "gb";
+      xkb = {
+        layout = "gb";
+        variant = "";
+        options = "ctrl:nocaps";
+      };
     };
   };
   xdg.portal = {

system/home/desktop/hyprland.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  osConfig,
   ...
 }:
 {
@@ -176,7 +175,8 @@
       ];
       gestures.workspace_swipe = true;
       input = {
-        kb_layout = osConfig.services.xserver.xkb.layout;
+        kb_layout = "gb";
+        kb_options = "ctrl:nocaps";
         follow_mouse = 1;
         touchpad.natural_scroll = "yes";
       };
@@ -279,8 +279,8 @@
 
         # Workspace rules
         "workspace 2, firefox" # Browser
-        "workspace 3, (libreoffice|soffice)(.*)" # Documents
-        "workspace 4, (signal|whatsapp-for-linux|WebCord|teams-for-linux)" # Messaging
+        "workspace 3, (signal|whatsapp-for-linux|WebCord|teams-for-linux)" # Messaging
+        "workspace 4, (com.github.neithern.g4music|com.github.rafostar.Clapper)" # Media
         "workspace 5, (org.remmina.Remmina|Nxplayer.bin)" # Remote Desktop
         "workspace 6 silent, (steam|steam_app|lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher)" # Gaming
 

system/home/desktop/sway.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  osConfig,
   ...
 }:
 {
@@ -76,7 +75,8 @@
     config = {
       input = {
         "*" = {
-          xkb_layout = osConfig.services.xserver.xkb.layout;
+          xkb_layout = "gb";
+          xkb_options = "ctrl:nocaps";
         };
         "type:touchpad" = {
           tap = "enabled";

system/home/desktop/waybar.nix

@@ -38,8 +38,8 @@
         format-icons = {
           "1" = "󰆍 ";
           "2" = "󰈹 ";
-          "3" = "󰝰 ";
-          "4" = "󰭹 ";
+          "3" = "󰭹 ";
+          "4" = "󰝚 ";
           "5" = "󰢹 ";
           "6" = "󰓓 ";
           default = "󰀻 ";

system/kanata.kbd

@@ -1,5 +1,5 @@
 (defsrc
-  caps a s d f j k l ;
+  a s d f j k l ;
 )
 (defvar
   tap-time 150
@@ -7,19 +7,18 @@
 )
 
 (defalias
-  capsctrl (tap-hold 100 100 caps lctl)
-  a (tap-hold $tap-time $hold-time a lsft)
-  s (tap-hold $tap-time $hold-time s lalt)
-  d (tap-hold $tap-time $hold-time d lmet)
-  f (tap-hold $tap-time $hold-time f lctl)
-  j (tap-hold $tap-time $hold-time j lctl)
-  k (tap-hold $tap-time $hold-time k lmet)
-  l (tap-hold $tap-time $hold-time l lalt)
-  ; (tap-hold $tap-time $hold-time ; lsft)
+  a (tap-hold $tap-time $hold-time a lalt)
+  s (tap-hold $tap-time $hold-time s lmet)
+  d (tap-hold $tap-time $hold-time d lctl)
+  f (tap-hold $tap-time $hold-time f lsft)
+  j (tap-hold $tap-time $hold-time j lsft)
+  k (tap-hold $tap-time $hold-time k lctl)
+  l (tap-hold $tap-time $hold-time l lmet)
+  ; (tap-hold $tap-time $hold-time ; lalt)
 )
 
 (deflayer base
-  @capsctrl @a @s @d @f @j @k @l @;
+  @a @s @d @f @j @k @l @;
 )
 
 ;; Local Variables: