7 files changed, 18 insertions, 10 deletions
diff --git a/home/apps/kitty.nix b/home/apps/kitty.nix
index 4253446..e1c596e 100644
--- a/home/apps/kitty.nix
+++ b/home/apps/kitty.nix
@@ -14,6 +14,10 @@ in {
       environment = {};
       extraConfig = "";
 
+      shellIntegration = {
+        enableZshIntegration = false;
+      };
+
       settings = {
         # Font
         font_family = config.theme.font.monospace;
diff --git a/home/gpg.nix b/home/gpg.nix
index 5500fec..19d169e 100644
--- a/home/gpg.nix
+++ b/home/gpg.nix
@@ -24,5 +24,6 @@
     enableExtraSocket = true;
     enableSshSupport = true;
     pinentry.package = pkgs.pinentry-curses;
+    enableZshIntegration = false;
   };
 }
diff --git a/home/starship.nix b/home/starship.nix
index 8f0a5f6..5791141 100644
--- a/home/starship.nix
+++ b/home/starship.nix
@@ -5,6 +5,7 @@
 }: {
   programs.starship = {
     enable = true;
+    enableZshIntegration = false;
 
     settings = {
       format = lib.concatStrings [
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index f6706af..92fd0ce 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -11,14 +11,17 @@
       highlight = "fg=#${config.theme.colors.subtext}";
     };
     syntaxHighlighting.enable = true;
+    dotDir = "${config.xdg.configHome}/zsh";
+
+    # update conf
     history.size = 10000;
     profileExtra = lib.fileContents ./zprofile;
     initContent = lib.fileContents ./zshrc;
-    dotDir = "${config.xdg.configHome}/zsh";
+    completionInit = "";
   };
 
   programs.zoxide = {
     enable = true;
-    enableZshIntegration = true;
+    enableZshIntegration = false;
   };
 }
diff --git a/home/zsh/zprofile b/home/zsh/zprofile
index e159154..fc0fd72 100644
--- a/home/zsh/zprofile
+++ b/home/zsh/zprofile
@@ -3,6 +3,3 @@
 if [ -n "$TMUX" ]; then
     return
 fi
-
-# setup homemanager
-source /etc/profiles/per-user/"$USER"/etc/profile.d/hm-session-vars.sh
diff --git a/home/zsh/zshrc b/home/zsh/zshrc
index dbcc1cb..e9a1a10 100644
--- a/home/zsh/zshrc
+++ b/home/zsh/zshrc
@@ -28,9 +28,11 @@ fi
 bindkey -v
 tabs
 
+# completion
 autoload compinit
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+compinit -C
 
+# colors
 autoload -U colors && colors
 setopt promptsubst
 
diff --git a/system/default.nix b/system/default.nix
index 08e131e..eb220ed 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -31,9 +31,6 @@
   # set state version
   system.stateVersion = config.stateVersion;
 
-  # enable nixos-rebuild-ng
-  system.rebuild.enableNg = true;
-
   # use system packages in home manager
   home-manager.useGlobalPkgs = true;
 
@@ -88,8 +85,11 @@
   environment.systemPackages = config.extraPackages;
 
   # system shell
-  programs.zsh.enable = true;
   programs.bash.enable = true;
+  programs.zsh = {
+    enable = true;
+    enableGlobalCompInit = false;
+  };
 
   # use the latest kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;