From 33fa3b639add410a450a2aa7f3d95cb6b300b592 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 6 Dec 2023 02:13:29 +0300 Subject: [PATCH] Revert "Use all env vars for nushell" This reverts commit b86f2a7fd2653c8c799cca0b570619b5548630a3. --- machines/enka/bat/default.nix | 2 +- machines/enka/helix/default.nix | 5 ++--- machines/enka/nushell/default.nix | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/machines/enka/bat/default.nix b/machines/enka/bat/default.nix index 231d29d..3d342aa 100644 --- a/machines/enka/bat/default.nix +++ b/machines/enka/bat/default.nix @@ -1,7 +1,7 @@ { theme, homeConfiguration, enabled, ... }: homeConfiguration [ "nixos" "root" ] { - home.sessionVariables = { + programs.nushell.environmentVariables = { MANPAGER = ''"bat --plain --language man"''; PAGER = ''"bat --plain"''; }; diff --git a/machines/enka/helix/default.nix b/machines/enka/helix/default.nix index 75b6008..278bfc1 100644 --- a/machines/enka/helix/default.nix +++ b/machines/enka/helix/default.nix @@ -1,11 +1,10 @@ { lib, pkgs, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate (homeConfiguration [ "nixos" "root" ] { - programs.nushell.shellAliases.x = "hx"; + programs.nushell.environmentVariables.EDITOR = "hx"; + programs.nushell.shellAliases.x = "hx"; programs.helix = enabled { - defaultEditor = true; - settings.theme = "base16_transparent"; settings.editor = { diff --git a/machines/enka/nushell/default.nix b/machines/enka/nushell/default.nix index 78d0eb5..5208bad 100644 --- a/machines/enka/nushell/default.nix +++ b/machines/enka/nushell/default.nix @@ -11,7 +11,9 @@ configFile.source = ./configuration.nu; envFile.source = ./environment.nu; - environmentVariables = config.environment.variables; + environmentVariables = { + inherit (config.environment.variables) NIX_LD; + }; shellAliases = { cdtmp = "cd (mktemp --directory)";