From 42842153d69cce5ba5a64e433761adcf3893bd34 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 17 Jan 2023 12:32:42 -0600 Subject: [PATCH] WIP --- modules/configuration.nix | 18 ------------------ modules/environment.nix | 18 +++++++++--------- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index b566409..90d964a 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -49,9 +49,6 @@ (nerdfonts.override { fonts = [ "FiraCode" "FiraMono" ]; }) ]; - # for compatibility add zsh to list of /etc/shells - environment.shells = with pkgs; [ zsh ]; - environment.systemPackages = with pkgs; [ 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"; - }; - } diff --git a/modules/environment.nix b/modules/environment.nix index 09ad785..aa77a9a 100644 --- a/modules/environment.nix +++ b/modules/environment.nix @@ -5,17 +5,17 @@ environment.shells = with pkgs; [ zsh ]; environment.etc = { - issue.source = ./etc/issue; + issue.source = ../etc/issue; }; - environment.variables = { - NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ - stdenv.cc.cc - openssl + # 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"; - }; + # zlib # for delta + # ]; + # NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; + # }; }