From 2006018e7a280f70c9a7d9efc70632fbb86059ac Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Tue, 8 Jul 2025 01:17:08 +0000 Subject: .source -> .text where possible --- modules/terminal/system/programs/fish.nix | 49 ++++--------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) (limited to 'modules/terminal/system/programs/fish.nix') diff --git a/modules/terminal/system/programs/fish.nix b/modules/terminal/system/programs/fish.nix index 7ce525f..204a048 100644 --- a/modules/terminal/system/programs/fish.nix +++ b/modules/terminal/system/programs/fish.nix @@ -6,66 +6,29 @@ }: let cfg = config.collinux.terminal.shells.fish; - scripts.cool-cd = pkgs.writeShellScriptBin "cd.sh" '' - if git rev-parse --is-inside-work-tree; then - cd $(fd . "$(git rev-parse --show-toplevel)" --type dir | fzf) - else - cd $(fd . --type dir | fzf) - fi - ''; - - init = pkgs.writeText "config.fish" '' + init = '' set fish_greeting - function starship_transient_prompt_func - ${pkgs.starship}/bin/starship module character - end - - function cool-cd - if git rev-parse --is-inside-work-tree &>/dev/null - set dirs (fd . (git rev-parse --show-toplevel) --type dir) - else - set dirs (fd . --type dir) - end - - if test -z "$dirs" - exit - end - - cd (echo "$dirs" | fzf) - end - if status is-interactive alias cat bat + set -x BAT_THEME "base16" - alias eza "eza -A -w 80 --group-directories-first -I '.git*'" - alias ls eza - alias tree "ls -T" + alias ls "${pkgs.eza}/bin/eza -A -w 80 --group-directories-first -I '.git*'" + alias tree "${pkgs.eza}/bin/eza -T" ${pkgs.fzf}/bin/fzf --fish | source - ${pkgs.starship}/bin/starship init fish | source - ${pkgs.broot}/bin/broot --print-shell-function fish | source + set -x FZF_DEFAULT_OPTS "--color bg:#1E1E2E,bg+:#313244,border:#313244,fg:#CDD6F4,fg+:#CDD6F4,header:#F38BA8,hl:#F38BA8,hl+:#F38BA8,info:#CBA6F7,label:#CDD6F4,marker:#B4BEFE,pointer:#F5E0DC,prompt:#CBA6F7,selected-bg:#45475A,spinner:#F5E0DC" ${pkgs.pay-respects}/bin/pay-respects fish --alias | source - # extra bindings - bind 'alt-c' cool-cd - - enable_transience - - # env vars - set -x EDITOR hx set -x NH_FLAKE "$HOME/nixos" - - set -x BAT_THEME "base16" - set -x FZF_DEFAULT_OPTS "--color bg:#1E1E2E,bg+:#313244,border:#313244,fg:#CDD6F4,fg+:#CDD6F4,header:#F38BA8,hl:#F38BA8,hl+:#F38BA8,info:#CBA6F7,label:#CDD6F4,marker:#B4BEFE,pointer:#F5E0DC,prompt:#CBA6F7,selected-bg:#45475A,spinner:#F5E0DC" end ''; in lib.mkIf cfg.enable { hjem.users."${config.collinux.user.name}" = { files = { - ".config/fish/config.fish".source = init; + ".config/fish/config.fish".text = init; }; packages = with pkgs; [ -- cgit v1.3.1