From f94278e96d02b912b33ca1b88766346b024da3ab Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Tue, 9 Dec 2025 12:16:39 -0500 Subject: [PATCH] Re-enable rofimoji. --- nix/configuration/roles/base/default.nix | 1 + nix/configuration/roles/sway/default.nix | 2 +- nix/configuration/roles/sway/rofimoji.nix | 20 ++++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/nix/configuration/roles/base/default.nix b/nix/configuration/roles/base/default.nix index ce65b13e..d1b33e79 100644 --- a/nix/configuration/roles/base/default.nix +++ b/nix/configuration/roles/base/default.nix @@ -60,6 +60,7 @@ in nix-serve-ng # Serve nix store over http cleanup_temporary_files jq + inetutils # For whois ]; }; } diff --git a/nix/configuration/roles/sway/default.nix b/nix/configuration/roles/sway/default.nix index 7001b1e8..a907b7e7 100644 --- a/nix/configuration/roles/sway/default.nix +++ b/nix/configuration/roles/sway/default.nix @@ -259,7 +259,7 @@ in imports = [ ./graphical_session_target.nix ./iso.nix - # ./rofimoji.nix + ./rofimoji.nix ./lockscreen.nix ./screenshot.nix ./force_focus.nix diff --git a/nix/configuration/roles/sway/rofimoji.nix b/nix/configuration/roles/sway/rofimoji.nix index 8540d261..d662804e 100644 --- a/nix/configuration/roles/sway/rofimoji.nix +++ b/nix/configuration/roles/sway/rofimoji.nix @@ -38,14 +38,18 @@ in nixpkgs.overlays = [ (final: prev: { - rofimoji = prev.rofimoji.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.tofi ]; - src = builtins.fetchGit { - # https://github.com/fdw/rofimoji/issues/209 - url = "https://github.com/fdw/rofimoji.git"; - rev = "615f00abeb984f3e648ef712164aa4e61f2e1808"; - }; - }); + rofimoji = pkgs.symlinkJoin { + name = prev.rofimoji.name; + paths = [ prev.rofimoji ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/rofimoji --prefix PATH : ${ + lib.makeBinPath [ + final.tofi + ] + } + ''; + }; }) (final: prev: { tofi = pkgs.symlinkJoin {