aboutsummaryrefslogtreecommitdiff
path: root/fish
diff options
context:
space:
mode:
authorBlista Kanjo2022-04-22 11:11:32 -0400
committerBlista Kanjo2022-04-22 11:11:32 -0400
commitb175b1f00eb3cab70f69aad6d27398f35a636710 (patch)
treedfe158b7e80c5d593c531457554a47f83331c772 /fish
parent59b2275aa46d9bbd28c08929087ac9adc9636223 (diff)
new "simpler" fish prompt
Diffstat (limited to 'fish')
-rw-r--r--fish/config.fish3
-rw-r--r--fish/fish_variables3
-rw-r--r--fish/functions/fish_prompt.fish26
3 files changed, 28 insertions, 4 deletions
diff --git a/fish/config.fish b/fish/config.fish
index 38d223a..bb50ce7 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -2,9 +2,6 @@ if status is-interactive
# Commands to run in interactive sessions can go here
alias ls="lsd --group-dirs first -h --icon-theme unicode -L"
- alias qw="cat to-do"
- alias eqw="vim to-do"
- alias sf="mplayer tv:// -tv driver=v4l2:device=/dev/video0:width=1280:height=720:fps=30:outfmt=yuy2"
alias s="cd ~/.local/share/scripts && lsd --group-dirs first -h --icon-theme unicode -L"
export PF_INFO="ascii title os kernel uptime pkgs memory"
diff --git a/fish/fish_variables b/fish/fish_variables
index 53d9852..7a0382c 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -3,7 +3,7 @@
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_1_0:\x1d
SETUVAR __fish_init_3_x:\x1d
-SETUVAR __fish_initialized:3100
+SETUVAR __fish_initialized:3400
SETUVAR fish_color_autosuggestion:555\x1ebrblack
SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:005fd7
@@ -33,3 +33,4 @@ SETUVAR fish_pager_color_completion:\x1d
SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..57ce705
--- /dev/null
+++ b/fish/functions/fish_prompt.fish
@@ -0,0 +1,26 @@
+set -g __fish_git_prompt_show_informative_status 1
+set -g __fish_git_prompt_hide_untrackedfiles 1
+set -g __fish_git_prompt_showcolorhints 1
+
+set -g __fish_git_prompt_color_branch magenta --bold
+set -g __fish_git_prompt_showupstream "informative"
+set -g __fish_git_prompt_char_upstream_ahead "↑"
+set -g __fish_git_prompt_char_upstream_behind "↓"
+set -g __fish_git_prompt_char_upstream_prefix ""
+
+set -g __fish_git_prompt_char_stagedstate "•"
+set -g __fish_git_prompt_char_dirtystate "+"
+set -g __fish_git_prompt_char_untrackedfiles "…"
+set -g __fish_git_prompt_char_conflictedstate "x"
+set -g __fish_git_prompt_char_cleanstate "✓"
+
+set -g __fish_git_prompt_color_dirtystate blue
+set -g __fish_git_prompt_color_stagedstate yellow
+set -g __fish_git_prompt_color_invalidstate red
+set -g __fish_git_prompt_color_untrackedfiles $fish_color_normal
+set -g __fish_git_prompt_color_cleanstate green --bold
+
+function fish_prompt
+ printf '%s%s%s%s $ ' \
+ (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) (fish_git_prompt)
+end