From 8c15ff89594564b641396dacf9ff536c4c295ee5 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 10 Nov 2023 07:18:13 +0000
Subject: [PATCH] Add kmonad service (needs configuring)

---
 flake.lock          | 23 +++++++++++++++++++++++
 flake.nix           | 17 ++++++++++-------
 home/emacs/init.org |  2 +-
 system/desktop.nix  |  2 ++
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5474956a..67670f89 100644
--- a/flake.lock
+++ b/flake.lock
@@ -203,6 +203,28 @@
         "type": "github"
       }
     },
+    "kmonad": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "nix",
+        "lastModified": 1698213131,
+        "narHash": "sha256-RPfi08g5DHvq5oEX57sJ1al2smBk0d9d8gAzL7jRnNQ=",
+        "owner": "kmonad",
+        "repo": "kmonad",
+        "rev": "1b2ec006259ddbe6cda30db8eb783e8177a9f12b",
+        "type": "github"
+      },
+      "original": {
+        "dir": "nix",
+        "owner": "kmonad",
+        "repo": "kmonad",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -242,6 +264,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "kmonad": "kmonad",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "stylix": "stylix"
diff --git a/flake.nix b/flake.nix
index 77f95047..3b6551f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,10 +15,14 @@
       url = "github:danth/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    kmonad = {
+      url = "github:kmonad/kmonad?dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs =
-    { self, nixpkgs, home-manager, nix-index-database, stylix, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, nix-index-database, stylix, kmonad
+    , ... }@inputs:
     let
       default = {
         hostName = "Atlas";
@@ -56,6 +60,7 @@
             home-manager.nixosModules.home-manager
             nix-index-database.nixosModules.nix-index
             stylix.nixosModules.stylix
+            kmonad.nixosModules.default
             ({ config, lib, pkgs, ... }: {
               boot.loader = {
                 systemd-boot.enable = true;
@@ -167,15 +172,13 @@
                   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/ZSSCN5sqrA+tdoIZr5EUm5DRuBV4dQ7J+QBEtUwUU xenia@Northstar"
                 ];
               in {
-                root = {
-                  shell = pkgs.${shell};
-                  openssh = { inherit authorizedKeys; };
-                };
+                root.openssh = { inherit authorizedKeys; };
                 ${user} = {
                   inherit group;
                   isNormalUser = true;
                   description = "Evie Litherland-Smith";
-                  extraGroups = [ "networkmanager" "wheel" "video" ];
+                  extraGroups =
+                    [ "networkmanager" "wheel" "video" "input" "uinput" ];
                   shell = pkgs.${shell};
                   initialHashedPassword =
                     "$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3";
diff --git a/home/emacs/init.org b/home/emacs/init.org
index 28175b14..c24b3e8a 100644
--- a/home/emacs/init.org
+++ b/home/emacs/init.org
@@ -497,7 +497,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
   (use-package magit
     :ensure t)
 #+end_src
-** [5/7] Completion
+** [5/6] Completion
 *** DONE Vertico
 #+begin_src emacs-lisp
   (setq vertico-cycle t)
diff --git a/system/desktop.nix b/system/desktop.nix
index 6abd83e8..c6314b59 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -33,6 +33,7 @@
     accounts-daemon.enable = true;
     dbus.packages = with pkgs; [ gcr ];
     gnome.gnome-keyring.enable = true;
+    kmonad.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -43,6 +44,7 @@
       enable = true;
       layout = "gb";
       xkbVariant = "";
+      xkbOptions = "compose:ralt";
       displayManager.lightdm = {
         enable = true;
         greeters.gtk = {