Merge branch 'main' into wip/pkgs/ultimatepp

inputs.nix

@@ -33,7 +33,7 @@ self = {
     updateScript = pkgs.den-http-get-updater {
       fileLocation = lockFile;
       previousVersion = lock.nixpkgs.revision;
-      versionUrl = "https://channels.nixos.org/nixos-24.11/git-revision";
+      versionUrl = "https://channels.nixos.org/nixos-25.05/git-revision";
       prefetchList = [{
         previousHash = lock.nixpkgs.sha256;
         prefetchUrlLocation = {

lock.nix

@@ -4,19 +4,19 @@
     sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=";
   };
   nixpkgs = {
-    revision = "5d736263df906c5da72ab0f372427814de2f52f8";
+    revision = "55d1f923c480dadce40f5231feb472e81b0bab48";
-    sha256 = "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=";
+    sha256 = "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=";
   };
   nixpkgs-unstable = {
-    revision = "adaa24fbf46737f3f1b5497bf64bae750f82942e";
+    revision = "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f";
-    sha256 = "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=";
+    sha256 = "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=";
   };
   nix-bitcoin = {
-    revision = "040231d830fe444c3979307e8aced18850703fce";
+    revision = "e7e6353b3a72205b037be53eda2e71e24e46b45e";
-    sha256 = "sha256-b9oebJIW9bcP2vjreMRBAPSbdy2vrAr8wQGSX1P5aTk=";
+    sha256 = "sha256-Y53kyw7CQUEUiKPVQQzCMB4OIiZtOoFNurJhhM6Xvx4=";
   };
   cosmic-modules = {
-    revision = "0fee0ad9921c4ffa8da6b8cac5d687b4b73cfce8";
+    revision = "e3bea95daa167bf84a4bf3387ef6f01f081152b6";
-    sha256 = "sha256-cULcw99N61o/sN82dTvM7QpC5dRNyp1yvEr2cTLTA5I=";
+    sha256 = "sha256-QhmqgiAGqR7VYxyNsdpR2qfejRnviyf7ElZ8v8MtwwY=";
   };
 }

nixos/modules/account.nix

@@ -23,7 +23,7 @@
         })
         vesktop
         unstablePkgs.vscode
-        gimp
+        gimp3
         inkscape
         jitsi-meet-electron
         krita

nixos/modules/core-desktop.nix

@@ -8,7 +8,7 @@
   config = {
     services.printing.enable = true;
 
-    hardware.pulseaudio.enable = false;
+    services.pulseaudio.enable = false;
     security.rtkit.enable = true;
     services.pipewire = {
       enable = true;
@@ -27,7 +27,12 @@
       kdePackages.kdeconnect-kde
       pcmanfm
       pwvucontrol
-      qimgv
+      (qimgv.override {
+        opencv4 = opencv4.override {
+          # https://github.com/NixOS/nixpkgs/issues/383175
+          enableCuda = false;
+        };
+      })
     ];
 
     programs.mpv = let
@@ -103,7 +108,7 @@
     # Fonts
     fonts.packages = with pkgs; [
       corefonts
-      (nerdfonts.override { fonts = [ "Meslo" ]; })
+      nerd-fonts.meslo-lg
       roboto
     ];
 

nixos/modules/desktopManagers/cosmic.nix

@@ -7,19 +7,24 @@
 }:
 
 let
-  cosmic-configuration = pkgs.substituteAllFiles {
+  cosmic-configuration = pkgs.stdenv.mkDerivation {
     name = "cosmic-configuration";
     src = ./cosmic-config;
-    files = [ "." ]; # All files
-    postInstall = ''
-      mkdir -p $share/share/cosmic
-      cp -rt $share/share/cosmic $out/*
-    '';
     outputs = [ "out" "share" ];
-
+    dontConfigure = true;
-    wallpaper = builtins.path { path = "${self}/media/wallpaper.png"; };
+    buildPhase = ''
-    corner_radii_theme = "2.0";
+      for file in $(find . -type f); do
-    corner_radii_panel = "2";
+        substituteInPlace "$file" \
+          --subst-var-by wallpaper "${builtins.path { path = "${self}/media/wallpaper.png"; }}" \
+          --subst-var-by corner_radii_theme "2.0" \
+          --subst-var-by corner_radii_panel "2"
+      done
+    '';
+    installPhase = ''
+      mkdir -p $out $share/share/cosmic
+      cp -r ./* $out/
+      cp -r ./* $share/share/cosmic/
+    '';
   };
 in
 

pkgs/by-name/ra/ranger-git/package.nix

@@ -16,8 +16,8 @@ ranger.overrideAttrs (selfAttrs: superAttrs: {
   src = fetchFromGitHub {
     owner = "ranger";
     repo = "ranger";
-    rev = "b31db0f638118c103a35be5a57d1a0f3609838d6";
+    rev = "b00f923911090204139c9e19ba42e9d80aa0889f";
-    hash = "sha256-ksWlopkqD/98hwVspIRIEGCN/L/OuVlVyXftfza4LhI=";
+    hash = "sha256-uMvo+5I5WCJGT5+XRS/NFClDGH4F59ogQJb+RYuraX4=";
   };
 
   patches = superAttrs.patches or [] ++ [