From 53bd455c28aa3d34457d65edde59801eed737469 Mon Sep 17 00:00:00 2001 From: pagedMov Date: Thu, 10 Oct 2024 20:14:20 -0400 Subject: [PATCH] Gen 297: fixed bugs introduced by the previous commit --- glasshouse-desktop/home/eza.nix | 2 +- glasshouse-desktop/home/starship.nix | 6 +----- glasshouse-desktop/home/zsh/zshell.nix | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/glasshouse-desktop/home/eza.nix b/glasshouse-desktop/home/eza.nix index 722ec55..42b5479 100644 --- a/glasshouse-desktop/home/eza.nix +++ b/glasshouse-desktop/home/eza.nix @@ -3,7 +3,7 @@ { programs.eza = { enable = true; - enableZshIntegration = true; + enableZshIntegration = false; extraOptions = [ "-1" "-h" "--group-directories-first" ]; icons = true; git = true; diff --git a/glasshouse-desktop/home/starship.nix b/glasshouse-desktop/home/starship.nix index aeecdb0..2e76268 100644 --- a/glasshouse-desktop/home/starship.nix +++ b/glasshouse-desktop/home/starship.nix @@ -3,11 +3,7 @@ { programs.starship = { enable = true; - - enableBashIntegration = true; - enableZshIntegration = true; - enableNushellIntegration = true; - + enableZshIntegration = false; settings = { # right_format = "$cmd_duration"; diff --git a/glasshouse-desktop/home/zsh/zshell.nix b/glasshouse-desktop/home/zsh/zshell.nix index 89fac35..adacec8 100644 --- a/glasshouse-desktop/home/zsh/zshell.nix +++ b/glasshouse-desktop/home/zsh/zshell.nix @@ -158,7 +158,10 @@ nsp() { nix-shell -p "$@" --run zsh } autoload -U down-line-or-beginning-search; zle -N down-line-or-beginning-search bindkey -v - + type starship_zle-keymap-select >/dev/null || \ + { + eval "$(starship init zsh)" + } clear splash s_check && (aplay ~/sound/sys/sh-source.wav > /dev/null 2>&1 &)