1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-28 02:37:09 +00:00

lnl: use environment.d

This commit is contained in:
Daiderd Jordan 2018-08-23 00:13:03 +02:00
parent b1e32f0789
commit 90c34df929
No known key found for this signature in database
GPG key ID: D02435D05B810C96

View file

@ -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"