diff options
| author | Von Random <von@vdrandom.org> | 2023-03-17 12:49:42 +0200 |
|---|---|---|
| committer | Von Random <von@vdrandom.org> | 2023-03-17 12:49:42 +0200 |
| commit | 6290bd1624a5ba65cecbef4d690a2cb7a39d7462 (patch) | |
| tree | 335fe826eb44035a46c37ea6e457c7a2a969f957 | |
| parent | 0067fb809bf644fc695fb7a194ae7b66609cc373 (diff) | |
fish: fix git check; nvim: indent visibility plugin
| -rw-r--r-- | cli/.config/fish/functions/prompt.git.fish | 5 | ||||
| -rw-r--r-- | cli/.config/nvim/lua/plugins.lua | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cli/.config/fish/functions/prompt.git.fish b/cli/.config/fish/functions/prompt.git.fish index fed6f56..a457a89 100644 --- a/cli/.config/fish/functions/prompt.git.fish +++ b/cli/.config/fish/functions/prompt.git.fish @@ -1,7 +1,8 @@ function prompt.git - git rev-parse 2> /dev/null || return + set -l is_git_tree (git rev-parse --is-inside-work-tree 2>/dev/null) + string match -qe 'true' "$is_git_tree" || return git status --porcelain -bu | while read line - if string match -qr "^##" "$line" + if string match -qr '^##' "$line" set git_branch (string match -r '[^# .]+' "$line") string match -qr '\[behind' $line && set git_branch "$git_branch?" string match -qr '\[ahead' $line && set git_branch "$git_branch!" diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index 83bd9f3..73de7a9 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -6,6 +6,7 @@ local function plugins(use) use 'hoob3rt/lualine.nvim' use 'hashivim/vim-terraform' use 'khaveesh/vim-fish-syntax' + use 'lukas-reineke/indent-blankline.nvim' use 'mhinz/vim-signify' use 'tpope/vim-rsi' use 'tpope/vim-vinegar' |