From c78ee394333fde97ae7bc5e1f1a38d23d3f32227 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Wed, 12 Jun 2024 11:11:44 -0400 Subject: [PATCH] fix(fzf): Fix paths --- modules/home-manager/fzf.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/home-manager/fzf.nix b/modules/home-manager/fzf.nix index ae3cb54..286f7dd 100644 --- a/modules/home-manager/fzf.nix +++ b/modules/home-manager/fzf.nix @@ -1,17 +1,22 @@ { config, lib, ... }: -let cfg = config.programs.fzf.tokyonight; +let + cfg = config.programs.fzf.tokyonight; + themes = { + day = builtins.readFile ../../resources/fzf/tokyonight_day.sh; + night = builtins.readFile ../../resources/fzf/tokyonight_night.sh; + moon = builtins.readFile ../../resources/fzf/tokyonight_moon.sh; + storm = builtins.readFile ../../resources/fzf/tokyonight_storm.sh; + }; in { options.programs.fzf.tokyonight = lib.tn.mkTokyonightOpt "tokyonight fzf"; config = lib.mkMerge [ (lib.mkIf cfg.enable { - programs = { + programs = let shell_theme = themes.${cfg.style}; + in { # these are .zsh files, but the syntax is compatible - fish.interactiveShellInit = - builtins.readFile ../../resources/fzf/tokyonight_${cfg.style}.sh; - bash.initExtra = - builtins.readFile ../../resources/fzf/tokyonight_${cfg.style}.sh; - zsh.initExtra = - builtins.readFile ../../resources/fzf/tokyonight_${cfg.style}.sh; + fish.interactiveShellInit = shell_theme; + bash.initExtra = shell_theme; + zsh.initExtra = shell_theme; }; }) ];