From 56af3a2118afb681b4f9a173cc8edd91794e9a6a Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Thu, 28 Dec 2023 18:23:28 +0100 Subject: [PATCH] Clean up fish config add nh alias "nrs" for easy system rebuild remove custom tide prompt colors (they looked ugly) remove vim abbreviations --- home/features/cli/fish.nix | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix index 4a627ba..3dacd79 100644 --- a/home/features/cli/fish.nix +++ b/home/features/cli/fish.nix @@ -8,7 +8,6 @@ hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages; hasRipgrep = hasPackage "ripgrep"; hasExa = hasPackage "eza"; - hasNeovim = config.programs.neovim.enable; hasLazygit = config.programs.lazygit.enable; hasLazydocker = hasPackage "lazydocker"; hasNixYourShell = hasPackage "nix-your-shell"; @@ -53,6 +52,7 @@ in { hx = "~/Documents/heliox-cli/target/debug/heliox-cli --mode"; slp = "systemctl suspend"; sdn = "shutdown 0"; + nrs = "nh os switch ~/.setup"; }; shellAbbrs = rec { jqless = "jq -C | less -r"; @@ -65,41 +65,14 @@ in { nbn = "nix build nixpkgs#"; nf = "nix flake"; - nr = "nixos-rebuild --flake ."; - nrs = "nixos-rebuild --flake . switch"; - snr = "sudo nixos-rebuild --flake ."; - snrs = "sudo nixos-rebuild --flake . switch"; - hm = "home-manager --flake ."; - hms = "home-manager --flake . switch"; - ls = mkIf hasExa "eza"; exa = mkIf hasExa "eza"; - - vim = mkIf hasNeovim "nvim"; - vi = vim; - v = vim; }; functions = { # Disable greeting fish_greeting = ""; fish_init_custom = '' - #Variable names: https://github.com/IlanCosman/tide/blob/main/functions/tide/configure/configs/rainbow.fish - #Tide base tide configure --auto --style=Rainbow --prompt_colors='True color' --show_time=No --rainbow_prompt_separators=Vertical --powerline_prompt_heads=Slanted --powerline_prompt_tails=Flat --powerline_prompt_style='Two lines, frame' --prompt_connection=Solid --powerline_right_prompt_frame=No --prompt_connection_andor_frame_color=Darkest --prompt_spacing=Compact --icons='Many icons' --transient=Yes - - #OS module - set tide_os_bg_color ${config.colorScheme.colors.base07} - - #PWD module - set tide_pwd_bg_color ${config.colorScheme.colors.base0D} - set tide_pwd_color_dirs ${config.colorScheme.colors.base02} - set tide_pwd_color_truncated_dirs ${config.colorScheme.colors.base04} - set tide_pwd_color_anchors ${config.colorScheme.colors.base02} - - #Git module - set tide_git_bg_color ${config.colorScheme.colors.base0B} - set tide_git_bg_color_unstable ${config.colorScheme.colors.base0A} - set tide_git_bg_color_urgent ${config.colorScheme.colors.base08} ''; }; };