From 9bbdb5b63b693888f5a5bbb1c57a5a42928053bd Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Fri, 14 Jun 2024 16:41:51 +0200 Subject: Upgrade everything to 24.05 --- alacritty/default.nix | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'alacritty/default.nix') diff --git a/alacritty/default.nix b/alacritty/default.nix index b24d696..e9a955d 100644 --- a/alacritty/default.nix +++ b/alacritty/default.nix @@ -3,7 +3,7 @@ config, zsh, - pkgs ? (import ../pkgs.nix).edge {}, + pkgs ? (import ../pkgs.nix).stable {}, }: rec { @@ -25,25 +25,29 @@ exec "$@" ''; - hints = { - enabled = (builtins.map (r: - { - regex = r.pattern; - hyperlinks = true; - command = (pkgs.writeShellScript "alacritty-hints-${r.name}" '' - ${alacrittyUnwrap} xdg-open "${r.xdgOpen}" - ''); - post_processing = true; - mouse.enabled = true; - } - ) xdgOpenRules); + hintsFileBody = { + hints = { + enabled = (builtins.map (r: + { + regex = r.pattern; + hyperlinks = true; + command = (pkgs.writeShellScript "alacritty-hints-${r.name}" '' + ${alacrittyUnwrap} xdg-open "${r.xdgOpen}" + ''); + post_processing = true; + mouse.enabled = true; + } + ) xdgOpenRules); + }; }; + hintsFile = (pkgs.formats.toml {}).generate "alacritty-hints.toml" hintsFileBody; + configFile = pkgs.writeText "alacritty-config" ( builtins.replaceStrings - ["$HINTS"] - [(builtins.toJSON hints)] - (builtins.readFile ./alacritty.yml) + ["$HINTS_FILE"] + ["${hintsFile}"] + (builtins.readFile ./alacritty.toml) ); shellEntrypoint = pkgs.writeShellScript "alacritty-shell-entrypoint" '' -- cgit v1.2.3