diff --git a/flake.lock b/flake.lock
index ed028d6..39f29dd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712791164,
-        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 710abc2..f605419 100644
--- a/flake.nix
+++ b/flake.nix
@@ -152,8 +152,6 @@
             ./hosts/iso
             ./shared/vim.nix
             ./shared/tmux.nix
-            ./shared/zsh.nix
-            nix-index-database.nixosModules.nix-index
           ];
         };
       };
diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix
index 7797518..d04328d 100644
--- a/hosts/iso/default.nix
+++ b/hosts/iso/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
+    ./zsh.nix
   ];
 
   console = {
diff --git a/hosts/iso/zsh.nix b/hosts/iso/zsh.nix
new file mode 100644
index 0000000..db73b7f
--- /dev/null
+++ b/hosts/iso/zsh.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+{
+  programs.command-not-found.enable = false;
+  users.defaultUserShell = pkgs.zsh;
+  programs.fzf = {
+    fuzzyCompletion = true;
+    keybindings = true;
+  };
+  programs.zsh = {
+    enable = true;
+    autosuggestions = {
+      enable = true;
+      highlightStyle = "fg=#00bbbb,bold";
+    };
+    ohMyZsh = {
+      enable = true;
+      theme = "risto";
+    };
+
+    shellInit =
+      ''
+        source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
+        zsh-newuser-install () {}
+      '';
+  };
+}
+
diff --git a/shared/nix.nix b/shared/nix.nix
index b5411a4..cb5c735 100644
--- a/shared/nix.nix
+++ b/shared/nix.nix
@@ -12,11 +12,11 @@
       substituters = [
         "https://cache.rfive.de"
         # temp disabled until logging error is resolved
-        "https://cache.ifsr.de"
+        # "https://cache.ifsr.de"
       ];
       trusted-public-keys = [
         "cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw="
-        "cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
+        # "cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
       ];
     };
   };
diff --git a/shared/zsh.nix b/shared/zsh.nix
index 0588bd8..3e6c9e3 100644
--- a/shared/zsh.nix
+++ b/shared/zsh.nix
@@ -43,8 +43,8 @@
         export MCFLY_RESULTS=30
         export MCFLY_INTERFACE_VIEW=BOTTOM
         export MCFLY_PROMPT="❯"
-        source ${pkgs.agdsn-zsh-config}/etc/zsh/zshrc
         source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
+        source ${pkgs.agdsn-zsh-config}/etc/zsh/zshrc
         unsetopt extendedglob