Adjustments for 24.11 -> 25.05

package replacements, warnings, deprecations

common/default.nix

@@ -181,7 +181,7 @@ in
 
   # Flatpak support
   services.flatpak.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
+  xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
 
   # Define a user account. Don't forget to set a password with `passwd`.
   users.users.spiollinux = {

common/packages.nix

@@ -40,7 +40,7 @@
     exfat
     iotop
     cifs-utils
-    dstat
+    dool
     lsof
     macchanger
     borgbackup

common/pulseaudio.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   # Enable sound.
-  hardware.pulseaudio = {
+  services.pulseaudio = {
     enable = true;
     package = pkgs.pulseaudioFull;
     # decouple pulseaudio application and sink volumes

home/common.nix

@@ -51,9 +51,7 @@
       merge.tool = "vimdiff";
       # provide `git mergetool -t nixfmt`
       mergetool.nixfmt = {
-        cmd = "${
+        cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
-          lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
-        } --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
         trustExitCode = true;
       };
       core.excludesfile = toString (
@@ -105,7 +103,7 @@
     enable = true;
     syntaxHighlighting.enable = true;
     history.ignoreSpace = true;
-    initExtra = ''
+    initContent = ''
       # Uncomment following line if you want red dots to be displayed while waiting for completion
       COMPLETION_WAITING_DOTS="true"
       ### Fix slowness of pastes with zsh-syntax-highlighting.zsh

home/desktop.nix

@@ -72,7 +72,7 @@
   services.gpg-agent = {
     enable = true;
     #enableSshSupport = true;
-    pinentryPackage = pkgs.pinentry-qt;
+    pinentry.package = pkgs.pinentry-qt;
   };
 
   programs.ssh = {

home/modules/packages.nix

@@ -17,16 +17,16 @@ let
       inkscape
       darktable
       exiftool
-      gimp
+      gimp3
     ]
-    ++ (with gimpPlugins; [
+    ++ (with gimp3Plugins; [
-      fourier
+      #fourier  # broken
-      lqrPlugin
+      #lqrPlugin  # broken
     ])
     ++ lib.optionals pkgs.stdenv.isLinux [
       hugin
-      luminanceHDR
+      #luminanceHDR  # FIXME, build failure
-      xournal
+      xournalpp
     ];
 
   multimediaApps =
@@ -38,7 +38,7 @@ let
       vlc
       amarok
       clementine
-      elisa
+      kdePackages.elisa
       musescore
       tenacity
       soundkonverter
@@ -122,7 +122,7 @@ let
     ];
 
   pythonTools = with python3Packages; [
-    python3 # to shadow old macOS python
+    python # to shadow old macOS python
     ipython
     uv
     pip
@@ -148,7 +148,7 @@ let
   desktopLinux = [
     firefox
     chromium
-    falkon
+    kdePackages.falkon
     thunderbird
     calibre
     dino
@@ -172,7 +172,6 @@ let
       pulseaudioSupport = pkgs.stdenv.isLinux;
     })
     pdfpc
-    quaternion
     nheko
     gpxsee
     subsurface
@@ -183,7 +182,7 @@ let
     #(pkgs.pidgin-with-plugins.override {
     #    plugins = [ pkgs.pidginotr ];})
 
-    unstable.logseq
+    logseq
 
     # for Hibiscus banking software
     jameica

home/modules/vscodium.nix

@@ -11,6 +11,7 @@
     enable = true;
     package = pkgs.vscodium;
     mutableExtensionsDir = true;
+    profiles.default = {
       extensions =
         with pkgs.vscode-extensions;
         [
@@ -119,4 +120,5 @@
           "direnv.path.executable" = lib.getExe pkgs.direnv;
         };
     };
+  };
 }

home/workmac.nix

@@ -89,7 +89,7 @@ in
     };
 
   # some extra shell scripts
-  programs.zsh.initExtra = lib.mkAfter (
+  programs.zsh.initContent = lib.mkAfter (
     import ./scripts/reporsync.nix { inherit pkgs lib; }
     + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
   );