From 7ac9ae504d144fcf9f7d52a45d40ededdc96735b Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Thu, 11 May 2023 14:14:41 +0300
Subject: [PATCH] add keychron keyboard

---
 hosts/tkaronto/modules/keychron-v4.nix    | 1 +
 hosts/wolumonde/modules/musikspider.nix   | 2 +-
 locale/default.nix                        | 4 ++--
 modules/base/default.nix                  | 1 -
 modules/keyboards/keychron-v4/default.nix | 3 +++
 users/modules/sway/default.nix            | 5 ++++-
 6 files changed, 11 insertions(+), 5 deletions(-)
 create mode 120000 hosts/tkaronto/modules/keychron-v4.nix
 create mode 100644 modules/keyboards/keychron-v4/default.nix

diff --git a/hosts/tkaronto/modules/keychron-v4.nix b/hosts/tkaronto/modules/keychron-v4.nix
new file mode 120000
index 0000000..600bff5
--- /dev/null
+++ b/hosts/tkaronto/modules/keychron-v4.nix
@@ -0,0 +1 @@
+../../../modules/keyboards/keychron-v4/default.nix
\ No newline at end of file
diff --git a/hosts/wolumonde/modules/musikspider.nix b/hosts/wolumonde/modules/musikspider.nix
index 88d9b10..33c9d7d 100644
--- a/hosts/wolumonde/modules/musikspider.nix
+++ b/hosts/wolumonde/modules/musikspider.nix
@@ -17,7 +17,7 @@ in {
   };
   users.groups.musikspider = {};
 
-  systemd.services.musikspider= {
+  systemd.services.musikspider = {
     description = "musikspider";
     wantedBy = ["multi-user.target"];
     after = ["network.target"];
diff --git a/locale/default.nix b/locale/default.nix
index 4ea90f0..e1c3859 100644
--- a/locale/default.nix
+++ b/locale/default.nix
@@ -4,6 +4,6 @@
     supportedLocales = ["en_US.UTF-8/UTF-8" "tr_TR.UTF-8/UTF-8"];
   };
   time.timeZone = "Turkey";
-  services.xserver.layout = "tr";
-  console.keyMap = "trq";
+  services.xserver.layout = "us";
+  console.keyMap = "us";
 }
diff --git a/modules/base/default.nix b/modules/base/default.nix
index 95678a4..23579aa 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -17,7 +17,6 @@ in {
     ./hm-system-defaults.nix
   ];
 
-  console.font = "7x14";
   environment = {
     systemPackages = with pkgs; [
       binutils
diff --git a/modules/keyboards/keychron-v4/default.nix b/modules/keyboards/keychron-v4/default.nix
new file mode 100644
index 0000000..ad75324
--- /dev/null
+++ b/modules/keyboards/keychron-v4/default.nix
@@ -0,0 +1,3 @@
+{
+  hardware.keyboard.qmk.enable = true;
+}
diff --git a/users/modules/sway/default.nix b/users/modules/sway/default.nix
index 40f1f0c..611a66f 100644
--- a/users/modules/sway/default.nix
+++ b/users/modules/sway/default.nix
@@ -82,9 +82,12 @@
             "XF86MonBrightnessDown" = "exec ${light} -T 0.72";
           };
         input = {
-          "type:keyboard" = {
+          "13364:832:Keychron_Keychron_V4_Keyboard" = {
             xkb_layout = nixosConfig.services.xserver.layout;
           };
+          "1:1:AT_Translated_Set_2_keyboard" = {
+            xkb_layout = "tr";
+          };
           "type:pointer" = {
             accel_profile = "flat";
           };