From 4d73047c68bd178f34d4310dfa50379e08f67668 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 18 Nov 2020 20:20:45 +0100 Subject: trillian: move zsh setup to darwin.nix --- system/settings/darwin.nix | 7 +++++++ system/trillian.nix | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix index f007fb1d..8fe08a4e 100644 --- a/system/settings/darwin.nix +++ b/system/settings/darwin.nix @@ -6,6 +6,13 @@ enableSocketListener = true; }; + programs.zsh = { + enable = true; + enableCompletion = false; # Causes >2s startup time, overlaps home-manager config + enableBashCompletion = true; + loginShellInit = builtins.readFile "/System/Library/Templates/Data/private/etc/zprofile"; + }; + environment.systemPackages = with pkgs; [ watch coreutils-prefixed diff --git a/system/trillian.nix b/system/trillian.nix index d228f691..cd1cc991 100644 --- a/system/trillian.nix +++ b/system/trillian.nix @@ -27,13 +27,6 @@ # programs.nix-index.enable = true; - programs.zsh = { - enable = true; - enableCompletion = false; # Causes >2s startup time, overlaps home-manager config - enableBashCompletion = true; - loginShellInit = builtins.readFile "/System/Library/Templates/Data/private/etc/zprofile"; - }; - environment.variables.LANG = "en_GB.UTF-8"; nix.gc = { -- cgit 1.4.1