mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-23 01:05:38 +00:00
Merge branch 'starship-git-prompt'
This commit is contained in:
commit
9910864059
@ -28,9 +28,11 @@ function aliases --description 'All aliases'
|
|||||||
abbr -a gl 'git log --graph --decorate --oneline -20'
|
abbr -a gl 'git log --graph --decorate --oneline -20'
|
||||||
abbr -a gll 'git log --graph --decorate --oneline'
|
abbr -a gll 'git log --graph --decorate --oneline'
|
||||||
abbr -a gco 'git checkout'
|
abbr -a gco 'git checkout'
|
||||||
|
abbr -a gcom 'git checkout master'
|
||||||
abbr -a gcob 'git checkout -b'
|
abbr -a gcob 'git checkout -b'
|
||||||
abbr -a gb 'git branch'
|
abbr -a gb 'git branch'
|
||||||
abbr -a grh 'git reset --hard'
|
abbr -a grh 'git reset --hard'
|
||||||
|
abbr -a gm 'git merge'
|
||||||
abbr -a ghb 'gh repo view -w'
|
abbr -a ghb 'gh repo view -w'
|
||||||
|
|
||||||
# Vim
|
# Vim
|
||||||
|
@ -2,24 +2,45 @@
|
|||||||
add_newline = false
|
add_newline = false
|
||||||
format = """\
|
format = """\
|
||||||
$directory\
|
$directory\
|
||||||
|
$git_branch\
|
||||||
|
$git_commit\
|
||||||
|
$git_status\
|
||||||
$character\
|
$character\
|
||||||
"""
|
"""
|
||||||
|
|
||||||
[character]
|
[character]
|
||||||
symbol = "❯"
|
symbol = "❯"
|
||||||
|
|
||||||
|
[cmd_duration]
|
||||||
|
min_time = 3_000
|
||||||
|
show_notifications = true
|
||||||
|
min_time_to_notify = 30_000
|
||||||
|
format = "[$duration]($style) "
|
||||||
|
|
||||||
[directory]
|
[directory]
|
||||||
truncate_to_repo = true
|
truncate_to_repo = true
|
||||||
truncation_length = 100
|
truncation_length = 100
|
||||||
|
|
||||||
[git_branch]
|
[git_branch]
|
||||||
truncation_length = 1
|
format = "[$symbol$branch]($style)"
|
||||||
truncation_symbol = ""
|
|
||||||
|
[git_commit]
|
||||||
|
format = "[$hash]($style) "
|
||||||
|
disabled = false
|
||||||
|
|
||||||
[git_status]
|
[git_status]
|
||||||
format = '([\[$all_status$ahead_behind\]]($style) )'
|
format = "[$all_status$ahead_behind]($style) "
|
||||||
# prefix = ""
|
conflicted = " ="
|
||||||
# suffix = ""
|
ahead = " ⇡"
|
||||||
|
behind = " ⇣"
|
||||||
|
diverged = " ⇕"
|
||||||
|
untracked = " ⋄"
|
||||||
|
stashed = " ⩮"
|
||||||
|
modified = " ∽"
|
||||||
|
staged = " +"
|
||||||
|
renamed = " »"
|
||||||
|
deleted = " ✘"
|
||||||
|
style = "red"
|
||||||
|
|
||||||
[python]
|
[python]
|
||||||
symbol = ""
|
symbol = ""
|
||||||
|
Loading…
Reference in New Issue
Block a user