From f8f5398d96b34adb178b9b73ee8228e78eddd329 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 22 Aug 2023 19:10:12 +0200
Subject: Remove zsh config

---
 system/settings/base.nix           |  4 ----
 system/settings/darwin.nix         | 14 --------------
 system/settings/programs/shell.nix | 20 --------------------
 system/settings/user-interface.nix |  2 --
 4 files changed, 40 deletions(-)

(limited to 'system/settings')

diff --git a/system/settings/base.nix b/system/settings/base.nix
index aa071871..2fd7be1f 100644
--- a/system/settings/base.nix
+++ b/system/settings/base.nix
@@ -5,8 +5,4 @@
 }: {
   boot.loader.timeout = lib.mkDefault 1;
   services.irqbalance.enable = true;
-
-  programs.zsh = {
-    histFile = "\${XDG_DATA_HOME}/zsh/history";
-  };
 }
diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix
index ac5dbf15..14a2b83b 100644
--- a/system/settings/darwin.nix
+++ b/system/settings/darwin.nix
@@ -26,20 +26,6 @@
     allowUnfree = true;
   };
 
-  programs.zsh = {
-    enable = true;
-    loginShellInit = ''
-      source /System/Library/Templates/Data/private/etc/zprofile
-    '';
-    interactiveShellInit = ''
-      if [[ "$(/usr/bin/locale LC_CTYPE)" == "UTF-8" ]]; then
-        setopt COMBINING_CHARS
-      fi
-      # Useful support for interacting with Terminal.app or other terminal programs
-      [[ -r "/etc/zshrc_$TERM_PROGRAM" ]] && . "/etc/zshrc_$TERM_PROGRAM"
-    '';
-  };
-
   environment.systemPackages = with pkgs; [
     watch
     coreutils-prefixed
diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix
index 3c8c3f4f..87372033 100644
--- a/system/settings/programs/shell.nix
+++ b/system/settings/programs/shell.nix
@@ -2,26 +2,6 @@
 , pkgs
 , ...
 }: {
-  programs.zsh =
-    {
-      enable = true;
-      enableBashCompletion = true;
-      promptInit = "";
-    }
-    // (
-      # Either of these will call `compinit`, causing >2s startup time
-      # Do it in home-manager instead
-      if pkgs.stdenv.isDarwin
-      then {
-        enableCompletion = false;
-      } else {
-        enableGlobalCompInit = false;
-      }
-    );
-  environment.shells = with pkgs; [
-    zsh
-    fish
-  ];
   programs.fish = {
     enable = true;
   };
diff --git a/system/settings/user-interface.nix b/system/settings/user-interface.nix
index cd23d3bd..915c3ec4 100644
--- a/system/settings/user-interface.nix
+++ b/system/settings/user-interface.nix
@@ -6,8 +6,6 @@
   documentation.info.enable = true;
   nixpkgs.config.firefox.enableOfficialBranding = true;
 
-  environment.pathsToLink = [ "/share/zsh" ];
-
   environment.systemPackages = with pkgs; [
     aria2
     pcmanfm
-- 
cgit 1.4.1