From b12e780bb1217e1508ec358def6cdbcede668b43 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sat, 19 Jul 2025 21:06:57 +0300 Subject: [PATCH] vivid: use ifd and apply to environment.variables --- modules/common/nushell/default.nix | 4 ---- modules/common/shell/vivid.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/common/nushell/default.nix b/modules/common/nushell/default.nix index c890b6f..8ca18a8 100644 --- a/modules/common/nushell/default.nix +++ b/modules/common/nushell/default.nix @@ -13,10 +13,6 @@ in { configFile.text = readFile ./config.nu; - extraConfig = /* nu */ '' - $env.LS_COLORS = open ${config.environment.ls-colors} - ''; - environmentVariables = let variablesMap = { HOME = config'.home.homeDirectory; diff --git a/modules/common/shell/vivid.nix b/modules/common/shell/vivid.nix index bee8b3e..0c4520c 100644 --- a/modules/common/shell/vivid.nix +++ b/modules/common/shell/vivid.nix @@ -1,9 +1,9 @@ { lib, pkgs, ... }: let - inherit (lib) getExe mkConst; - - lsColors = pkgs.runCommand "ls_colors.txt" {} '' - ${getExe pkgs.vivid} generate gruvbox-dark-hard > $out - ''; + inherit (lib) getExe readFile; in { - options.environment.ls-colors = mkConst lsColors; + # Yes, IFD. Deal with it. + environment.variables.LS_COLORS = readFile <| + pkgs.runCommand "ls_colors.txt" {} '' + ${getExe pkgs.vivid} generate gruvbox-dark-hard > $out + ''; }