From 590bd06ced36ac18b9a0b7cb0816b854b215904e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 5 Jan 2017 23:30:26 +0100 Subject: [PATCH] environment: set cacert variables by default --- modules/environment/default.nix | 4 +++- modules/examples/lnl.nix | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/environment/default.nix b/modules/environment/default.nix index d5cd419..5fa222e 100644 --- a/modules/environment/default.nix +++ b/modules/environment/default.nix @@ -135,7 +135,9 @@ in { ''; environment.variables = - { EDITOR = mkDefault "nano"; + { GIT_SSL_CAINFO = mkDefault "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + SSL_CERT_FILE = mkDefault "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + EDITOR = mkDefault "nano"; PAGER = mkDefault "less -R"; }; diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 19caec4..f1147bd 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -126,9 +126,6 @@ environment.variables.HOMEBREW_CASK_OPTS = "--appdir=/Applications/cask"; - environment.variables.GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - environment.variables.SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - environment.shellAliases.l = "ls -lh"; environment.shellAliases.ls = "ls -G"; environment.shellAliases.g = "git log --pretty=color -32";