From 0211fa66b991cebfabcdc2e59539acccc1daf304 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 12 Nov 2018 23:20:08 +0100
Subject: [PATCH] nix/os: make zsh the default shell for common systems

---
 nix/os/profiles/common/system.nix    | 23 ++---------------------
 nix/os/profiles/graphical/system.nix |  3 ---
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/nix/os/profiles/common/system.nix b/nix/os/profiles/common/system.nix
index d7a596f..08e49f7 100644
--- a/nix/os/profiles/common/system.nix
+++ b/nix/os/profiles/common/system.nix
@@ -65,25 +65,6 @@
     mv -Tf /lib64/.ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
   '';
 
-  programs.zsh = {
-    enable = false;
-# TODO: basic zsh config
-#    enableAutosuggestions = true; #    enableCompletion = true;
-#    syntaxHighlighting.enable = true;
-#    syntaxHighlighting.patterns = {};
-#    ohMyZsh = {
-#      enable = true;
-#      theme = "tjkirch";
-#    };
-#    promptInit = ''
-#      autoload -U promptinit
-#      promptinit
-#      ZSH_THEME_GIT_PROMPT_PREFIX='@ '
-#      PROMPT='%F{%(!.red.green)}%n%f@%m %(?.%F{green}✓%f.%F{red}✗ ($?%))%f %F{blue}%~%f %F{magenta}$(git_prompt_info)%f
-#%_%F{%(!.red.green)}$(prompt_char)%f '
-#      RPROMPT=""
-#    '';
-#    interactiveShellInit = ''
-#    '';
-  };
+  users.defaultUserShell = pkgs.zsh;
+  environment.pathsToLink = [ "/share/zsh" ];
 }
diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix
index a924cf8..bfcd3e6 100644
--- a/nix/os/profiles/graphical/system.nix
+++ b/nix/os/profiles/graphical/system.nix
@@ -16,9 +16,6 @@
   };
   services.resolved.enable = false;
 
-  users.defaultUserShell = pkgs.zsh;
-  environment.pathsToLink = [ "/share/zsh" ];
-
   # hardware related services
   services.illum.enable = true;
   services.pcscd.enable = true;