From 4f5c4e3225f84712093e5ed74ba06010edbf64ab Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Fri, 27 Sep 2024 11:24:24 -0400
Subject: [PATCH] configuring

---
 dotfiles/dot_config/kmonad/main.kbd | 19 +++++++++++++++++++
 home/home.nix                       |  2 +-
 system/eddie/configuration.nix      | 22 +++++++++++++++-------
 3 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 dotfiles/dot_config/kmonad/main.kbd

diff --git a/dotfiles/dot_config/kmonad/main.kbd b/dotfiles/dot_config/kmonad/main.kbd
new file mode 100644
index 0000000..1919811
--- /dev/null
+++ b/dotfiles/dot_config/kmonad/main.kbd
@@ -0,0 +1,19 @@
+(defcfg
+  fallthrough true
+)
+
+(defsrc
+  grv  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
+)
+
+(deflayer qwerty
+  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
+  lctrl a    s    d    f    g    h    j    k    l    ;    '    ret
+  lsft z    x    c    v    b    n    m    ,    .    /    rsft
+  lctl lalt lmet           spc            rmet ralt
+)
diff --git a/home/home.nix b/home/home.nix
index f74266b..1c212c3 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -123,7 +123,7 @@
     "com.github.johnfactotum.QuickLookup"
   ];
 
-  xdg.configFile."kanata".source = ../dotfiles/dot_config/kanata;
+  xdg.configFile."kmonad".source = ../dotfiles/dot_config/kmonad;
 
   xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml;
   xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm;
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index 8846b1b..9295788 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -154,7 +154,7 @@
   users.users.emenel = {
     isNormalUser = true;
     description = "emenel";
-    extraGroups = [ "networkmanager" "wheel" "uinput" "audio" "video" ];
+    extraGroups = [ "networkmanager" "wheel" "uinput" "input" "audio" "video" ];
     openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFvtBCUQEi7r6mXdaULEaMMvGH1IWZBX9tXpjbIECar2 matt@emenel.ca" ];
     packages = with pkgs; [
       git
@@ -186,15 +186,23 @@
     git
     tailscale
     rsync
-    kanata
+    #kanata
+    kmonad
   ];
 
-  systemd.services.kanata = {
+  #systemd.services.kanata = {
+  #  enable = true;
+  #  wantedBy = [ "default.target" ];
+  #  description = "kanata";
+  #  serviceConfig = {
+  #    ExecStart = "/home/emenel/.nix-profile/bin/kanata --cfg /home/emenel/.config/kanata/main.kbd";
+  #  };
+  #};
+
+  services.kmonad = {
     enable = true;
-    wantedBy = [ "default.target" ];
-    description = "kanata";
-    serviceConfig = {
-      ExecStart = "/home/emenel/.nix-profile/bin/kanata --cfg /home/emenel/.config/kanata/main.kbd";
+    keyboards = {
+      config = builtins.readFile /home/emenel/.config/kmonad/main.kbd;
     };
   };