darwin(services): replace skhd, yabai and jankyborders with nix pkg

Signed-off-by: Flokkq <[email protected]>
Flokkq · Jan 12, 2025 · 6511d83 · 6511d83
1 parent 408c655
commit 6511d83
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/darwin/default.nix b/home/darwin/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./dev
     ./apps
-    ./wm
     ./jankyborders
     ./sketchybar
     ./svim

diff --git a/home/darwin/wm/default.nix b/home/darwin/wm/default.nix
diff --git a/modules/darwin/brew.nix b/modules/darwin/brew.nix
@@ -26,10 +26,6 @@ _: {
       "nowplaying-cli"
       "wireguard-tools"
 
-      "koekeishiya/formulae/yabai"
-      "koekeishiya/formulae/skhd"
-
-      "FelixKratz/formulae/borders"
       "FelixKratz/formulae/svim"
     ];
 

diff --git a/nixos/darwin/system/activation.nix b/nixos/darwin/system/activation.nix
@@ -9,9 +9,7 @@
     # activateSettings -u will reload the settings from the database and apply them to the current session,
     # so we do not need to logout and login again to make the changes take effect.
     /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
-    /opt/homebrew/bin/yabai --restart-service
-    /opt/homebrew/bin/skhd --restart-service
-    /usr/local/bin/desktoppr "${meta.wallpaper}"
+    /usr/local/bin/desktoppr all "${meta.wallpaper}"
   '';
 
   system.activationScripts.applications.text = let

diff --git a/nixos/darwin/system/services.nix b/nixos/darwin/system/services.nix
@@ -7,4 +7,22 @@
     enable = true;
     package = pkgs.sketchybar;
   };
+
+  services.jankyborders = {
+    enable = true;
+    package = pkgs.jankyborders;
+  };
+
+  services.yabai = {
+    enable = true;
+    enableScriptingAddition = true;
+    package = pkgs.yabai;
+    config.extraConfig = builtins.readFile ../../../home/darwin/wm/yabairc;
+  };
+
+  services.skhd = {
+    enable = true;
+    package = pkgs.skhd;
+    skhdConfig = builtins.readFile ../../../home/darwin/wm/yabairc;
+  };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
       imports = [
         ./dev
         ./apps
-        ./wm
         ./jankyborders
         ./sketchybar
         ./svim
@@ Expand Down @@