From 5c6b79dfaa33b113adf482a6b70bf590a6e79022 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Wed, 20 Sep 2023 10:07:33 +0800
Subject: [PATCH] darwin: yabai, skhd. brew -> nix

---
 flakes/darwin/main.nix                        | 28 +++++++++++++++++++
 flakes/darwin/packages/homebrew.nix           |  3 --
 .../common/dotfiles/config/yabai/yabairc      | 13 ---------
 .../guanranwang/darwin/dotfiles.nix           |  4 ---
 4 files changed, 28 insertions(+), 20 deletions(-)
 delete mode 100755 flakes/home-manager/guanranwang/common/dotfiles/config/yabai/yabairc

diff --git a/flakes/darwin/main.nix b/flakes/darwin/main.nix
index 0337b33..7f118d7 100644
--- a/flakes/darwin/main.nix
+++ b/flakes/darwin/main.nix
@@ -39,6 +39,34 @@
   programs.zsh.enable = true;  # default shell on catalina
   programs.fish.enable = true;
 
+  services = {
+    yabai = {
+      enable = true;
+      enableScriptingAddition = true;
+      config = {
+        layout         = "bsp";
+  
+        mouse_modifier = "fn";
+  
+        # very broken on slow cpu
+        #focus_follows_mouse = "autoraise";
+        #mouse_follows_focus = "on";
+  
+        top_padding    = 10;
+        bottom_padding = 10;
+        left_padding   = 10;
+        right_padding  = 10;
+        window_gap     = 4;
+      };
+    };
+    skhd = {
+      enable = true;
+      skhdConfig = ''
+        cmd - return : open -n ${pkgs.alacritty}/Applications/Alacritty.app
+      '';
+    };
+  };
+
   system.defaults = {
     # Apple... Do I really have to change literally 
     # every setting in macOS to make it actually usable.
diff --git a/flakes/darwin/packages/homebrew.nix b/flakes/darwin/packages/homebrew.nix
index a842b13..3d062cf 100644
--- a/flakes/darwin/packages/homebrew.nix
+++ b/flakes/darwin/packages/homebrew.nix
@@ -5,8 +5,6 @@
     enable = true;
     brews = [
       "fastfetch" # fastfetch is broken in nixpkgs
-
-      "yabai" # b3z/small
     ];
     casks = [
       #"alacritty"
@@ -32,7 +30,6 @@
     ];
     taps = [
       "b3z/small" # activate
-      "koekeishiya/formulae" # yabai
     ];
   };
 }
\ No newline at end of file
diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/yabai/yabairc b/flakes/home-manager/guanranwang/common/dotfiles/config/yabai/yabairc
deleted file mode 100755
index 26242d1..0000000
--- a/flakes/home-manager/guanranwang/common/dotfiles/config/yabai/yabairc
+++ /dev/null
@@ -1,13 +0,0 @@
-yabai -m config layout bsp
-
-yabai -m config mouse_modifier fn
-
-# very broken on slow cpu
-#yabai -m config focus_follows_mouse autoraise
-#yabai -m config mouse_follows_focus on
-
-yabai -m config top_padding    10
-yabai -m config bottom_padding 10
-yabai -m config left_padding   10
-yabai -m config right_padding  10
-yabai -m config window_gap     4
diff --git a/flakes/home-manager/guanranwang/darwin/dotfiles.nix b/flakes/home-manager/guanranwang/darwin/dotfiles.nix
index 1f60130..b97d206 100644
--- a/flakes/home-manager/guanranwang/darwin/dotfiles.nix
+++ b/flakes/home-manager/guanranwang/darwin/dotfiles.nix
@@ -15,10 +15,6 @@ in
       source = "${configPath}/alacritty";
       recursive = true;
     };
-    "yabai" = {
-      source = "${configPath}/yabai";
-      recursive = true;
-    };
     "fish" = {
       source = "${configPath}/fish"; 
       recursive = true;