From 9bcfed26290c4eb78a07cc08de2cc390356d086b Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 12 Apr 2024 11:01:18 +0200
Subject: [PATCH 1/2] iso: misc fixes

---
 hosts/iso/default.nix |  1 -
 hosts/iso/zsh.nix     | 27 ---------------------------
 shared/nix.nix        |  4 ++--
 shared/zsh.nix        |  2 +-
 4 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 hosts/iso/zsh.nix

diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix
index d04328d..7797518 100644
--- a/hosts/iso/default.nix
+++ b/hosts/iso/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
-    ./zsh.nix
   ];
 
   console = {
diff --git a/hosts/iso/zsh.nix b/hosts/iso/zsh.nix
deleted file mode 100644
index db73b7f..0000000
--- a/hosts/iso/zsh.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ 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 cb5c735..b5411a4 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 3e6c9e3..0588bd8 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.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
         source ${pkgs.agdsn-zsh-config}/etc/zsh/zshrc
+        source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
         unsetopt extendedglob
 
       

From 5def708423e174acc902e5f14526e6d65099dcc5 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 12 Apr 2024 20:50:04 +0200
Subject: [PATCH 2/2] iso: add nix-index module

---
 flake.lock | 6 +++---
 flake.nix  | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 39f29dd..ed028d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712608508,
-        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
+        "lastModified": 1712791164,
+        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
+        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f605419..710abc2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -152,6 +152,8 @@
             ./hosts/iso
             ./shared/vim.nix
             ./shared/tmux.nix
+            ./shared/zsh.nix
+            nix-index-database.nixosModules.nix-index
           ];
         };
       };