From 7a25ac669f4664f070fdc651557964afc0242508 Mon Sep 17 00:00:00 2001
From: DerGrumpf <phil.keier@hotmail.com>
Date: Sat, 6 Jun 2026 21:04:49 +0200
Subject: [PATCH] Cleaned up darwin from noise; Moved overlays too a shared
 module

---
 darwin/default.nix                            |  8 --
 darwin/settings.nix                           | 62 +++++++-------
 darwin/yabai.nix                              | 65 +--------------
 flake.lock                                    | 82 +++++++++----------
 flake.nix                                     |  6 ++
 home/fonts.nix                                | 30 ++++++-
 home/neovim/default.nix                       |  7 +-
 home/packages.nix                             |  1 +
 nixos/default.nix                             |  5 --
 .../overlays.nix => overlays/default.nix      |  0
 .../packages => overlays}/gs1200-exporter.nix |  0
 {nixos/packages => overlays}/oidcwarden.nix   |  0
 12 files changed, 112 insertions(+), 154 deletions(-)
 rename nixos/packages/overlays.nix => overlays/default.nix (100%)
 rename {nixos/packages => overlays}/gs1200-exporter.nix (100%)
 rename {nixos/packages => overlays}/oidcwarden.nix (100%)

diff --git a/darwin/default.nix b/darwin/default.nix
index ab27ea2..f9d250f 100644
--- a/darwin/default.nix
+++ b/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;
diff --git a/darwin/settings.nix b/darwin/settings.nix
index 06c9710..6d2ec86 100644
--- a/darwin/settings.nix
+++ b/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 = {
diff --git a/darwin/yabai.nix b/darwin/yabai.nix
index ba4c085..dd7f606 100644
--- a/darwin/yabai.nix
+++ b/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
-    #      '';
-    #    };
   };
 }
diff --git a/flake.lock b/flake.lock
index a083f51..63fa14d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,16 +36,16 @@
     "brew-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1778427648,
-        "narHash": "sha256-pt9KaDGsMyYWB9JeHs4XGHs870f1lOZe3vx9LpVIhUE=",
+        "lastModified": 1779646357,
+        "narHash": "sha256-rnnAaESXxItX4D9xCMGvs3hfDBjbbTYht7OluRcvT8k=",
         "owner": "Homebrew",
         "repo": "brew",
-        "rev": "6f293daa9f9f5832e13b497976335e90509886d7",
+        "rev": "10a163ac127624caa80cc5cc5a705e97f3615b0e",
         "type": "github"
       },
       "original": {
         "owner": "Homebrew",
-        "ref": "5.1.11",
+        "ref": "5.1.14",
         "repo": "brew",
         "type": "github"
       }
