diff --git a/git/dot-gitconfig b/git/dot-gitconfig index 39421c5..5b048c2 100755 --- a/git/dot-gitconfig +++ b/git/dot-gitconfig @@ -12,19 +12,13 @@ remote = origin merge = master [core] - excludesfile = /Users/rack/.gitignore_global + excludesfile = ~/.gitignore_global fileMode = false ignorecase = false editor = nvim -[difftool "sourcetree"] - cmd = opendiff \"$LOCAL\" \"$REMOTE\" - path = -[mergetool "sourcetree"] - cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" - trustExitCode = true [github] user = racklin@gmail.com [ghq] - root = ~/.ghq + root = ~/ghq [init] defaultBranch = master diff --git a/starship/starship.toml b/starship/starship.toml index c65c34f..e8c6b55 100644 --- a/starship/starship.toml +++ b/starship/starship.toml @@ -11,8 +11,9 @@ threshold = 30 style = "bold yellow" [directory] -fish_style_pwd_dir_length = 1 +fish_style_pwd_dir_length = 2 truncation_symbol = "…/" +truncation_length = 4 [hostname] ssh_only = true