From 2552eefc614e7eb1b0eac0c3114a5e2912af49e4 Mon Sep 17 00:00:00 2001
From: Jimbo <jimjam4real@gmail.com>
Date: Tue, 27 Aug 2024 13:30:48 -0400
Subject: [PATCH] Move Mac keys into its own Nix file

---
 home-manager/style/qt.nix           | 7 ++++---
 home-manager/sway/rules.nix         | 2 +-
 nixos/hardware/machines/desktop.nix | 5 -----
 nixos/hardware/mackeys.nix          | 6 ++++++
 4 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 nixos/hardware/mackeys.nix

diff --git a/home-manager/style/qt.nix b/home-manager/style/qt.nix
index 1368714..266b07d 100644
--- a/home-manager/style/qt.nix
+++ b/home-manager/style/qt.nix
@@ -1,8 +1,9 @@
-{pkgs, ...}: {
-  # Theme QT apps
+{
   qt = {
     enable = true;
-    style.name = "gtk2";
+    style = {
+      name = "gtk2";
+    };
     platformTheme.name = "gtk2";
   };
 }
diff --git a/home-manager/sway/rules.nix b/home-manager/sway/rules.nix
index 7aaa375..fa957f6 100644
--- a/home-manager/sway/rules.nix
+++ b/home-manager/sway/rules.nix
@@ -102,7 +102,7 @@
         "${ws.w9}" = [{app_id = "thunderbird";}];
 
         # Else
-        "${ws.w2}" = [{class = "SDL Application";} {class = "heroic";}];
+        "${ws.w2}" = [{class = "SDL Application";} {app_id = "heroic";}];
         "${ws.w2a}" = [{app_id = "looking-glass-client";}];
         "${ws.w4a}" = [{app_id = "com.obsproject.Studio";}];
       };
diff --git a/nixos/hardware/machines/desktop.nix b/nixos/hardware/machines/desktop.nix
index 667bdda..547d024 100644
--- a/nixos/hardware/machines/desktop.nix
+++ b/nixos/hardware/machines/desktop.nix
@@ -55,11 +55,6 @@ in {
       ntfs = true;
       zfs = lib.mkForce false;
     };
-
-    # Modprobe settings
-    extraModprobeConfig = ''
-      options hid_apple fnmode=2
-    '';
   };
 
   # Additional entry to boot from the second GPU
diff --git a/nixos/hardware/mackeys.nix b/nixos/hardware/mackeys.nix
new file mode 100644
index 0000000..5917183
--- /dev/null
+++ b/nixos/hardware/mackeys.nix
@@ -0,0 +1,6 @@
+{
+  # Forces the function keys to work right on Macbooks
+  boot.extraModprobeConfig = ''
+    options hid_apple fnmode=2
+  '';
+}