Merge branch 'nixos-25.05' into develop

configuration.nix

@@ -86,8 +86,8 @@
         domain = "git.ekzy.is";
         owner = "ekzyis";
         repo = "dwmstatus";
-        rev = "6c078d4";
-        hash = "sha256-9ibrM0ZOJUC5YsSZjpqcw4GyeBmtyGaGFausjL96yTo=";
+        rev = "4aedc1e";
+        hash = "sha256-2KOzi9bT6dOymBEegOnmtll9tgdHLL+CxpnVXw5+NU0=";
       };
       buildInputs = [ xorg.libX11 ];
       installPhase = ''
@@ -128,19 +128,7 @@
     brave
     vscodium
     neovim
-    # nixos-channel 24.11 only has 2.23.0 so I manually update to v2.24.0 here
-    # reference: https://github.com/NixOS/nixpkgs/blob/a0f3e10d94359665dba45b71b4227b0aeb851f8e/pkgs/applications/virtualization/docker/compose.nix
-    (docker-compose.overrideAttrs (oldAttrs: rec {
-      version = "2.24.0";
-      src = pkgs.fetchFromGitHub {
-        owner = "docker";
-        repo = "compose";
-        rev = "v${version}";
-        hash = "sha256-6wa4kIl65z3kk+wzDX+WhS50J+e0AZ+W8A++bdnRc2M=";
-      };
-      vendorHash = "sha256-03jlomVb3jS+SkmIxRtPsaMx2VKLYX/Lp9JH/mlJvK4=";
-      ldflags = [ "-X github.com/docker/compose/v2/internal.Version=v${version}" "-s" "-w" ];
-    }))
+    docker-compose
     nodejs
     signal-desktop
     telegram-desktop
@@ -171,8 +159,7 @@
   ];
 
   fonts.packages = with pkgs; [
-    hack-font noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji noto-fonts-emoji
-    (nerdfonts.override { fonts = [ "Hack" ]; })
+    hack-font noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji noto-fonts-emoji nerd-fonts.hack
   ];
 
   # steam