From 06c4893c0541b97b59382252eefc74e1e6dc2672 Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@cock.li>
Date: Wed, 14 Feb 2024 15:38:28 +0100
Subject: [PATCH] move all zsh options to the module

---
 hosts/niks/configuration.nix | 5 -----
 modules/cli/zsh.nix          | 9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix
index b55b2db..752328c 100644
--- a/hosts/niks/configuration.nix
+++ b/hosts/niks/configuration.nix
@@ -138,14 +138,9 @@
     users.users.${config'.username} = {
         isNormalUser = true;
         extraGroups = [ "wheel" "networkmanager" "libvirtd" ];
-        shell = pkgs.zsh;
     };
 
-    programs.zsh.enable = true;
-
     environment = {
-        shells = [ pkgs.zsh ];
-        pathsToLink = [ "/share/zsh" ];
         sessionVariables = {
             TERM = "foot";
             EDITOR = "${pkgs.neovim}/bin/nvim";
diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix
index dfe2daa..960bbf2 100644
--- a/modules/cli/zsh.nix
+++ b/modules/cli/zsh.nix
@@ -22,6 +22,15 @@ in {
     };
 
     config = mkIf cfg.enable {
+        programs.zsh.enable = true;
+
+        users.users.${config'.username}.shell = pkgs.zsh;
+
+        environment = {
+            shells = [ pkgs.zsh ];
+            pathsToLink = [ "/share/zsh" ];
+        };
+
         home-manager.users.${config'.username} = {
               programs.zsh = {
                   enable = true;