Choose EMAIL via home-manager
Alan Pearce alan@alanpearce.eu
Sun, 13 Oct 2019 12:40:58 +0200
3 files changed, 4 insertions(+), 31 deletions(-)
M user/satoshipad.nix → user/satoshipad.nix
@@ -24,6 +24,8 @@ ./settings/xresources.nix ./settings/zsh.nix ]; + home.sessionVariables.EMAIL = "alan@satoshipay.io"; + xsession.windowManager.i3 = { config = { assigns = {
M user/settings/base.nix → user/settings/base.nix
@@ -1,4 +1,4 @@-{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { # Let Home Manager install and manage itself. @@ -6,6 +6,7 @@ programs.home-manager.enable = true; manual = { html.enable = true; }; + home.sessionVariables.EMAIL = lib.mkDefault "alan@alanpearce.eu"; home.packages = with pkgs; [ pv fd
M user/settings/zsh.nix → user/settings/zsh.nix
@@ -258,29 +258,6 @@ ngc = "nix-collect-garbage --delete-older-than 14d"; }; envExtra = '' - case $OSTYPE in - darwin*) - os=darwin - ;; - linux-gnu) - os=linux - ;; - freebsd*) - os=freebsd - ;; - *) - os=unknown - ;; - esac - - case $MACHTYPE in - *64) - arch=amd64 - ;; - *) - arch=386 - ;; - esac if [[ ''${path[(I)$HOME/.local/bin ]} ]] then path+=($HOME/.local/bin) @@ -289,13 +266,6 @@ if [[ ''${path[(I)$HOME/go/bin ]} ]] then path+=($HOME/go/bin) - fi - - if [[ $HOST =~ satoshi ]] - then - EMAIL=alan@satoshipay.io - else - EMAIL=alan@alanpearce.eu fi '';