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,112 +11,114 @@
     enable = true;
     package = pkgs.vscodium;
     mutableExtensionsDir = true;
-    extensions =
+    profiles.default = {
-      with pkgs.vscode-extensions;
+      extensions =
-      [
+        with pkgs.vscode-extensions;
-        ms-python.python
+        [
-        vscodevim.vim
+          ms-python.python
-        yzhang.markdown-all-in-one
+          vscodevim.vim
-        bungcip.better-toml
+          yzhang.markdown-all-in-one
-        eamodio.gitlens
+          bungcip.better-toml
-        jnoortheen.nix-ide
+          eamodio.gitlens
-        mkhl.direnv
+          jnoortheen.nix-ide
-        editorconfig.editorconfig
+          mkhl.direnv
-      ]
+          editorconfig.editorconfig
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        ]
+        ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+          {
+            name = "Sync-Rsync";
+            publisher = "vscode-ext";
+            version = "0.36.0";
+            sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
+          }
+          # TODO: probably available in nixpkgs soonish?
+          {
+            name = "mypy-type-checker";
+            publisher = "ms-python";
+            version = "2023.3.12681020";
+            sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
+          }
+          {
+            name = "black-formatter";
+            publisher = "ms-python";
+            version = "2023.5.12771008";
+            sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
+          }
+          {
+            name = "vscode-pets";
+            publisher = "tonybaloney";
+            version = "1.25.1";
+            sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
+          }
+        ];
+      userSettings =
+        let
+          defaultPython = pkgs.python3.withPackages (ps: [
+            ps.jedi
+            ps.jedi-language-server
+            ps.pip
+            ps.setuptools # for pkg_resources
+            ps.black
+            ps.mypy
+          ]);
+        in
         {
-          name = "Sync-Rsync";
+          "editor.fontLigatures" = true;
-          publisher = "vscode-ext";
+          "editor.accessibilitySupport" = false; # prevent asking
-          version = "0.36.0";
+          "editor.cursorBlinking" = "phase";
-          sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
+          "editor.stickyScroll.enabled" = true;
-        }
+          "workbench.editor.highlightModifiedTabs" = true;
-        # TODO: probably available in nixpkgs soonish?
+          "window.autoDetectColorScheme" = true;
-        {
+          "workbench.preferredDarkColorTheme" = "Default Dark Modern";
-          name = "mypy-type-checker";
+          "workbench.preferredLightColorTheme" = "Default Light Modern";
-          publisher = "ms-python";
+          "[nix]" = {
-          version = "2023.3.12681020";
+            "editor.insertSpaces" = true;
-          sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
+            "editor.tabSize" = 2;
-        }
+            # for now, disable automatic formatting to prevent disruption of existing code bases
-        {
+            "editor.formatOnPaste" = false;
-          name = "black-formatter";
+            "editor.formatOnSave" = false;
-          publisher = "ms-python";
+            "editor.formatOnType" = false;
-          version = "2023.5.12771008";
+          };
-          sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
+          "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
-        }
+          "nix.enableLanguageServer" = true;
-        {
+          "nix.serverPath" = lib.getExe pkgs.nixd;
-          name = "vscode-pets";
+          "nix.serverSettings" = { };
-          publisher = "tonybaloney";
+          "editor.fontSize" = 13;
-          version = "1.25.1";
+          "editor.fontWeight" = "normal";
-          sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
+          "git.detectSubmodulesLimit" = 30;
-        }
+          "[python]" = {
-      ];
+            "breadcrumbs.showClasses" = true;
-    userSettings =
+            "breadcrumbs.showFunctions" = true;
-      let
+            "gitlens.codeLens.symbolScopes" = [ "!Module" ];
-        defaultPython = pkgs.python3.withPackages (ps: [
+            "editor.defaultFormatter" = "ms-python.black-formatter";
-          ps.jedi
+            "editor.formatOnSave" = true;
-          ps.jedi-language-server
+          };
-          ps.pip
+          "python.languageServer" = "Jedi"; # don't use proprietary pylance server
-          ps.setuptools # for pkg_resources
+          "python.defaultInterpreterPath" = "${defaultPython}/bin/python";
-          ps.black
+          "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
-          ps.mypy
+          "black-formatter.importStrategy" = "fromEnvironment";
-        ]);
+          "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
-      in
+          "mypy-type-checker.importStrategy" = "fromEnvironment";
-      {
+          "mypy-type-checker.args" = [ "--ignore-missing-imports" ];
-        "editor.fontLigatures" = true;
+          "gitlens.telemetry.enabled" = false;
-        "editor.accessibilitySupport" = false; # prevent asking
+          "vim.highlightedyank.enable" = true;
-        "editor.cursorBlinking" = "phase";
+          "vim.history" = 500;
-        "editor.stickyScroll.enabled" = true;
+          "vim.neovimUseConfigFile" = true;
-        "workbench.editor.highlightModifiedTabs" = true;
+          "vim.enableNeovim" = true;
-        "window.autoDetectColorScheme" = true;
+          "git.suggestSmartCommit" = false;
-        "workbench.preferredDarkColorTheme" = "Default Dark Modern";
+          "editor.rulers" = [ 79 ];
-        "workbench.preferredLightColorTheme" = "Default Light Modern";
+          "vim.useSystemClipboard" = true;
-        "[nix]" = {
+          "vim.smartRelativeLine" = true;
-          "editor.insertSpaces" = true;
+          "diffEditor.ignoreTrimWhitespace" = false;
-          "editor.tabSize" = 2;
+          "files.associations" = {
-          # for now, disable automatic formatting to prevent disruption of existing code bases
+            "*.py" = "python";
-          "editor.formatOnPaste" = false;
+          };
-          "editor.formatOnSave" = false;
+          "editor.renderWhitespace" = "all";
-          "editor.formatOnType" = false;
+          "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
+          "vim.neovimPath" = lib.getExe pkgs.myVim;
+          "sync-rsync.options" = [ ];
+          "direnv.path.executable" = lib.getExe pkgs.direnv;
         };
-        "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
+    };
-        "nix.enableLanguageServer" = true;
-        "nix.serverPath" = lib.getExe pkgs.nixd;
-        "nix.serverSettings" = { };
-        "editor.fontSize" = 13;
-        "editor.fontWeight" = "normal";
-        "git.detectSubmodulesLimit" = 30;
-        "[python]" = {
-          "breadcrumbs.showClasses" = true;
-          "breadcrumbs.showFunctions" = true;
-          "gitlens.codeLens.symbolScopes" = [ "!Module" ];
-          "editor.defaultFormatter" = "ms-python.black-formatter";
-          "editor.formatOnSave" = true;
-        };
-        "python.languageServer" = "Jedi"; # don't use proprietary pylance server
-        "python.defaultInterpreterPath" = "${defaultPython}/bin/python";
-        "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
-        "black-formatter.importStrategy" = "fromEnvironment";
-        "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
-        "mypy-type-checker.importStrategy" = "fromEnvironment";
-        "mypy-type-checker.args" = [ "--ignore-missing-imports" ];
-        "gitlens.telemetry.enabled" = false;
-        "vim.highlightedyank.enable" = true;
-        "vim.history" = 500;
-        "vim.neovimUseConfigFile" = true;
-        "vim.enableNeovim" = true;
-        "git.suggestSmartCommit" = false;
-        "editor.rulers" = [ 79 ];
-        "vim.useSystemClipboard" = true;
-        "vim.smartRelativeLine" = true;
-        "diffEditor.ignoreTrimWhitespace" = false;
-        "files.associations" = {
-          "*.py" = "python";
-        };
-        "editor.renderWhitespace" = "all";
-        "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
-        "vim.neovimPath" = lib.getExe pkgs.myVim;
-        "sync-rsync.options" = [ ];
-        "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; }
   );