darwin: build adjustments for 25.05

darwin/configuration.nix

@@ -4,7 +4,6 @@
   imports = [ ../common/nix-settings.nix ];
   nix = {
     enable = true;
-    package = pkgs.nixVersions.nix_2_25;
     settings = {
       trusted-users = [
         "os"
@@ -21,9 +20,6 @@
     };
   };
 
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = [ pkgs.vim ];
@@ -38,6 +34,7 @@
   # system-wide SSH configuration, used by nix-daemon for remote builders
 
   # show hidden files
+  system.primaryUser = "os";
   system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
 
   # Used for backwards compatibility, please read the changelog before changing.

home/modules/packages.nix

@@ -17,16 +17,19 @@ let
       inkscape
       darktable
       exiftool
-      gimp3
     ]
     ++ (with gimp3Plugins; [
       #fourier  # broken
       #lqrPlugin  # broken
     ])
     ++ lib.optionals pkgs.stdenv.isLinux [
+      gimp3
       hugin
       #luminanceHDR  # FIXME, build failure
       xournalpp
+    ]
+    ++ lib.optionals pkgs.stdenv.isDarwin [
+      gimp
     ];
 
   multimediaApps =
@@ -142,7 +145,6 @@ let
 
   desktopCommon = [
     keepassxc
-    tigervnc
   ];
 
   desktopLinux = [
@@ -171,6 +173,7 @@ let
       mediaSupport = true;
       pulseaudioSupport = pkgs.stdenv.isLinux;
     })
+    tigervnc
     pdfpc
     nheko
     gpxsee