Cleaned up darwin from noise; Moved overlays too a shared module

darwin/default.nix

@@ -10,11 +10,6 @@
     ./yabai.nix
   ];
 
-  home-manager.users.${primaryUser}.targets.darwin = {
-    linkApps.enable = true;
-    copyApps.enable = false;
-  };
-
   # nix config
   nix = {
     settings = {
@@ -55,9 +50,6 @@
     info.enable = false; # Skip info pages
   };
 
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
   # homebrew installation manager
   nix-homebrew = {
     user = primaryUser;

darwin/settings.nix

@@ -1,27 +1,27 @@
-{ self, ... }:
+{ self, primaryUser, ... }:
+let
+  hmApps = app: "/Users/${primaryUser}/Applications/Home Manager Apps/${app}.app";
+  sysApps = app: "/System/Applications/${app}.app";
+  apps = app: "/Applications/${app}.app";
+in
 {
-  # touch ID for sudo
   security.pam.services.sudo_local.touchIdAuth = true;
 
-  # system defaults and preferences
   system = {
     stateVersion = 6;
     configurationRevision = self.rev or self.dirtyRev or null;
 
     startup.chime = false;
 
-    activationScripts = {
-      setWallpaper.text = ''
-        /usr/bin/osascript <<EOF
-        tell application "System Events"
-          tell every desktop
-            set picture to "/Users/phil/Pictures/Wallpapers/Ghost_in_the_Shell.png"
-          end tell
+    activationScripts.setWallpaper.text = ''
+      /usr/bin/osascript <<EOF
+      tell application "System Events"
+        tell every desktop
+          set picture to "/Users/${primaryUser}/Pictures/Wallpapers/Ghost_in_the_Shell.png"
         end tell
-        EOF
-      '';
-
-    };
+      end tell
+      EOF
+    '';
 
     defaults = {
       ActivityMonitor = {
@@ -37,20 +37,20 @@
         launchanim = true;
         mru-spaces = false;
         orientation = "left";
-        persistent-apps = [
-          { app = "/Users/phil/Applications/Home Manager Apps/kitty.app"; }
-          { app = "/Users/phil/Applications/Home Manager Apps/Vesktop.app"; }
-          { app = "/Users/phil/Applications/Home Manager Apps/Spotify.app"; }
-          { app = "/Users/phil/Applications/Home Manager Apps/Floorp.app"; }
-          { app = "/Users/phil/Applications/Home Manager Apps/Obsidian.app"; }
-          { app = "/Users/phil/Applications/Home Manager Apps/OpenSCAD.app"; }
-          { app = "/Applications/okular.app"; }
-          { app = "/Applications/Affinity.app"; }
-          { app = "/System/Applications/Mail.app"; }
-          { app = "/System/Applications/Launchpad.app"; }
-        ];
         show-recents = false;
         mineffect = "genie";
+        persistent-apps = map (app: { inherit app; }) [
+          (hmApps "kitty")
+          (hmApps "Vesktop")
+          (hmApps "Spotify")
+          (hmApps "Floorp")
+          (hmApps "Obsidian")
+          (hmApps "OpenSCAD")
+          (apps "okular")
+          (apps "Affinity")
+          (sysApps "Mail")
+          (sysApps "Launchpad")
+        ];
       };
 
       loginwindow = {
@@ -59,11 +59,11 @@
       };
 
       finder = {
-        AppleShowAllFiles = true; # hidden files
-        AppleShowAllExtensions = true; # file extensions
-        _FXShowPosixPathInTitle = true; # title bar full path
-        ShowPathbar = true; # breadcrumb nav at bottom
-        ShowStatusBar = true; # file count & disk space
+        AppleShowAllFiles = true;
+        AppleShowAllExtensions = true;
+        _FXShowPosixPathInTitle = true;
+        ShowPathbar = true;
+        ShowStatusBar = true;
       };
 
       NSGlobalDomain = {

darwin/yabai.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+_: {
   services = {
     yabai = {
       enable = true;
@@ -38,68 +38,5 @@
         mouse_drop_action = "swap";
       };
     };
-
-    #    skhd = {
-    #      enable = true;
-    #      skhdConfig = ''
-    # Application Bindings
-    #        cmd - q : open -a kitty
-    #        cmd - e : ${pkgs.kitty}/bin/kitty yazi
-    #        cmd - o : open -a "Obsidian"
-    #        cmd - i : open -a "Floorp" 
-    #        cmd - g : open -a "Mail"
-
-    # Window Management (using yabai if installed, otherwise basic macOS)
-    #cmd + shift - c : yabai -m window --close || osascript -e 'tell application "System Events" to keystroke "w" using command down'
-    #cmd + shift - v : yabai -m window --toggle float
-
-    # Focus windows (vim-like)
-    #        cmd - left : yabai -m window --focus west
-    #        cmd - right : yabai -m window --focus east
-    #        cmd - up : yabai -m window --focus north
-    #        cmd - down : yabai -m window --focus south
-
-    # Move windows to spaces (workspaces)
-    #       cmd + shift - 1 : yabai -m window --space 1
-    #       cmd + shift - 2 : yabai -m window --space 2
-    #       cmd + shift - 3 : yabai -m window --space 3
-    #       cmd + shift - 4 : yabai -m window --space 4
-    #       cmd + shift - 5 : yabai -m window --space 5
-    #       cmd + shift - 6 : yabai -m window --space 6
-    #       cmd + shift - 7 : yabai -m window --space 7
-    #       cmd + shift - 8 : yabai -m window --space 8
-    #       cmd + shift - 9 : yabai -m window --space 9
-    #       cmd + shift - 0 : yabai -m window --space 10
-
-    # Switch to spaces (workspaces)
-    #       cmd - 1 : yabai -m space --focus 1
-    #       cmd - 2 : yabai -m space --focus 2
-    #       cmd - 3 : yabai -m space --focus 3
-    #       cmd - 4 : yabai -m space --focus 4
-    #       cmd - 5 : yabai -m space --focus 5
-    #       cmd - 6 : yabai -m space --focus 6
-    #       cmd - 7 : yabai -m space --focus 7
-    #       cmd - 8 : yabai -m space --focus 8
-    #       cmd - 9 : yabai -m space --focus 9
-    #       cmd - 0 : yabai -m space --focus 10
-
-    # Screenshot (macOS native)
-    #       cmd - z : screencapture -i ~/Pictures/Screenshots/$(date +%s).png
-    #       cmd - u : screencapture ~/Pictures/Screenshots/$(date +%s).png
-
-    # Launcher (using Raycast or Spotlight as Rofi alternative)
-    #       cmd - r : open -a "Raycast" || osascript -e 'tell application "System Events" to keystroke space using command down'
-
-    # Lock screen
-    #       cmd - m : pmset displaysleepnow
-
-    # Toggle layout (if using yabai)
-    #       cmd - j : yabai -m space --layout $(yabai -m query --spaces --space | jq -r 'if .type == "bsp" then "float" else "bsp" end')
-    #       cmd - p : yabai -m window --toggle split
-
-    # Reload skhd config
-    #        cmd + shift - r : skhd --reload
-    #      '';
-    #    };
   };
 }