From 8298f90315a29cbb02e7333f0de30cc685dba77c Mon Sep 17 00:00:00 2001
From: Lumpiasty <arek.dzski@gmail.com>
Date: Tue, 1 Sep 2026 23:05:29 +0200
Subject: [PATCH] resolve evaluation issues on nix-darwin

---
 configuration.nix      |  3 +++
 flake.nix              |  4 ++++
 home-modules/dev.nix   |  3 ---
 home-modules/gpg.nix   | 13 +++++++------
 home-modules/linux.nix | 16 ++++++++++++++++
 home-modules/pc.nix    |  9 ---------
 users/user/home.nix    |  2 +-
 7 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 2816031..b974d4f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -28,4 +28,7 @@ self: { pkgs, ... }: {
     };
 
     lumpiasty.pc = true;
+
+    # Allow unfree packages
+    nixpkgs.config.allowUnfree = true;
 }
diff --git a/flake.nix b/flake.nix
index a2b548d..2dad1c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,6 +88,10 @@
                   ./users/user/home.nix
                 ];
               };
+              nixpkgs.overlays = [
+                inputs.claude-code.overlays.default
+                inputs.nix-skills.overlays.default
+              ] ++ (import ./overlays/pkgs.nix { bun2nix = inputs.bun2nix; });
           }
         ];
       };
diff --git a/home-modules/dev.nix b/home-modules/dev.nix
index 98b8fae..79de5ea 100644
--- a/home-modules/dev.nix
+++ b/home-modules/dev.nix
@@ -73,17 +73,14 @@
       docker
       docker-buildx
       proton-vpn
-      wl-clipboard
       devenv
       dig
       whois
       mtr
-      traceroute
       nodejs_24
       codex
       claude-code
       winbox4
-      amdgpu_top
       dua
     ];
 
diff --git a/home-modules/gpg.nix b/home-modules/gpg.nix
index b06ad3e..bc036d4 100644
--- a/home-modules/gpg.nix
+++ b/home-modules/gpg.nix
@@ -7,7 +7,7 @@
     services.gpg-agent = {
       enable = true;
       enableSshSupport = true;
-      pinentry.package = pkgs.pinentry-qt;
+      pinentry.package = lib.mkIf config.lumpiastyHome.linux pkgs.pinentry-qt;
       extraConfig = ''
         listen-backlog 256
         '';
@@ -15,11 +15,12 @@
 
     programs.gpg.enable = true;
 
-    programs.git.signing = {
-      format = "openpgp";
-      key = "EA287B39E5F69945";
-      signByDefault = true;
-    };
+    programs.git.signing = 
+      lib.mkIf config.lumpiastyHome.linux { # TODO: on macos too
+        format = "openpgp";
+        key = "EA287B39E5F69945";
+        signByDefault = true;
+      };
 
     programs.bash.enable = lib.mkDefault true;
   };
diff --git a/home-modules/linux.nix b/home-modules/linux.nix
index d1d9f69..2085175 100644
--- a/home-modules/linux.nix
+++ b/home-modules/linux.nix
@@ -9,5 +9,21 @@
       # which has AllowedCPUs=<audioCpus> — pins all DSP work to the reserved cores.
       Slice = "audio.slice";
     };
+
+    programs.chromium.enable = true;
+    programs.chromium.package = pkgs.ungoogled-chromium;
+
+    home.packages = with pkgs; (lib.optionals config.lumpiastyHome.dev [
+      wl-clipboard
+      traceroute
+      amdgpu_top
+    ] ++ lib.optionals config.lumpiastyHome.pc [
+      pass-wayland
+      libreoffice-qt-stable
+      vlc
+      gimp
+      ventoy-full-qt
+      teamspeak6-client
+    ]);
   };
 }
\ No newline at end of file
diff --git a/home-modules/pc.nix b/home-modules/pc.nix
index 5d18e15..d27183c 100644
--- a/home-modules/pc.nix
+++ b/home-modules/pc.nix
@@ -8,10 +8,6 @@
       vesktop
       # Manual update, not yet in nixpkgs as for now
       spotify
-      pass-wayland
-      teamspeak6-client
-      libreoffice-qt6-fresh
-      vlc
       inkscape
       qtpass
       signal-desktop
@@ -19,14 +15,9 @@
       thunderbird
       pwgen
       siyuan
-      gimp
-      ventoy-full-qt
     ];
     programs.librewolf.enable = true;
 
-    programs.chromium.enable = true;
-    programs.chromium.package = pkgs.ungoogled-chromium;
-
     # services.flatpak.remotes = [{
     #   name = "flathub"; location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
     # }];
diff --git a/users/user/home.nix b/users/user/home.nix
index 62486e1..095be10 100644
--- a/users/user/home.nix
+++ b/users/user/home.nix
@@ -8,7 +8,7 @@
     enablePcApps = osConfig.lumpiasty.pc;
     dev = osConfig.lumpiasty.pc;
     gaming = osConfig.lumpiasty.gaming;
-    fhs = osConfig.lumpiasty.pc;
+    fhs = osConfig.lumpiasty.pc && config.lumpiastyHome.linux;
   };
 
   home.stateVersion = "24.05";