apps/format-root.nix

@@ -21,7 +21,7 @@
           exit 1
       fi
 
-      ${pkgs.disko}/bin/disko \
+      ${pkgs.disko-packaged}/bin/disko \
           --mode create \
           --dry-run \
           --flake "path:$(pwd)#root" \
@@ -31,7 +31,7 @@
           "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
           --default=false
 
-      ${pkgs.disko}/bin/disko \
+      ${pkgs.disko-packaged}/bin/disko \
           --mode create \
           --flake "path:$(pwd)#root" \
           --arg disk "/dev/''${DISK}"

flake.nix

@@ -277,6 +277,7 @@
         inputs.nix2vim.overlay
         inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784
         (import ./overlays/neovim-plugins.nix inputs)
+        (import ./overlays/disko.nix inputs)
         (import ./overlays/tree-sitter.nix inputs)
         (import ./overlays/mpv-scripts.nix inputs)
         (import ./overlays/nextcloud-apps.nix inputs)

overlays/disko.nix

@@ -0,0 +1,3 @@
+# Add disko to nixpkgs from its input flake
+
+inputs: _final: prev: { disko = inputs.disko.packages.${prev.system}.disko; }

overlays/volnoti.nix

@@ -1,44 +1,7 @@
-# Fix: Volnoti error: 'volnoti' has been removed due to lack of maintenance upstream.
+# Fix: Volnoti binary not found
+# Broken by https://github.com/nix-community/home-manager/pull/5725/commits/98bf8de65dc1ed12c6443b18f6f24d36e9c438d6
 _final: prev: {
-  volnoti = prev.stdenv.mkDerivation {
+  volnoti = prev.volnoti.overrideAttrs (oldAttrs: {
-    pname = "volnoti-unstable";
+    meta.mainProgram = "volnoti";
-    version = "2013-09-23";
+  });
-    src = prev.fetchFromGitHub {
-      owner = "davidbrazdil";
-      repo = "volnoti";
-      rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24";
-      sha256 = "155lb7w563dkdkdn4752hl0zjhgnq3j4cvs9z98nb25k1xpmpki7";
-    };
-    patches = [
-      # Fix dbus interface headers. See
-      # https://github.com/davidbrazdil/volnoti/pull/10
-      (prev.fetchpatch {
-        url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch";
-        sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam";
-      })
-    ];
-    nativeBuildInputs = with prev; [
-      pkg-config
-      autoreconfHook
-      wrapGAppsHook3
-    ];
-    buildInputs = with prev; [
-      dbus
-      gdk-pixbuf
-      glib
-      xorg.libX11
-      gtk2
-      dbus-glib
-      librsvg
-    ];
-    meta = with prev.lib; {
-      description = "Lightweight volume notification for Linux";
-      homepage = "https://github.com/davidbrazdil/volnoti";
-      license = licenses.gpl3;
-      platforms = platforms.linux;
-      maintainers = [ ];
-      # Broken by https://github.com/nix-community/home-manager/pull/5725/commits/98bf8de65dc1ed12c6443b18f6f24d36e9c438d6
-      mainProgram = "volnoti";
-    };
-  };
 }