@@ -57,11 +57,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780154910,
-        "narHash": "sha256-aaGjVFEAJQWB69kok/AthcXpT/9yA5Ag2uYDwdbbj5c=",
+        "lastModified": 1780755633,
+        "narHash": "sha256-2NZLaQTroHWrXHOeBJhHD7cb8nM4BnlAMNoxIUqs/Os=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "cf8ccac24e24a2a78fe6f36de9c5d5e9860299a4",
+        "rev": "71770b00f2b97631339026e78b4a045cd9aee6f3",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780099287,
-        "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=",
+        "lastModified": 1780679734,
+        "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d",
+        "rev": "b2b7db486e06e098711dc291bb25db82850e1d16",
         "type": "github"
       },
       "original": {
@@ -320,11 +320,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1780142732,
-        "narHash": "sha256-7sBe6ujnxspLeX7zMSKpGpOuOXGeUmvDV/78CSsY+PQ=",
+        "lastModified": 1780768552,
+        "narHash": "sha256-J2gBzBBE9C6LMMJec8buysLAQl7QmqtP/oMrPfVioYc=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "34fddc949042e45d22bed6cbe72f9a9c838914fa",
+        "rev": "20ee7553c95dd1fa30a00564561f40f7986ffbc7",
         "type": "github"
       },
       "original": {
@@ -652,11 +652,11 @@
         "brew-src": "brew-src"
       },
       "locked": {
-        "lastModified": 1778851564,
-        "narHash": "sha256-p8wzcnpB2Iys+QzAKM9/Eyw/pUyqCO3sw/NCnDH4dTE=",
+        "lastModified": 1780492467,
+        "narHash": "sha256-zMEJwtQPmsPPgPczFkyjWHgd1z0HagOPS2Wt2WDYLJY=",
         "owner": "zhaofengli",
         "repo": "nix-homebrew",
-        "rev": "b3a87b4793205cc111f3c61e25e018ffac3b8039",
+        "rev": "562332f97de9f5ba51aa647d70462e88222b2988",
         "type": "github"
       },
       "original": {
@@ -675,11 +675,11 @@
         "nixpkgs-nixcord": "nixpkgs-nixcord"
       },
       "locked": {
-        "lastModified": 1780158792,
-        "narHash": "sha256-tAGrRIQOi11zwl7UOLKkNsy3owVTE+/lDU1MJT9K2Qw=",
+        "lastModified": 1780751320,
+        "narHash": "sha256-3PlWrZkSwElqYHMnWi4d0A+GxlvCXk0JaMsTGghmQGE=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "d0a08d06b3a00b1038b1780366180068af7c1489",
+        "rev": "2b70dbed679d2705696deb36f0778c9ef9f1ded2",
         "type": "github"
       },
       "original": {
@@ -757,27 +757,27 @@
     },
     "nixpkgs-nixcord": {
       "locked": {
-        "lastModified": 1779102034,
-        "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
+        "lastModified": 1780453794,
+        "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
+        "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {
@@ -789,11 +789,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1779877693,
-        "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
+        "lastModified": 1780336545,
+        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
+        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
         "type": "github"
       },
       "original": {
@@ -810,11 +810,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1780161591,
-        "narHash": "sha256-eOiIbCMsYMP9JgZXzuT/m41djqDOEHTKjMFrm5NeVHM=",
+        "lastModified": 1780646548,
+        "narHash": "sha256-Ckyl/l1XBmEwnaHcHD8PvBZk1uph0NqwbJ//CAvB7iE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "57e5355a843618a717a19d43b2a726a8f27f0bd1",
+        "rev": "816a15282e58678dde831477964987d0262d4293",
         "type": "github"
       },
       "original": {
@@ -831,11 +831,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780200883,
-        "narHash": "sha256-Fj+H8TNlWYGsLjrCQRWjcpZDcWp97i/mny9FgPS1W3E=",
+        "lastModified": 1780766476,
+        "narHash": "sha256-BlI1qrW7wqI+pniqRebMttqN/w0H6XHqITGB9JPSQNQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b8cdbdd02e4ce7a9fb7c8806fb1bc8d160c7433b",
+        "rev": "050c04c7c01ad5de7e60f32b66ce0599e3c17d8e",
         "type": "github"
       },
       "original": {
@@ -892,11 +892,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "lastModified": 1780547341,
+        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
         "type": "github"
       },
       "original": {
@@ -913,11 +913,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1779824049,
-        "narHash": "sha256-dWHVUjP03KSVG1PaLKA6j9EdxWSxSQvipMUIcSyuA/U=",
+        "lastModified": 1780422259,
+        "narHash": "sha256-dWGk4SEdI189kQW5cE4Uo1Mc+P+kQEdgMcyMgTtmQOA=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "1362178e5f5f7a848c49fe9dee004ef8824f100a",
+        "rev": "8414bbf2fcc7bc0a22c675e498e3c7365c1aec0a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5094961..e0c9579 100644
--- a/flake.nix
+++ b/flake.nix
@@ -118,6 +118,12 @@
 
           sharedModules = [
             { networking.hostName = hostName; }
+            {
+              nixpkgs = {
+                overlays = [ (import ./overlays { inherit (inputs) nur; }) ];
+                config.allowUnfree = true;
+              };
+            }
             ./hosts/${hostName}/configuration.nix
             inputs.sops-nix.${platformModuleSet}.sops
             inputs.home-manager.${platformModuleSet}.home-manager
diff --git a/home/fonts.nix b/home/fonts.nix
index 966a083..67f4782 100644
--- a/home/fonts.nix
+++ b/home/fonts.nix
@@ -1,11 +1,33 @@
-{ pkgs, ... }:
 {
-  fonts.fontconfig.enable = true;
-
-  home.packages = with pkgs; [
+  pkgs,
+  isDarwin,
+  lib,
+  ...
+}:
+let
+  fonts = with pkgs; [
     nerd-fonts.fira-code
     nerd-fonts.fira-mono
     nerd-fonts.hack
   ];
+in
+{
+  fonts.fontconfig.enable = true;
+  home = {
+    packages = lib.mkIf (!isDarwin) fonts;
 
+    file = lib.mkIf isDarwin (
+      builtins.listToAttrs (
+        builtins.concatMap (
+          pkg:
+          map (file: {
+            name = "Library/Fonts/${builtins.baseNameOf file}";
+            value = {
+              source = file;
+            };
+          }) (lib.filesystem.listFilesRecursive "${pkg}/share/fonts")
+        ) fonts
+      )
+    );
+  };
 }
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index a75a2ac..8196955 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -1,4 +1,8 @@
-{ pkgs, inputs, ... }:
+{
+  pkgs,
+  inputs,
+  ...
+}:
 {
   imports = [
     inputs.nixvim.homeModules.nixvim
@@ -29,6 +33,7 @@
   programs.nixvim = {
     enable = true;
     defaultEditor = true;
+    enableMan = false;
 
     # Leader key
     globals.mapleader = " ";
diff --git a/home/packages.nix b/home/packages.nix
index be9be52..3631da6 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -37,6 +37,7 @@
         # Nix tools
         nix-index
         ncdu
+        tty-solitaire
       ]
       ++ lib.optionals (!pkgs.stdenv.isDarwin) [
         # dev tools
diff --git a/nixos/default.nix b/nixos/default.nix
index 53b9127..8769923 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -64,11 +64,6 @@
     info.enable = false;
   };
 
-  nixpkgs = {
-    overlays = [ (import ./packages/overlays.nix { inherit (inputs) nur; }) ];
-    config.allowUnfree = true;
-  };
-
   programs = {
     fish.enable = true;
   }
diff --git a/nixos/packages/overlays.nix b/overlays/default.nix
similarity index 100%
rename from nixos/packages/overlays.nix
rename to overlays/default.nix
diff --git a/nixos/packages/gs1200-exporter.nix b/overlays/gs1200-exporter.nix
similarity index 100%
rename from nixos/packages/gs1200-exporter.nix
rename to overlays/gs1200-exporter.nix
diff --git a/nixos/packages/oidcwarden.nix b/overlays/oidcwarden.nix
similarity index 100%
rename from nixos/packages/oidcwarden.nix
rename to overlays/oidcwarden.nix