Merge branch '24.05-migration' into mainline

home/common.nix

@@ -146,4 +146,10 @@
   home.sessionVariables = {
     EDITOR = "nvim";
   };
+
+  home.activation.reportChanges = config.lib.dag.entryAnywhere ''
+    if [[ -v oldGenPath ]]; then
+      run nix store diff-closures $oldGenPath $newGenPath
+    fi
+  '';
 }

home/desktop.nix

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

home/modules/fonts.nix

@@ -14,7 +14,7 @@
     ubuntu_font_family
     twemoji-color-font
     open-sans
-    (iosevka-bin.override { variant = "curly-slab"; })
+    (iosevka-bin.override { variant = "CurlySlab"; })
     config.nur.repos.schmittlauch.vollkorn
     # TODO: humor-sans
 

home/modules/packages.nix

@@ -122,6 +122,7 @@ let
     ];
 
   pythonTools = with python3Packages; [
+    python3   # to shadow old macOS python
     notebook
     ipython
     pip

home/modules/vscodium.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   inputs,
   config,
   system,
@@ -75,7 +76,7 @@
           "editor.formatOnSave" = false;
           "editor.formatOnType" = false;
         };
-        "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
+        "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
         "editor.fontSize" = 13;
         "editor.fontWeight" = "normal";
         "git.detectSubmodulesLimit" = 30;