darwin package organization

home-manager/modules/profiles/user/willem/darwin/base.nix

@@ -38,18 +38,21 @@ in {
       f = "open \"$(${config.programs.fzf.package}/bin/fzf)\"";
       o = "open";
       oa = "open -a";
-      pinentry = "pinentry-mac";
+      pinentry = "${pkgs.pinentry-mac}/bin/pinentry-mac";
     }
     // lib.attrsets.mapAttrs (name: value: "open -a '" + value + "'") appCommands;
 
-  programs.firefox.package = pkgs.firefox-mac;
   programs.chromium.package = pkgs.chromium-mac;
 
   home.packages = with pkgs; [
     colima
     freecad-mac
     iterm2
+    pinentry-mac
+    pinentry-touchid
+    pngpaste
     qbittorrent-mac
+    spoof-mac
     utm
     vlc-mac
   ];

home-manager/modules/profiles/user/willem/packages.nix

@@ -3,12 +3,6 @@
   lib,
   ...
 }: let
-  darwin = with pkgs; [
-    pngpaste
-    pinentry-touchid
-    pinentry-mac
-    spoof-mac
-  ];
   linux = with pkgs; [];
   python-wp = pkgs.python310.withPackages (p:
     with p; [
@@ -96,6 +90,7 @@ in {
       graphviz
       htop
       jq
+      mu
       nix-review
       nix-zsh-completions
       nixfmt
@@ -104,6 +99,7 @@ in {
       nodejs
       octave-wp
       openssh
+      pinentry
       plantuml
       poppler
       pv