diff --git a/overlays/default.nix b/overlays/default.nix index 36444b6..32a91de 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -47,6 +47,17 @@ in withHiredis = false; }; + zsh-fzf-tab = prev.zsh-fzf-tab.overrideAttrs (_: rec { + version = "1.1.1"; + src = fetchFromGitHub { + owner = "Aloxaf"; + repo = "fzf-tab"; + rev = "v${version}"; + sha256 = "sha256-0/YOL1/G2SWncbLNaclSYUz7VyfWu+OB8TYJYm4NYkM="; + }; + + }); + gnome-break-timer = callPackage ../pkgs/gnome-break-timer { }; jmri = callPackage ../pkgs/jmri { }; adguardian-term = callPackage ../pkgs/adguardian-term { }; diff --git a/shared/zsh.nix b/shared/zsh.nix index c994304..3e6c9e3 100644 --- a/shared/zsh.nix +++ b/shared/zsh.nix @@ -3,7 +3,6 @@ programs.command-not-found.enable = false; programs.nix-index-database.comma.enable = true; environment.systemPackages = with pkgs; [ - # fzf bat eza duf @@ -12,6 +11,7 @@ iperf ]; users.defaultUserShell = pkgs.zsh; + programs.fzf.enable = true; programs.zsh = { enable = true; shellAliases = { @@ -49,7 +49,7 @@ function svpn() { - unit=$(systemctl list-unit-files | grep "openconnect\|wg-quick\|wireguard\|openvpn\|openfortivpn" | cut -d "." -f1 | fzf --preview 'systemctl status {}') + unit=$(systemctl list-unit-files | grep "openconnect\|wg-quick\|wireguard\|openvpn\|openfortivpn" | cut -d "." -f1 | ${pkgs.fzf}/bin/fzf --preview 'systemctl status {}') if [ $(systemctl is-active $unit) = "inactive" ]; then systemctl start $unit else @@ -85,10 +85,10 @@ ''; promptInit = '' - if [[ "$(hostname)" == "thinkpad" ]] - then - cat ${../images/cat.sixel} - fi + # if [[ "$(hostname)" == "thinkpad" ]] + # then + # cat ${../images/cat.sixel} + # fi eval "$(${pkgs.mcfly}/bin/mcfly init zsh)" eval "$(${pkgs.zoxide}/bin/zoxide init zsh)" '';