revamp with nix flakes + desktop config

1 files changed, 16 insertions, 5 deletions

diff --git a/common/commandline/zsh.nix b/common/commandline/zsh.nix
index 3376321..28899b1 100644
--- a/common/commandline/zsh.nix
+++ b/common/commandline/zsh.nix
@@ -1,3 +1,5 @@
+inputs:
+
 { config, lib, pkgs, ... }:
 
 with import ../../lib/theme.nix { inherit lib; };
@@ -13,9 +15,6 @@ in
       source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
       is4 && xsource "${pkgs.grml-zsh-config}/etc/zsh/keephack"
 
-      PATH="${pkgs.pazi}/bin:$PATH"
-      eval "$(pazi init zsh)"
-
       source "${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh"
 
       function () {
@@ -30,8 +29,6 @@ in
         (mapAttrsToList
           (variable: value: "${variable}=\"${value}\"")
           config.programs.less.envVariables)}
-
-      #eval "$(${pkgs.starship}/bin/starship init zsh)"
     '';
 
     # otherwise it'll override the grml prompt
@@ -56,4 +53,18 @@ in
   };
 
   users.defaultUserShell = pkgs.zsh;
+
+  home-manager.users.minijackson = { ... }: {
+    # Allows zsh config from home-manager
+    programs.zsh = {
+      enable = true;
+      # Completion is already handled by the GRML conf
+      enableCompletion = false;
+    };
+  };
+
+  home-manager.users.root = { ... }: {
+    programs.zsh =
+      lib.mkDefault config.home-manager.users.minijackson.programs.zsh;
+  };
 }