From b89e3ef823478cff40f7ea60f21896814a793732 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Sat, 18 Apr 2026 00:38:33 +0700 Subject: [PATCH] remove dolphin-overlay --- flake.lock | 66 ++++++++----------------------- flake.nix | 1 - options/home/programs/dolphin.nix | 12 +++++- overlays/nixpkgs.nix | 1 - 4 files changed, 27 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index f1d2777..17ecc18 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "dolphin-overlay": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1775943689, - "narHash": "sha256-0XBCoR1L5gYmh8VqZu0HcHsL4GeGXQMC0f3ARshf/rk=", - "owner": "rumboon", - "repo": "dolphin-overlay", - "rev": "c32758737a0cb02d0bf380753d11df1b8537a944", - "type": "github" - }, - "original": { - "owner": "rumboon", - "repo": "dolphin-overlay", - "type": "github" - } - }, "flake-compat": { "locked": { "lastModified": 1733328505, @@ -149,7 +131,7 @@ "honkai-railway-grub-theme": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1775016235, @@ -168,7 +150,7 @@ }, "hytale-launcher": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1775840082, @@ -216,7 +198,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -292,7 +274,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { @@ -327,15 +309,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743890059, - "narHash": "sha256-QQLhHHGNtAW8qRpseb40zqZlhZUeRRUg2SGmXjfE+so=", - "owner": "NixOS", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "58a813438464b5295170efe38d8bd5f40fcc1d23", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -388,22 +371,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1775423009, "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", @@ -419,7 +386,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1776169885, "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", @@ -435,7 +402,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1775595990, "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", @@ -451,7 +418,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1776221942, "narHash": "sha256-FbQAeVNi7G4v3QCSThrSAAvzQTmrmyDLiHNPvTF2qFM=", @@ -467,7 +434,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1762361079, "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", @@ -532,7 +499,6 @@ }, "root": { "inputs": { - "dolphin-overlay": "dolphin-overlay", "home-manager": "home-manager", "honkai-railway-grub-theme": "honkai-railway-grub-theme", "hytale-launcher": "hytale-launcher", @@ -540,7 +506,7 @@ "nix-index-database": "nix-index-database", "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "unstablepkgs": "unstablepkgs", "winegdk": "winegdk" @@ -625,7 +591,7 @@ "winegdk": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "winegdk": "winegdk_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 5192817..035612f 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,6 @@ hytale-launcher.url = "github:zarilion/hytale-launcher-nix"; niri.url = "github:sodiboo/niri-flake"; nixcord.url = "github:FlameFlag/nixcord"; - dolphin-overlay.url = "github:rumboon/dolphin-overlay"; winegdk.url = "github:fmbearmf/winegdk-nix"; honkai-railway-grub-theme.url = "github:voidlhf/StarRailGrubThemes/4a84e576bb544afbdfc76dbe40ffc50a5c2b16de"; diff --git a/options/home/programs/dolphin.nix b/options/home/programs/dolphin.nix index 797a726..a6da44d 100644 --- a/options/home/programs/dolphin.nix +++ b/options/home/programs/dolphin.nix @@ -41,7 +41,17 @@ in { enable = lib.mkEnableOption "dolphin"; package = lib.mkOption { type = lib.types.package; - default = pkgs.kdePackages.dolphin; + default = pkgs.symlinkJoin { + name = "dolphin-wrapped"; + paths = [pkgs.kdePackages.dolphin]; + nativeBuildInputs = [pkgs.makeWrapper]; + postBuild = '' + rm $out/bin/dolphin + makeWrapper ${pkgs.kdePackages.dolphin}/bin/dolphin $out/bin/dolphin \ + --set XDG_CONFIG_DIRS "${pkgs.kdePackages.kservice}/etc/xdg:$XDG_CONFIG_DIRS" \ + --run "${pkgs.kdePackages.kservice}/bin/kbuildsycoca6 --noincremental ${pkgs.kdePackages.kservice}/etc/xdg/menus/applications.menu" + ''; + }; }; configs = { diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix index 5960324..bc54b7a 100644 --- a/overlays/nixpkgs.nix +++ b/overlays/nixpkgs.nix @@ -1,6 +1,5 @@ {inputs, ...}: { nixpkgs.overlays = [ inputs.niri.overlays.niri - inputs.dolphin-overlay.overlays.default ]; }