From 823b45d557f8f0ba021830baaa840876652576a3 Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Thu, 3 Jul 2025 16:37:23 +0100
Subject: [PATCH 1/2] framework: add keychron udev, add jujutsu

---
 hardware/zenix.nix    | 2 --
 home/programs/git.nix | 4 ++++
 nixos/workstation.nix | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hardware/zenix.nix b/hardware/zenix.nix
index 715f396..dbe2913 100644
--- a/hardware/zenix.nix
+++ b/hardware/zenix.nix
@@ -74,8 +74,6 @@ in {
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  hardware.keyboard.zsa.enable = true;
-
   networking.hostName = "zenix";
 
   services.openssh.enable = true;
diff --git a/home/programs/git.nix b/home/programs/git.nix
index 1e9f122..cc2b2ab 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -52,4 +52,8 @@
   programs.lazygit = {
     enable = true;
   };
+
+  programs.jujutsu = {
+    enable = true;
+  };
 }
diff --git a/nixos/workstation.nix b/nixos/workstation.nix
index 334e4de..a6e56c4 100644
--- a/nixos/workstation.nix
+++ b/nixos/workstation.nix
@@ -75,4 +75,10 @@
     enable = true;
     indicator = true;
   };
+
+  hardware.keyboard.zsa.enable = true;
+  # enable keychron keyboard configuration
+  services.udev.extraRules = ''
+    KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="3434", ATTRS{idProduct}=="0e60", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
+  '';
 }

From f6c272f35e011ac6f565329bdeb7dc10fd2013c3 Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Tue, 8 Jul 2025 15:51:01 +0100
Subject: [PATCH 2/2] framework: gruvbox again, fix mouse accel

---
 home/desktop/cosmic/default.nix | 21 ++++++++++-----------
 nixos/workstation.nix           |  1 +
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix
index 7232003..b21fd75 100644
--- a/home/desktop/cosmic/default.nix
+++ b/home/desktop/cosmic/default.nix
@@ -6,12 +6,13 @@
   ...
 }: let
   inherit (config.lib.cosmic) mkRON;
-  mkAction = variant: action: mkRON "enum" {
-    inherit variant;
-    value = [
-      (mkRON "enum" action)
-    ];
-  };
+  mkAction = variant: action:
+    mkRON "enum" {
+      inherit variant;
+      value = [
+        (mkRON "enum" action)
+      ];
+    };
 in {
   imports = [inputs.cosmic-manager.homeManagerModules.cosmic-manager];
   wayland.desktopManager.cosmic = {
@@ -34,8 +35,8 @@ in {
     compositor = {
       autotile = true;
       focus_follows_cursor = true;
-      input_default = mkRON "optional" {
-        profile = (mkRON "optional" (mkRON "enum" "Flat"));
+      input_default.acceleration = mkRON "optional" {
+        profile = mkRON "optional" (mkRON "enum" "Flat");
         speed = 0.0;
       };
     };
@@ -49,7 +50,7 @@ in {
         sampling_method = mkRON "enum" "Alphanumeric";
         scaling_mode = mkRON "enum" "Zoom";
         source = mkRON "enum" {
-          value = [ (toString config.stylix.image) ];
+          value = [(toString config.stylix.image)];
           variant = "Path";
         };
       }
@@ -89,7 +90,5 @@ in {
         size = mkRON "enum" "XS";
       }
     ];
-
   };
-
 }
diff --git a/nixos/workstation.nix b/nixos/workstation.nix
index a6e56c4..6620850 100644
--- a/nixos/workstation.nix
+++ b/nixos/workstation.nix
@@ -34,6 +34,7 @@
   stylix = {
     enable = true;
     image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
     polarity = "dark";
     opacity = {
       terminal = 0.9;