From 32500bffd0d702fc3ed2bb394893d6bc778f83f1 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@tristans.cloud>
Date: Thu, 7 Sep 2023 11:04:05 +0100
Subject: [PATCH] laptop keyboard, window switch script fix

---
 lib/modules/keyboard.nix | 4 ++--
 lib/modules/laptop.nix   | 4 +++-
 lib/scripts.nix          | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/modules/keyboard.nix b/lib/modules/keyboard.nix
index f94b7ef..6f3a7a9 100644
--- a/lib/modules/keyboard.nix
+++ b/lib/modules/keyboard.nix
@@ -13,8 +13,8 @@ with lib;
         wayland.windowManager.hyprland.extraConfig = ''
           # === KEYBOARD MODULE ===
           input {
-            kb_variant = ,dvorak
-            kb_layout = gb,gb
+            kb_variant = dvorak
+            kb_layout = gb
             kb_options = caps:escape
             numlock_by_default = true
           }
diff --git a/lib/modules/laptop.nix b/lib/modules/laptop.nix
index 6e3f385..de3c425 100644
--- a/lib/modules/laptop.nix
+++ b/lib/modules/laptop.nix
@@ -35,7 +35,9 @@ in
           
           # toggle built in keyboard layout
           device:at-translated-set-2-keyboard {
-            kb_options = grp:alt_shift_toggle
+            kb_variant = dvorak,
+            kb_layout = gb,gb
+            kb_options = grp:alt_shift_toggle,caps:escape
           }
         '';
       };
diff --git a/lib/scripts.nix b/lib/scripts.nix
index 3ef5aa1..4538c1b 100644
--- a/lib/scripts.nix
+++ b/lib/scripts.nix
@@ -19,6 +19,7 @@ let
     fileman = "${pkgs.pcmanfm}/bin/pcmanfm";
     gawk = "${pkgs.gawk}/bin/awk";
     hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
+    sed = "${pkgs.gnused}/bin/sed";
   };
 in
 {
@@ -103,7 +104,9 @@ in
       text = ''
         ${my-deps.hyprctl} clients -j | \
           ${my-deps.jq} '.[] | .title' -r | \
+          ${my-deps.sed} '/^$/d' |
           ${my-deps.menu} | \
+          ${my-deps.sed} 's/\([\[\(\)]\)/\\\\\1/g' | \
           ${my-deps.xargs} -I_ ${my-deps.hyprctl} dispatch focuswindow title:"_"
       '';
       hotkeys = [