diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-23 00:13:03 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-08-23 00:13:03 +0200 |
| commit | 90c34df929df878429eeca090a19201a21cc95bd (patch) | |
| tree | edbb2f6806a7b3d1c99425c62437a004766701e2 /modules/examples | |
| parent | b1e32f07898f74e24a4b58132b40a3ba3be2bd55 (diff) | |
lnl: use environment.d
Diffstat (limited to 'modules/examples')
| -rw-r--r-- | modules/examples/lnl.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 73005ac..189513c 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -295,9 +295,6 @@ zle -N up-line-or-beginning-search ''; - environment.variables.CLICOLOR = "1"; - environment.variables.FZF_DEFAULT_COMMAND = "ag -l -f -g ''"; - environment.variables.SHELLCHECK_OPTS = "-e SC1008"; environment.variables.LANG = "en_US.UTF-8"; environment.shellAliases.e = "$EDITOR"; @@ -312,6 +309,15 @@ environment.shellAliases.grh = "git reset --hard"; environment.shellAliases.l = "ls -lh"; + environment.extraInit = '' + # Load and export variables from environment.d. + if [ -d /etc/environment.d ]; then + set -a + . /etc/environment.d/* + set +a + fi + ''; + nix.nixPath = [ # Use local nixpkgs checkout instead of channels. "darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix" |