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

---
 flake.lock                     | 53 ++++++++++++++++++++--------------
 flake.nix                      | 13 +++++++--
 system/eddie/configuration.nix |  2 +-
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index dbc64c0..c7982b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,9 @@
     "affinity-nix": {
       "inputs": {
         "elemental-wine-source": "elemental-wine-source",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "winetricks-source": "winetricks-source"
       },
       "locked": {
@@ -61,6 +63,30 @@
         "type": "github"
       }
     },
+    "kmonad": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "nix",
+        "lastModified": 1726080562,
+        "narHash": "sha256-76VNPE4hXQqPKgEXHTueDsOSRpcRx+uFg6OTkolCboQ=",
+        "ref": "refs/heads/master",
+        "rev": "4e17fc4432dad3664d39274e4e698c7a5497216d",
+        "revCount": 853,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/kmonad/kmonad?dir=nix"
+      },
+      "original": {
+        "dir": "nix",
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/kmonad/kmonad?dir=nix"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1721549352,
@@ -94,11 +120,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717786204,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "lastModified": 1727122398,
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
         "type": "github"
       },
       "original": {
@@ -124,29 +150,14 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "affinity-nix": "affinity-nix",
         "home-manager": "home-manager",
+        "kmonad": "kmonad",
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable"
       }
     },
diff --git a/flake.nix b/flake.nix
index 673dbaa..b263749 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,15 +13,24 @@
 
     nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref=<tag> to pin releases.
 
-    affinity-nix.url = "github:mrshmllow/affinity-nix/main";
+    affinity-nix = {
+      url = "github:mrshmllow/affinity-nix/main";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    kmonad = {
+      url = "git+https://github.com/kmonad/kmonad?submodules=1&dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs@{self, nixpkgs, home-manager, nix-flatpak, ... }: {
+  outputs = inputs@{self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, affinity-nix, kmonad, ... }: {
     nixosConfigurations = {
       eddie = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [ 
           nix-flatpak.nixosModules.nix-flatpak
+          kmonad.nixosModules.default
 	  ./system/eddie/configuration.nix 
         ];
       };
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index 549da76..5104d0d 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -202,7 +202,7 @@
     enable = true;
     keyboards = {
       myKMonadOutput = {
-        config = /home/emenel/.config/kmonad/main.kbd;
+        config = builtins.readFile /home/emenel/.config/kmonad/main.kbd;
       };
     };
   };