๐ Backup for my config files
dotfiles
fix code forge icon bug
+15
-34
+5
-8
.config/fish/config.fish
+5
-8
.config/fish/config.fish
···
13
13
set -g dotfiles $HOME/dotfiles
14
14
set -g tmux_config_file $HOME/.tmux.conf
15
15
16
-
# ๏ Read JJ current descriptin
17
-
set -g JJ_DESCRIPTION ( get_jj_description )
18
-
19
16
# ๎ Git Prompt Customization
20
17
set -g __fish_git_prompt_showdirtystate true
21
18
set -g __fish_git_prompt_char_dirtystate "*"
···
34
31
35
32
# ๓ฐฏ Fzf Setup
36
33
command -q fzf; and fzf --fish | source; and set -gx FZF_DEFAULT_OPTS "\
37
-
--color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \
38
-
--color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \
39
-
--color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \
40
-
--color=selected-bg:#45475A \
41
-
--color=border:#6C7086,label:#CDD6F4"
34
+
--color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \
35
+
--color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \
36
+
--color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \
37
+
--color=selected-bg:#45475A \
38
+
--color=border:#6C7086,label:#CDD6F4"
42
39
43
40
end
+10
-15
.config/fish/functions/fish_right_prompt.fish
+10
-15
.config/fish/functions/fish_right_prompt.fish
···
2
2
set -l vcs_color normal
3
3
set -l vcs_icon ""
4
4
set -l vcs_text ""
5
-
set -l jj_description ""
6
5
set -l code_forge ""
7
6
8
7
# ๏ JJ Root
9
-
command -q jj; and set -l jj_root_dir \
10
-
( jj root 2> /dev/null )
8
+
command -q jj
9
+
and set -l jj_root_dir ( jj root 2> /dev/null )
11
10
12
11
# ๎ Git Root
13
-
command -q git; and set -l git_root_dir \
14
-
( git rev-parse --show-toplevel 2> /dev/null )
12
+
command -q git
13
+
and set -l git_root_dir ( git rev-parse --show-toplevel 2> /dev/null )
15
14
16
15
# Version control software
17
16
if test -n "$jj_root_dir"
18
17
set vcs_color blue
19
18
set vcs_icon (set_color $vcs_color ) "๏ " ( set_color normal )
20
-
set jj_description ( get_jj_description )
21
19
else if test -n "$git_root_dir"
22
20
set vcs_color red
23
21
set vcs_icon (set_color $vcs_color ) "๎ " ( set_color normal )
24
22
end
25
23
26
24
# Code forge
27
-
test -e "$jj_root_dir/.tangled"; and set code_forge "๓ฐณ "
28
-
or test -e "$jj_root_dir/.github"; and set code_forge "๎ "
25
+
if test -e "$jj_root_dir/.tangled"
26
+
set code_forge "๓ฐณ "
27
+
else if test -e "$jj_root_dir/.github"
28
+
set code_forge "๎ "
29
+
end
29
30
30
31
# Git prompt
31
32
set -l git_commit_hash (set_color $vcs_color) (fish_git_prompt) (set_color normal)
32
-
33
-
# Vcs text
34
-
if test -n "$jj_root_dir"; and test -n "$jj_description"
35
-
set vcs_text "๓ฐ $jj_description"
36
-
else if test -n "$git_root_dir"
37
-
set vcs_text $git_commit_hash
38
-
end
33
+
set vcs_text $git_commit_hash
39
34
40
35
echo -ns $code_forge $vcs_icon $vcs_text
41
36
end
-11
.config/fish/functions/get_jj_description.fish
-11
.config/fish/functions/get_jj_description.fish
···
1
-
function get_jj_description -d "Current commit description or empty string if none"
2
-
set -l jj_root_dir ""
3
-
4
-
command -q jj
5
-
and set -l jj_root_dir ( jj root 2> /dev/null )
6
-
and test -n "$jj_root_dir"
7
-
and echo "$(jj log -R $jj_root_dir -r @ -T "description" --no-graph)"
8
-
9
-
# Empty if it Fails
10
-
or echo ""
11
-
end