big work done

1 files changed, 45 insertions, 3 deletions

diff --git a/modules/hosts/tiamat/tiamat.nix b/modules/hosts/tiamat/tiamat.nix
index 3ff764b..317df61 100644
--- a/modules/hosts/tiamat/tiamat.nix
+++ b/modules/hosts/tiamat/tiamat.nix
@@ -1,19 +1,61 @@
 { inputs, self, ... }:
 
 {
+  imports = [
+    inputs.home-manager.flakeModules.home-manager
+  ];
+
   flake.nixosConfigurations.tiamat = inputs.nixpkgs.lib.nixosSystem {
     modules = [
       self.nixosModules.tiamat
       self.nixosModules.tiamatHardware
 
       self.nixosModules.createHost
+      self.nixosModules.hostOptions
+      inputs.nixos-hardware.nixosModules.framework-13-7040-amd
+
+      self.nixosModules.tiamatNiri
+      self.nixosModules.desktop
     ];
   };
 
   flake.nixosModules.tiamat = { pkgs, ... }: {
-    jcklib.createHost = {
-      hostName = "tiamat";
-      userName = "jck";
+    hostOptions = {
+      host.name = "tiamat";
+      user.name = "jck";
+      user.email = "jckrinsky@gmail.com";
+    };
+
+    hardware.graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+
+    networking.nameservers = [ "1.1.1.1" "9.9.9.9" ];
+
+    services.automatic-timezoned.enable = true;
+
+    services.kanata = {
+      enable = true;
+      keyboards.tkb = {
+        devices = [
+          "dev/input/by-path/platform-i8042-serio-0-event-kbd"
+        ];
+        config = "
+          (defsrc h j k l caps)
+
+          (deflayer default _ _ _ _  @press)
+          (deflayer arrows left down up right @press)
+
+          (defalias press
+            (tap-hold-press 200 200 esc (layer-while-held arrows))
+          )
+        ";
+
+        extraDefCfg = "
+          process-unmapped-keys yes
+        ";
+      };
     };
   };
 }