From b0c76a22196d04fe87487ba3cce72a458c7165e6 Mon Sep 17 00:00:00 2001 From: CherryKitten Date: Sun, 24 Mar 2024 19:02:51 +0100 Subject: [PATCH] fish vim bindings :3 --- modules/home/fish/default.nix | 12 +----------- modules/home/starship.nix | 11 ++++++++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/home/fish/default.nix b/modules/home/fish/default.nix index 7b1032d..1c4eef9 100644 --- a/modules/home/fish/default.nix +++ b/modules/home/fish/default.nix @@ -4,6 +4,7 @@ interactiveShellInit = '' set -g fish_greeting + set -g fish_key_bindings fish_vi_key_bindings export GPG_TTY="$(tty)" export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent @@ -15,15 +16,4 @@ }; }; - - home.file = { - fish_prompt = { - source = ./fish_prompt.fish; - target = ".config/fish/functions/fish_prompt.fish"; - }; - fish_right_prompt = { - source = ./fish_right_prompt.fish; - target = ".config/fish/functions/fish_right_prompt.fish"; - }; - }; } diff --git a/modules/home/starship.nix b/modules/home/starship.nix index 54620bb..7bea9d3 100644 --- a/modules/home/starship.nix +++ b/modules/home/starship.nix @@ -8,6 +8,7 @@ "[│](bold green)$username$hostname:$directory" "$line_break" "[└─>](bold green)" + "$character" ]; username = { style_user = "red bold"; @@ -37,6 +38,15 @@ disabled = false; }; + character = { + success_symbol = "[❯](bold green)"; + error_symbol = "[X](bold red)"; + vimcmd_symbol = "[N](bold green)"; + vimcmd_replace_one_symbol = "[R](bold purple)"; + vimcmd_replace_symbol = "[R](bold purple)"; + vimcmd_visual_symbol = "[V](bold yellow)"; + }; + right_format = lib.concatStrings [ "$vcsh" "$fossil_branch" @@ -113,7 +123,6 @@ "$os" "$container" "$shell" - "$character" ]; }; };