This commit is contained in:
Daylin Morgan 2023-01-17 12:32:42 -06:00
parent 64293ab8bf
commit 42842153d6
2 changed files with 9 additions and 27 deletions

View file

@ -49,9 +49,6 @@
(nerdfonts.override { fonts = [ "FiraCode" "FiraMono" ]; }) (nerdfonts.override { fonts = [ "FiraCode" "FiraMono" ]; })
]; ];
# for compatibility add zsh to list of /etc/shells
environment.shells = with pkgs; [ zsh ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fuse fuse
@ -108,19 +105,4 @@
]; ];
environment.etc = {
issue.source = ./etc/issue;
};
environment.variables = {
NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
stdenv.cc.cc
openssl
zlib # for delta
];
NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
};
} }

View file

@ -5,17 +5,17 @@
environment.shells = with pkgs; [ zsh ]; environment.shells = with pkgs; [ zsh ];
environment.etc = { environment.etc = {
issue.source = ./etc/issue; issue.source = ../etc/issue;
}; };
environment.variables = { # environment.variables = {
NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ # NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
stdenv.cc.cc # stdenv.cc.cc
openssl # openssl
zlib # for delta # zlib # for delta
]; # ];
NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; # NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
}; # };
} }