From 5de1dee9b3f0ec0b4e622228733d93a02741cdcf Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 21 Jul 2024 16:32:59 +0200
Subject: [PATCH 1/2] added qmk

---
 users/willifan/desktop/default.nix          |  1 +
 users/willifan/desktop/keyboard/default.nix | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 users/willifan/desktop/keyboard/default.nix

diff --git a/users/willifan/desktop/default.nix b/users/willifan/desktop/default.nix
index 6363490..348dfb4 100644
--- a/users/willifan/desktop/default.nix
+++ b/users/willifan/desktop/default.nix
@@ -6,6 +6,7 @@
     ./dev
     ./games
     ./hyprland
+    ./keyboard
     ./theme
     ./web
 
diff --git a/users/willifan/desktop/keyboard/default.nix b/users/willifan/desktop/keyboard/default.nix
new file mode 100644
index 0000000..5975e13
--- /dev/null
+++ b/users/willifan/desktop/keyboard/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    qmk-udev-rules
+    vial
+  ];
+
+  hardware.keyboard.qmk.enable = true;
+  services.udev.extraRules = ''
+    KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
+  '';
+
+}
\ No newline at end of file

From ffe11e0b02674ccedfac142a3e8d1af0f2340163 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Thu, 25 Jul 2024 14:27:56 +0200
Subject: [PATCH 2/2] Changed keyboard layout

---
 flake.nix                                           | 4 +++-
 users/willifan/desktop/hyprland/common/hyprland.nix | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7352795..9e92e4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,6 @@
             }
           attrs.disko.nixosModules.disko
           stylix.nixosModules.stylix
-#          nixvim.homeManagerModules.nixvim
           nixvim.nixosModules.nixvim
           attrs.nixos-hardware.nixosModules.framework-12th-gen-intel
           ./hosts
@@ -95,6 +94,7 @@
             }
           attrs.disko.nixosModules.disko
           stylix.nixosModules.stylix
+          nixvim.nixosModules.nixvim
           attrs.nixos-hardware.nixosModules.common-cpu-amd
           attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
           attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
@@ -125,6 +125,8 @@
               home-manager.useUserPackages = true;
             }
           attrs.disko.nixosModules.disko
+          stylix.nixosModules.stylix
+          nixvim.nixosModules.nixvim
           attrs.nixos-hardware.nixosModules.common-cpu-amd
           attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
           attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
diff --git a/users/willifan/desktop/hyprland/common/hyprland.nix b/users/willifan/desktop/hyprland/common/hyprland.nix
index 52c2ee5..1fa4b15 100644
--- a/users/willifan/desktop/hyprland/common/hyprland.nix
+++ b/users/willifan/desktop/hyprland/common/hyprland.nix
@@ -38,7 +38,7 @@
         xwayland.force_zero_scaling = true;
 
         input = {
-            kb_layout = "de";
+            kb_layout = "us";
             kb_variant = "";
             kb_model = "";
             kb_options = "";