cringe

nix-darwin/home.nix

@@ -38,11 +38,6 @@
   };
 
   imports = [
-    # Services
-    ./services/nix-daemon.nix  # NOTE: DO NOT REMOVE
-    ./services/yabai.nix
-    ./services/skhd.nix
-
     # Modules
     ./modules/yabai.nix
     ./modules/skhd.nix
@@ -156,6 +151,13 @@
       enable = true;
       theme = "half-life";
       plugins = [ "git" "macos" ];
+      extraConfig = ''
+        # Homebrew
+        export PATH="/usr/local/bin:/opt/homebrew/bin:$PATH"
+
+        # Nix
+        if [ -e /etc/profile.d/nix.sh ]; then . /etc/profile.d/nix.sh; fi
+      '';
     };
   };
 

nix-darwin/modules/skhd.nix

@@ -1,5 +1,8 @@
 { config, pkgs, ... }:
 
+let 
+  termPath = "/Applications/Alacritty.app";
+in
 {
   home.file.".skhdrc" = {
     executable = true;
@@ -7,7 +10,7 @@
       # Mod1 is alt, Mod4 is cmd
 
       # Terminal
-      cmd - return : open -n /Applications/iTerm.app
+      cmd - return : open -n ${termPath}
 
       # dmenu equivalent (you may want to install choose-gui or another launcher)
       cmd - p : open -n /Applications/choose-gui.app

nix-darwin/services/nix-daemon.nix

@@ -1,38 +0,0 @@
-{ config, pkgs, ... }:
-
-let 
-  fullScriptPath = ".scripts/nix-daemon.sh";
-in
-{
-  home.file."Library/LaunchAgents/org.nixos.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.autostart</string>
-        <key>ProgramArguments</key>
-        <array>
-          <string>${pkgs.bash}/bin/bash</string>
-          <string>${fullScriptPath}</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-      </dict>
-      </plist>
-    '';
-  };
-
-  home.file."${fullScriptPath}" = {
-    text = ''
-      if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
-        . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
-      fi
-    '';
-    executable = true;
-  };
-}
-

nix-darwin/services/skhd.nix

@@ -1,36 +0,0 @@
-{ config, pkgs, ... }:
-
-let 
-  fullScriptPath = ".scripts/skhd-daemon.sh";
-in
-{
-  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.skhdos.autostart</string>
-        <key>ProgramArguments</key>
-        <array>
-          <string>${pkgs.bash}/bin/bash</string>
-          <string>${fullScriptPath}</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-      </dict>
-      </plist>
-    '';
-  };
-
-  home.file."${fullScriptPath}" = {
-    text = ''
-      skhd --start-service
-    '';
-    executable = true;
-  };
-}
-

nix-darwin/services/yabai.nix

@@ -1,36 +0,0 @@
-{ config, pkgs, ... }:
-
-let 
-  fullScriptPath = ".scripts/yabai-daemon.sh";
-in
-{
-  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.yabaios.autostart</string>
-        <key>ProgramArguments</key>
-        <array>
-          <string>${pkgs.bash}/bin/bash</string>
-          <string>${fullScriptPath}</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-      </dict>
-      </plist>
-    '';
-  };
-
-  home.file."${fullScriptPath}" = {
-    text = ''
-      yabai --start-service
-    '';
-    executable = true;
-  };
-}
-