From b9cf040b74e5c0fc021a47a103a9d5b80b085111 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@tristans.cloud>
Date: Sun, 31 Aug 2025 16:49:13 +0100
Subject: [PATCH] zenix: keyboard layout

---
 home/desktop/niri/default.nix |  6 ++++--
 home/desktop/utils/waybar.nix | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/home/desktop/niri/default.nix b/home/desktop/niri/default.nix
index 05865a5..c7c81f1 100644
--- a/home/desktop/niri/default.nix
+++ b/home/desktop/niri/default.nix
@@ -11,6 +11,7 @@
   ];
 
   programs.waybar.settings.mainBar.modules-left = ["niri/workspaces" "niri/window"];
+  programs.waybar.settings.mainBar.modules-right = lib.mkBefore ["niri/language"];
 
   programs.fuzzel = {
     enable = true;
@@ -32,8 +33,8 @@
   programs.niri = {
     settings = {
       input.keyboard = {
-        xkb.layout = "us";
-        xkb.variant = "dvorak";
+        xkb.layout = "us,gb";
+        xkb.variant = "dvorak,";
         xkb.options = "caps:escape";
       };
       input.mouse = {
@@ -128,6 +129,7 @@
 
         "Mod+M".action = switch-preset-column-width;
         "Mod+G".action = toggle-window-floating;
+        "Mod+Shift+Ctrl+Alt+Space".action = switch-layout "next";
 
         "Print".action = screenshot;
 
diff --git a/home/desktop/utils/waybar.nix b/home/desktop/utils/waybar.nix
index 72756b4..5248e7e 100644
--- a/home/desktop/utils/waybar.nix
+++ b/home/desktop/utils/waybar.nix
@@ -7,7 +7,7 @@
         layer = "bottom";
         position = "top";
         height = 36;
-        modules-right = ["mpris" "power-profiles-daemon" "cpu" "idle_inhibitor" "pulseaudio" "clock" "tray" "battery"];
+        modules-right = ["mpris" "power-profiles-daemon" "cpu" "idle_inhibitor" "wireplumber" "clock" "tray" "battery"];
         "cpu" = {
           "format" = "{icon}";
           "format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
@@ -35,11 +35,11 @@
           tooltip-format-activated = "system sleep inhibited";
           tooltip-format-deactivated = "system will sleep when idle";
         };
-        pulseaudio = {
-          format-muted = "🔇 {volume}";
-          format = "{icon} {volume}";
-          format-icons.default = ["🔈" "🔉" "🔊"];
-          on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
+        wireplumber = {
+          format-muted = "🔇";
+          format = "{icon} {volume}%";
+          format-icons = ["🔈" "🔉" "🔊"];
+          on-click = "pwvucontrol";
         };
         mpris = {
           format = "{player_icon} {title}";