This commit is contained in:
bain 2024-06-25 09:33:22 +02:00
parent bf3cc938ce
commit 6c97ab5b12
4 changed files with 42 additions and 29 deletions

View file

@ -243,30 +243,7 @@ require("lazy").setup({
},
{
'numToStr/Comment.nvim',
enabled = false, -- nvim 10 supports comments built-in
lazy = false,
config = function ()
require("Comment").setup({
mappings = {
basic = false,
extra = false,
}
})
local api = require("Comment.api")
local esc = vim.api.nvim_replace_termcodes(
'<ESC>', true, false, true
)
vim.keymap.set('n', '<leader>/', api.toggle.linewise.current)
vim.keymap.set('n', '<leader>(', api.toggle.blockwise.current)
vim.keymap.set('x', '<leader>/', function()
vim.api.nvim_feedkeys(esc, 'nx', false)
api.toggle.linewise(vim.fn.visualmode())
end)
vim.keymap.set('x', '<leader>(', function()
vim.api.nvim_feedkeys(esc, 'nx', false)
api.toggle.blockwise(vim.fn.visualmode())
end)
end,
opts = {}
},
{
'jamessan/vim-gnupg',
@ -317,6 +294,32 @@ require("lazy").setup({
})
end,
},
{
'tpope/vim-dadbod',
cmd = "DBUI",
dependencies = {
'kristijanhusak/vim-dadbod-completion',
'kristijanhusak/vim-dadbod-ui',
},
config = function ()
local cmp = require("cmp")
local cmp_action = require('lsp-zero').cmp_action()
cmp.setup.filetype({ 'sql' }, {
sources = {
{ name = "vim-dadbod-completion" },
{ name = "buffer" },
},
mapping = {
['<Tab>'] = cmp_action.luasnip_supertab(),
['<S-Tab>'] = cmp_action.luasnip_shift_supertab(),
-- Requires the terminal to send proper keycodes (put this in .Xresources):
-- URxvt.keysym.S-Return: \033[13;2u
-- URxvt.keysym.C-Return: \033[13;5u
['<S-Enter>'] = cmp.mapping.confirm({ select = true }),
},
})
end
},
})
-- }}}
-- {{{ Keymap

View file

@ -1,10 +1,9 @@
{
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"copilot.vim": { "branch": "release", "commit": "88d08cf54f623341adde4b18362bffc95174dcd5" },
"gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" },
"lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" },
"gitsigns.nvim": { "branch": "main", "commit": "651d5ed082605f3ed96b0f037a768ca06ecf8fc3" },
"lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "9a686513eaaa13d737d0fec8956a18268ead8b29" },
"lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
@ -13,14 +12,17 @@
"mini.ai": { "branch": "main", "commit": "a7e90f110e6274262616311b93cef12cd2667a2d" },
"mini.hipatterns": { "branch": "main", "commit": "427712c754bfdccd8da7073576cd8e2586c0fe93" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" },
"nvim-treesitter": { "branch": "master", "commit": "c29989f5d735a30b6d2350b54d5cd50be811f8b2" },
"nvim-lspconfig": { "branch": "master", "commit": "5c33bf1f708ac8cb839469e1a03d45987fec305c" },
"nvim-treesitter": { "branch": "master", "commit": "66ae8748fd4e8550c8b17cf115c9739aea1e4067" },
"nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"tokyodark.nvim": { "branch": "master", "commit": "14bc1b3e596878a10647af7c82de7736300f3322" },
"typst.vim": { "branch": "main", "commit": "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6" },
"vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
"vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" },
"vim-dadbod-ui": { "branch": "master", "commit": "0dc68d9225a70d42f8645049482e090c1a8dce25" },
"vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
"vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },

View file

@ -1,5 +1,6 @@
set-option -sa terminal-overrides ",xterm*:Tc"
set -g mouse on
set -s escape-time 200
# Prefix
unbind C-b

View file

@ -71,3 +71,10 @@ autoload -Uz compinit
zstyle ':completion:*' menu select
fpath+=~/.zfunc
eval "$(zoxide init zsh)"
alias cd=z
alias pgcli='LESS="-SF" pgcli'
command -v bat &>/dev/null && alias cat="bat --plain"