From 93016989d6558f02b90859a5e013fe9e51fb0962 Mon Sep 17 00:00:00 2001 From: Steffen Rademacker Date: Fri, 18 Mar 2022 13:18:48 +0100 Subject: [PATCH] Delta vs git-blame and diff-so-fancy --- nvim/lua/config/git-blame.lua | 4 ---- nvim/lua/mappings.lua | 1 - nvim/lua/plugins.lua | 4 ---- zsh/exports.zsh | 3 +-- 4 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 nvim/lua/config/git-blame.lua diff --git a/nvim/lua/config/git-blame.lua b/nvim/lua/config/git-blame.lua deleted file mode 100644 index 860a6fdf..00000000 --- a/nvim/lua/config/git-blame.lua +++ /dev/null @@ -1,4 +0,0 @@ -local g = vim.g - -g.gitblame_enabled = 0 -g.gitblame_message_template = '~~~ ' diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index bd5066ac..cb63d25b 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -93,7 +93,6 @@ map('n', 'l', 'FloatermNew lazygit') map('n', 'gd', 'DiffviewOpen') map('n', 'gc', 'DiffviewClose') map('n', 'gh', 'DiffviewFileHistory') -map('n', 'gb', 'GitBlameToggle') -- TODO rework this?! map('n', 'gf', '/\\v^[<\\|=>]{7}( .*\\|$)') diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 6d4c6e80..c6ccf241 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -125,10 +125,6 @@ return require('packer').startup(function(use) requires = { 'nvim-lua/plenary.nvim' }, config = get_config('diffview'), } - use { - 'f-person/git-blame.nvim', - config = get_config('git-blame'), - } -- finally: the colorscheme of choice use { diff --git a/zsh/exports.zsh b/zsh/exports.zsh index 7e04a77f..b3f9c577 100644 --- a/zsh/exports.zsh +++ b/zsh/exports.zsh @@ -26,7 +26,7 @@ export HOMEBREW_CASK_OPTS="--appdir=/Applications" # nnn export NNN_OPTS='deHR' -export NNN_BMS='d:~/Dotfiles;s:~/Sites;l:~/Downloads;h:~/' +export NNN_BMS='a:~/Sites/ag;d:~/Dotfiles;s:~/Sites;l:~/Downloads;h:~/' export NNN_FCOLORS='c1e26c2e006033f5c6d6abc4' export NNN_PLUG='p:preview-tui;j:autojump' export NNN_FIFO='/tmp/nnn.fifo' @@ -42,7 +42,6 @@ export FZF_DEFAULT_COMMAND="rg --files --hidden --follow --glob '!.git'" # n node version management export N_PREFIX="$HOME/n"; [[ :$PATH: == *":$N_PREFIX/bin:"* ]] || PATH+=":$N_PREFIX/bin" # Added by n-install (see http://git.io/n-install-repo). -# export N_PRESERVE_NPM=1 # bartib for time tracking export BARTIB_FILE="/Users/webgefrickel/Documents/tracking.bartib"