diff --git a/flake.nix b/flake.nix
index 9e92e4d..7352795 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,6 +65,7 @@
             }
           attrs.disko.nixosModules.disko
           stylix.nixosModules.stylix
+#          nixvim.homeManagerModules.nixvim
           nixvim.nixosModules.nixvim
           attrs.nixos-hardware.nixosModules.framework-12th-gen-intel
           ./hosts
@@ -94,7 +95,6 @@
             }
           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,8 +125,6 @@
               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/default.nix b/users/willifan/desktop/default.nix
index 348dfb4..6363490 100644
--- a/users/willifan/desktop/default.nix
+++ b/users/willifan/desktop/default.nix
@@ -6,7 +6,6 @@
     ./dev
     ./games
     ./hyprland
-    ./keyboard
     ./theme
     ./web
 
diff --git a/users/willifan/desktop/hyprland/common/hyprland.nix b/users/willifan/desktop/hyprland/common/hyprland.nix
index 1fa4b15..52c2ee5 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 = "us";
+            kb_layout = "de";
             kb_variant = "";
             kb_model = "";
             kb_options = "";
diff --git a/users/willifan/desktop/keyboard/default.nix b/users/willifan/desktop/keyboard/default.nix
deleted file mode 100644
index 5975e13..0000000
--- a/users/willifan/desktop/keyboard/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ 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