fix ssh controlpath on macos

configuration.nix

@@ -26,4 +26,9 @@ self: { pkgs, ... }: {
     users.users.macbookpro = {
         home = "/Users/macbookpro";
     };
+
+    lumpiasty.pc = true;
+
+    # Allow unfree packages
+    nixpkgs.config.allowUnfree = true;
 }

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; });
           }
         ];
       };

home-modules/default.nix

@@ -7,6 +7,7 @@
     ./dev.nix
     ./gaming.nix
     ./fhsBash.nix
+    ./linux.nix
   ] ++ lib.optionals (osConfig.lumpiasty.enablePlasma) [
     ./plasma.nix
   ];

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
     ];
 
@@ -120,7 +117,7 @@
         User = "root";
         ControlMaster = "auto";
         ControlPersist = "3600";
-        ControlPath = "/run/user/%i/ssh-socket-%r@%h:%p";
+        ControlPath = lib.mkIf config.lumpiastyHome.linux "/run/user/%i/ssh-socket-%r@%h:%p";
         ServerAliveInterval = 20;
       };
 

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 = {
+    programs.git.signing = 
-      format = "openpgp";
+      lib.mkIf config.lumpiastyHome.linux { # TODO: on macos too
-      key = "EA287B39E5F69945";
+        format = "openpgp";
-      signByDefault = true;
+        key = "EA287B39E5F69945";
-    };
+        signByDefault = true;
+      };
 
     programs.bash.enable = lib.mkDefault true;
   };

home-modules/linux.nix

@@ -0,0 +1,29 @@
+{ config, lib, pkgs, osConfig, ... }:
+
+{
+  options.lumpiastyHome.linux = lib.mkEnableOption "Linux specific things";
+  config = lib.mkIf config.lumpiastyHome.linux {
+    services.easyeffects.enable = true;
+    systemd.user.services.easyeffects.Service = lib.mkIf osConfig.lumpiasty.audioRt.cpuPartitioning {
+      # Move easyeffects into audio.slice (defined in modules/desktop/audio-rt.nix)
+      # 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
+    ]);
+  };
+}

home-modules/pc.nix

@@ -8,11 +8,6 @@
       vesktop
       # Manual update, not yet in nixpkgs as for now
       spotify
-      pass-wayland
-      teamspeak6-client
-      easyeffects
-      libreoffice-qt6-fresh
-      vlc
       inkscape
       qtpass
       signal-desktop
@@ -20,19 +15,8 @@
       thunderbird
       pwgen
       siyuan
-      gimp
-      ventoy-full-qt
     ];
     programs.librewolf.enable = true;
-    services.easyeffects.enable = true;
-    systemd.user.services.easyeffects.Service = lib.mkIf osConfig.lumpiasty.audioRt.cpuPartitioning {
-      # Move easyeffects into audio.slice (defined in modules/desktop/audio-rt.nix)
-      # 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;
 
     # services.flatpak.remotes = [{
     #   name = "flathub"; location = "https://dl.flathub.org/repo/flathub.flatpakrepo";

lib/mkHome.nix

@@ -9,5 +9,6 @@ lib.mkIf condition (
       ../home-modules
       home
     ];
+    lumpiastyHome.linux = true;
   }
 )

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";