From f6a2345ddc4959425d319486b23ee4c4338ceb6e Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Wed, 15 Nov 2023 23:35:18 -0800
Subject: [PATCH] Automates reloading of skhdrc on change

---
 nixos/modules/yabai/scripting-additions.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/yabai/scripting-additions.nix b/nixos/modules/yabai/scripting-additions.nix
index 3dd4655..05678fa 100644
--- a/nixos/modules/yabai/scripting-additions.nix
+++ b/nixos/modules/yabai/scripting-additions.nix
@@ -21,6 +21,14 @@
   environment.systemPackages = [pkgs.skhd];
   services.skhd.enable = true;
 
+  system.activationScripts.postUserActivation = {
+    enable = true;
+    text = ''
+      echo Reloading skhd config
+      ${config.services.skhd.package}/bin/skhd --reload
+    '';
+  };
+
   services.skhd.skhdConfig = let
     yabai = "${pkgs.yabai}/bin/yabai";
     # Don't use nix emacs. Homebrew has a better version
@@ -98,8 +106,8 @@
     ${ctrl} - 0 : ${yabai} -m space --focus 10
 
     # Make window native fullscreen
-    ${ctrl} - f         : ${yabai} -m window --toggle zoom-fullscreen
-    shift + ${ctrl} - f : ${yabai} -m window --toggle native-fullscreen
+    #${ctrl} - f        : ${yabai} -m window --toggle zoom-fullscreen
+    shift + ${ctrl} - f : ${yabai} -m window --toggle zoom-fullscreen
 
     # Float / Unfloat window
     ${ctrl} + shift - space : \
@@ -107,7 +115,7 @@
         ${yabai} -m window --toggle border
 
     # Open Emacs
-    ${ctrl} + shift - n : ${config.home-manager.users.willem.programs.emacs.finalPackage}/bin/emacsclient -c -n
+    ${ctrl} + shift - n : ${kitty} --single-instance ${config.home-manager.users.willem.programs.emacs.finalPackage}/bin/emacsclient -nw -c
     # Open Firefox window
     ${ctrl} + shift - f : /Applications/Firefox.app/Contents/MacOS/firefox -new-window
   '';