diff options
| author | adam <56338480+adastx@users.noreply.github.com> | 2022-10-09 21:48:44 +0200 |
|---|---|---|
| committer | adam <56338480+adastx@users.noreply.github.com> | 2022-10-09 21:49:14 +0200 |
| commit | 1e5b6df23f9610786ffc0c04ac9bfd1c0b778352 (patch) | |
| tree | 02de7f335941a20d3581a770a7183a30926ff261 | |
| parent | 66c6c22387b76e0e547302d402e1a37924cc1ba7 (diff) | |
nvim: cleaner git support for dotfiles
| -rw-r--r-- | .config/aliases | 4 | ||||
| -rw-r--r-- | .config/nvim/lua/mappings.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins.lua | 8 | ||||
| -rw-r--r-- | .config/nvim/lua/setup/gitsigns.lua | 8 |
4 files changed, 17 insertions, 5 deletions
diff --git a/.config/aliases b/.config/aliases index ac71908..def29fc 100644 --- a/.config/aliases +++ b/.config/aliases @@ -28,13 +28,11 @@ alias ca='config add' alias cu='config add -u' alias cdf='config diff' alias clg='config log --oneline --decorate --all --graph' -alias cvim="GIT_DIR=$HOME/.cfg GIT_WORK_TREE=$HOME nvim" alias shrc="nvim $HOME/.bashrc" alias vars="nvim $HOME/.bash_profile" alias wmrc="nvim $XDG_CONFIG_HOME/i3/config" -alias vimrc="GIT_DIR=$HOME/.cfg GIT_WORK_TREE=$HOME \ - nvim --cmd ':cd $XDG_CONFIG_HOME/nvim/ | edit lua/plugins.lua'" +alias vimrc="cd $XDG_CONFIG_HOME/nvim; nvim" alias initrc="nvim $XDG_CONFIG_HOME/X11/xinitrc" alias barconf="nvim $XDG_CONFIG_HOME/polybar/config.ini" alias aliases="nvim $XDG_CONFIG_HOME/aliases" diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index 69e21a6..2d1222c 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -48,7 +48,7 @@ map('n', '<leader>xN', '<cmd>lua vim.diagnostic.goto_prev()<cr>', opts) map('n', '<leader>xx', '<cmd>Telescope lsp_code_actions<cr>', opts) map('n', '<leader>xX', '<cmd>Telescope lsp_range_code_actions<cr>', opts) -map('n', '<leader>co', ':copen<CR>', opts) +map('n', '<leader>co', ':cwindow<CR>', opts) map('n', ']q', ':cnext<CR>', opts) map('n', '[q', ':cprevious<CR>', opts) map('n', '[Q', ':cfirst<CR>', opts) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 2e6b3ff..cf27f1f 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -65,7 +65,7 @@ return require('packer').startup(function(use) event = { "BufRead", "BufNewFile" }, wants = "plenary.nvim", config = function() - require('gitsigns').setup() + require 'setup.gitsigns' end, } @@ -136,6 +136,12 @@ return require('packer').startup(function(use) } use { + "tpope/vim-fugitive", + config = "vim.cmd [[call FugitiveDetect('~/.cfg')]]", + cmd = { 'G', 'Ggrep' }, + } + + use { "b3nj5m1n/kommentary", event = { "BufRead", "BufNewFile" }, config = function() diff --git a/.config/nvim/lua/setup/gitsigns.lua b/.config/nvim/lua/setup/gitsigns.lua new file mode 100644 index 0000000..7894125 --- /dev/null +++ b/.config/nvim/lua/setup/gitsigns.lua @@ -0,0 +1,8 @@ +require('gitsigns').setup { + worktrees = { + { + toplevel = vim.env.HOME, + gitdir = vim.env.HOME .. '/.cfg' + } + } +} |