From a6531caa7fdeada06ce7e0465891b3ca95c63b2f Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Sun, 26 Mar 2023 00:49:05 +0100
Subject: [PATCH] feat: switch DM & use Kanata

---
 home/apps/i3.nix                   |  4 +++-
 machines/common/linux/xsession.nix | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/home/apps/i3.nix b/home/apps/i3.nix
index 5a58e18..4684c95 100644
--- a/home/apps/i3.nix
+++ b/home/apps/i3.nix
@@ -279,7 +279,6 @@
     for_window [window_role="task_dialog"] floating enable
 
     # apps
-    for_window [class="Lightdm-settings"] floating enable
     for_window [class="Pavucontrol"] floating enable
     for_window [class="Yad" title="Authentication"] floating enable
     for_window [class="jetbrains*" title="Welcome*"] floating enable
@@ -468,6 +467,9 @@ in {
     config =
       commonConfig {wayland = true;}
       // {
+        input."type:keyboard" = {
+          xkb_options = "ctrl:nocaps";
+        };
         output = {"*" = {scale = "2";};};
         startup = [
           {
diff --git a/machines/common/linux/xsession.nix b/machines/common/linux/xsession.nix
index 6675718..569931e 100644
--- a/machines/common/linux/xsession.nix
+++ b/machines/common/linux/xsession.nix
@@ -32,6 +32,33 @@
     tumbler.enable = true;
 
     gnome.gnome-keyring.enable = true;
+
+    kanata = {
+      enable = true;
+      package = pkgs.master.kanata;
+      keyboards.keychron-k6 = {
+        devices = ["/dev/input/by-id/usb-Keychron_Keychron_K6-event-kbd"];
+        config = ''
+          (defsrc
+            esc   1    2    3    4    5    6    7    8    9    0    -    =    bspc
+            tab   q    w    e    r    t    y    u    i    o    p    [    ]    \
+            caps  a    s    d    f    g    h    j    k    l    ;    '    ret
+            lsft  z    x    c    v    b    n    m    ,    .    /    rsft
+            lctl  lmet lalt           spc            ralt rmet rctl)
+          (deflayer qwerty
+            @sesc 1    2    3    4    5    6    7    8    9    0    -    =    bspc
+            tab   q    w    e    r    t    y    u    i    o    p    [    ]    \
+            caps  a    s    d    f    g    h    j    k    l    ;    '    ret
+            lsft  z    x    c    v    b    n    m    ,    .    /    rsft
+            lctl  lmet lalt           spc            ralt rmet rctl)
+
+          (defalias
+            sesc (fork esc grv (lsft rsft))
+          )
+        '';
+      };
+    };
+
     xserver = {
       enable = true;
       desktopManager.xterm.enable = false;