diff --git a/nix-darwin/services/nix-daemon.nix b/nix-darwin/services/nix-daemon.nix
index 9c8f2bb..4341137 100644
--- a/nix-darwin/services/nix-daemon.nix
+++ b/nix-darwin/services/nix-daemon.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let 
-  fullScriptPath = "/opt/nix-daemon.sh";
+  fullScriptPath = ".scripts/nix-daemon.sh";
 in
 {
   home.file."Library/LaunchAgents/org.nixos.autostart.plist" = {
diff --git a/nix-darwin/services/skhd.nix b/nix-darwin/services/skhd.nix
index 3f37fe3..8785476 100644
--- a/nix-darwin/services/skhd.nix
+++ b/nix-darwin/services/skhd.nix
@@ -1,34 +1,36 @@
 { config, pkgs, ... }:
 
+let 
+  fullScriptPath = ".scripts/skhd-daemon.sh";
+in
 {
-  # service
-  home.file."Library/LaunchAgents/org.nixos.skhd.plist" = {
+  home.file."Library/LaunchAgents/org.skhdos.autostart.plist" = {
     text = ''
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
       <plist version="1.0">
       <dict>
         <key>Label</key>
-        <string>org.nixos.skhd</string>
+        <string>org.skhdos.autostart</string>
         <key>ProgramArguments</key>
         <array>
-          <string>${pkgs.skhd}/bin/skhd</string>
+          <string>${pkgs.bash}/bin/bash</string>
+          <string>${fullScriptPath}</string>
         </array>
-        <key>EnvironmentVariables</key>
-        <dict>
-          <key>PATH</key>
-          <string>${pkgs.skhd}/bin:${pkgs.bash}/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
-        </dict>
         <key>RunAtLoad</key>
         <true/>
         <key>KeepAlive</key>
-        <true/>
-        <key>StandardOutPath</key>
-        <string>${config.home.homeDirectory}/.skhd.out.log</string>
-        <key>StandardErrorPath</key>
-        <string>${config.home.homeDirectory}/.skhd.err.log</string>
+        <false/>
       </dict>
       </plist>
     '';
   };
+
+  home.file."${fullScriptPath}" = {
+    text = ''
+      skhd --start-service
+    '';
+    executable = true;
+  };
 }
+
diff --git a/nix-darwin/services/yabai.nix b/nix-darwin/services/yabai.nix
index c3722b9..27100b3 100644
--- a/nix-darwin/services/yabai.nix
+++ b/nix-darwin/services/yabai.nix
@@ -1,34 +1,36 @@
 { config, pkgs, ... }:
 
+let 
+  fullScriptPath = ".scripts/yabai-daemon.sh";
+in
 {
-  # service
-  home.file."Library/LaunchAgents/org.nixos.yabai.plist" = {
+  home.file."Library/LaunchAgents/org.yabaios.autostart.plist" = {
     text = ''
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
       <plist version="1.0">
       <dict>
         <key>Label</key>
-        <string>org.nixos.yabai</string>
+        <string>org.yabaios.autostart</string>
         <key>ProgramArguments</key>
         <array>
-          <string>${pkgs.yabai}/bin/yabai</string>
+          <string>${pkgs.bash}/bin/bash</string>
+          <string>${fullScriptPath}</string>
         </array>
-        <key>EnvironmentVariables</key>
-        <dict>
-          <key>PATH</key>
-          <string>${pkgs.yabai}/bin:${pkgs.bash}/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
-        </dict>
         <key>RunAtLoad</key>
         <true/>
         <key>KeepAlive</key>
-        <true/>
-        <key>StandardOutPath</key>
-        <string>${config.home.homeDirectory}/.yabai.out.log</string>
-        <key>StandardErrorPath</key>
-        <string>${config.home.homeDirectory}/.yabai.err.log</string>
+        <false/>
       </dict>
       </plist>
     '';
   };
+
+  home.file."${fullScriptPath}" = {
+    text = ''
+      yabai --start-service
+    '';
+    executable = true;
+  };
 }
+