From b53a05c7a0941ce8b7a480d9cbf317578dbac031 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 8 Nov 2019 23:22:35 +0100
Subject: zsh: fix global compinit setting breaking darwin

---
 system/settings/programs/shell.nix |  1 -
 user/settings/nixos.nix            | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix
index 4dd65c4a..a8d4f56f 100644
--- a/system/settings/programs/shell.nix
+++ b/system/settings/programs/shell.nix
@@ -3,7 +3,6 @@
 { programs.zsh = {
     enable = true;
     promptInit = "";
-    enableGlobalCompInit = false;
   };
   programs.bash.enableCompletion = true;
 }
diff --git a/user/settings/nixos.nix b/user/settings/nixos.nix
index cf098b21..526d8ea5 100644
--- a/user/settings/nixos.nix
+++ b/user/settings/nixos.nix
@@ -12,14 +12,17 @@
     })
   ];
 
-  programs.zsh.shellAliases = {
-    nor = "nixos-rebuild";
-    snor = "sudo nixos-rebuild";
-    nors = "nixos-rebuild switch";
-    snors = "sudo nixos-rebuild switch";
-    norb = "nixos-rebuild boot";
-    snorb = "sudo nixos-rebuild boot";
-    norr = "nixos-rebuild switch --rollback";
-    snorr = "sudo nixos-rebuild switch --rollback";
+  programs.zsh = {
+    enableGlobalCompInit = false;
+    shellAliases = {
+      nor = "nixos-rebuild";
+      snor = "sudo nixos-rebuild";
+      nors = "nixos-rebuild switch";
+      snors = "sudo nixos-rebuild switch";
+      norb = "nixos-rebuild boot";
+      snorb = "sudo nixos-rebuild boot";
+      norr = "nixos-rebuild switch --rollback";
+      snorr = "sudo nixos-rebuild switch --rollback";
+    };
   };
 }
-- 
cgit 1.4.1