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