From 3e2c6ed346bf3b8acb7db2cbfe865dc645865ee5 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Sun, 19 Feb 2023 05:03:01 +0100
Subject: [PATCH] feat(wm): include skhdrc in nix file

---
 home/apps/skhd/skhdrc       | 48 ---------------------------------
 machines/sashimi/darwin.nix | 54 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 49 deletions(-)
 delete mode 100644 home/apps/skhd/skhdrc

diff --git a/home/apps/skhd/skhdrc b/home/apps/skhd/skhdrc
deleted file mode 100644
index 5c81a69..0000000
--- a/home/apps/skhd/skhdrc
+++ /dev/null
@@ -1,48 +0,0 @@
-# WORKS WITH SIP ENABLED:
-# focus window
-cmd + ctrl - h : yabai -m window --focus west
-cmd + ctrl - j : yabai -m window --focus south
-cmd + ctrl - k : yabai -m window --focus north
-cmd + ctrl - l : yabai -m window --focus east
-# move window
-cmd + shift - h : yabai -m window --warp west
-cmd + shift - j : yabai -m window --warp south
-cmd + shift - k : yabai -m window --warp north
-cmd + shift - l : yabai -m window --warp east
-# toggle sticky/floating
-cmd + shift - s: yabai -m window --toggle sticky --toggle float --toggle topmost
-cmd + shift - d: yabai -m window --toggle float
-# rotate
-cmd + ctrl - e : yabai -m space --balance
-cmd + ctrl - r : yabai -m space --rotate 270
-# open terminal
-cmd + shift - return : open -na "WezTerm"
-# restart yabai
-cmd + alt - r : launchctl kickstart -k "gui/${UID}/homebrew.mxcl.yabai"
-
-# ONLY WORKS WITH SIP DISABLED:
-# fast focus space left/right
-ctrl - left  : yabai -m space --focus prev
-ctrl - right : yabai -m space --focus next
-# switch to space
-cmd + ctrl - 1 : yabai -m space --focus 1
-cmd + ctrl - 2 : yabai -m space --focus 2
-cmd + ctrl - 3 : yabai -m space --focus 3
-cmd + ctrl - 4 : yabai -m space --focus 4
-cmd + ctrl - 5 : yabai -m space --focus 5
-cmd + ctrl - 6 : yabai -m space --focus 6
-cmd + ctrl - 7 : yabai -m space --focus 7
-cmd + ctrl - 8 : yabai -m space --focus 8
-cmd + ctrl - 9 : yabai -m space --focus 9
-cmd + ctrl - 0 : yabai -m space --focus 10
-# send window to desktop and follow focus
-cmd + shift - 1 : yabai -m window --space 1; yabai -m space --focus 1
-cmd + shift - 2 : yabai -m window --space 2; yabai -m space --focus 2
-cmd + shift - 3 : yabai -m window --space 3; yabai -m space --focus 3
-cmd + shift - 4 : yabai -m window --space 4; yabai -m space --focus 4
-cmd + shift - 5 : yabai -m window --space 5; yabai -m space --focus 5
-cmd + shift - 6 : yabai -m window --space 6; yabai -m space --focus 6
-cmd + shift - 7 : yabai -m window --space 7; yabai -m space --focus 7
-cmd + shift - 8 : yabai -m window --space 8; yabai -m space --focus 8
-cmd + shift - 9 : yabai -m window --space 9; yabai -m space --focus 9
-cmd + shift - 0 : yabai -m window --space 10; yabai -m space --focus 10
diff --git a/machines/sashimi/darwin.nix b/machines/sashimi/darwin.nix
index ef052bb..222425e 100644
--- a/machines/sashimi/darwin.nix
+++ b/machines/sashimi/darwin.nix
@@ -1,5 +1,6 @@
 {
   config,
+  lib,
   pkgs,
   ...
 }: {
@@ -82,7 +83,58 @@
     };
     skhd = {
       enable = true;
-      skhdConfig = builtins.readFile ../../modules/skhd/skhdrc;
+      skhdConfig = let
+        yabai = lib.getExe config.services.yabai.package;
+      in ''
+        # WORKS WITH SIP ENABLED:
+        # focus window
+        cmd + ctrl - h : ${yabai} -m window --focus west
+        cmd + ctrl - j : ${yabai} -m window --focus south
+        cmd + ctrl - k : ${yabai} -m window --focus north
+        cmd + ctrl - l : ${yabai} -m window --focus east
+        # move window
+        cmd + shift - h : ${yabai} -m window --warp west
+        cmd + shift - j : ${yabai} -m window --warp south
+        cmd + shift - k : ${yabai} -m window --warp north
+        cmd + shift - l : ${yabai} -m window --warp east
+        # toggle sticky/floating
+        cmd + shift - s: ${yabai} -m window --toggle sticky --toggle float --toggle topmost
+        cmd + shift - d: ${yabai} -m window --toggle float
+        # rotate
+        cmd + ctrl - e : ${yabai} -m space --balance
+        cmd + ctrl - r : ${yabai} -m space --rotate 270
+        # open terminal
+        cmd + shift - return : open -na "WezTerm"
+        # restart yabai
+        cmd + alt - r : launchctl kickstart -k "gui/''${UID}/org.nixos.yabai"
+
+        # ONLY WORKS WITH SIP DISABLED:
+        # fast focus space left/right
+        ctrl - left  : ${yabai} -m space --focus prev
+        ctrl - right : ${yabai} -m space --focus next
+        # switch to space
+        cmd + ctrl - 1 : ${yabai} -m space --focus 1
+        cmd + ctrl - 2 : ${yabai} -m space --focus 2
+        cmd + ctrl - 3 : ${yabai} -m space --focus 3
+        cmd + ctrl - 4 : ${yabai} -m space --focus 4
+        cmd + ctrl - 5 : ${yabai} -m space --focus 5
+        cmd + ctrl - 6 : ${yabai} -m space --focus 6
+        cmd + ctrl - 7 : ${yabai} -m space --focus 7
+        cmd + ctrl - 8 : ${yabai} -m space --focus 8
+        cmd + ctrl - 9 : ${yabai} -m space --focus 9
+        cmd + ctrl - 0 : ${yabai} -m space --focus 10
+        # send window to desktop and follow focus
+        cmd + shift - 1 : ${yabai} -m window --space 1; ${yabai} -m space --focus 1
+        cmd + shift - 2 : ${yabai} -m window --space 2; ${yabai} -m space --focus 2
+        cmd + shift - 3 : ${yabai} -m window --space 3; ${yabai} -m space --focus 3
+        cmd + shift - 4 : ${yabai} -m window --space 4; ${yabai} -m space --focus 4
+        cmd + shift - 5 : ${yabai} -m window --space 5; ${yabai} -m space --focus 5
+        cmd + shift - 6 : ${yabai} -m window --space 6; ${yabai} -m space --focus 6
+        cmd + shift - 7 : ${yabai} -m window --space 7; ${yabai} -m space --focus 7
+        cmd + shift - 8 : ${yabai} -m window --space 8; ${yabai} -m space --focus 8
+        cmd + shift - 9 : ${yabai} -m window --space 9; ${yabai} -m space --focus 9
+        cmd + shift - 0 : ${yabai} -m window --space 10; ${yabai} -m space --focus 10
+      '';
     };
     yabai = {
       enable = true;