add targets
This commit is contained in:
Jonathan Dönszelmann
parent
dee2a92cf1
commit
720aaf0a93
6 changed files with 176 additions and 97 deletions
|
|
@ -84,8 +84,16 @@ local opts = { noremap = true, silent = true }
|
|||
local builtin = require('telescope.builtin')
|
||||
|
||||
-- comment
|
||||
vim.keymap.set("n", "<leader>c", ":lua require('Comment.api').toggle.linewise.current()<CR> j", { remap = true })
|
||||
vim.keymap.set("v", "<leader>c", ":lua require('Comment.api').toggle.blockwise.current()<CR> j", { remap = true })
|
||||
local esc = vim.api.nvim_replace_termcodes(
|
||||
'<ESC>', true, false, true
|
||||
)
|
||||
local api = require('Comment.api')
|
||||
|
||||
vim.keymap.set("n", "<C-_>", ":lua require('Comment.api').toggle.linewise.current()<CR> j", { remap = true })
|
||||
vim.keymap.set("x", "<C-_>", function()
|
||||
vim.api.nvim_feedkeys(esc, 'nx', false)
|
||||
api.toggle.linewise(vim.fn.visualmode())
|
||||
end, { remap = true })
|
||||
|
||||
-- indent and dedent using tab/shift-ta
|
||||
vim.keymap.set("n", "<tab>", ">>_")
|
||||
|
|
@ -94,16 +102,34 @@ vim.keymap.set("i", "<s-tab>", "<c-d>")
|
|||
vim.keymap.set("v", "<Tab>", ">gv")
|
||||
vim.keymap.set("v", "<S-Tab>", "<gv")
|
||||
|
||||
vim.keymap.set('n', 'gr', builtin.lsp_references, {})
|
||||
vim.keymap.set('n', 'gd', builtin.lsp_definitions, {})
|
||||
vim.keymap.set('n', 'gt', builtin.lsp_type_definitions, {})
|
||||
vim.keymap.set('n', 'gr', (function() builtin.lsp_references({jump_type="vsplit"}) end), {})
|
||||
vim.keymap.set('n', 'gd', (function() builtin.lsp_definitions({jump_type="vsplit"}) end), {})
|
||||
vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({jump_type="vsplit"}) end), {})
|
||||
|
||||
local barbar_state = require("barbar.state")
|
||||
vim.api.nvim_create_user_command('CustomCloseBuffer', function (tbl)
|
||||
count = 0
|
||||
for _ in pairs(barbar_state.buffers) do count = count + 1 end
|
||||
|
||||
if count == 1 then
|
||||
vim.cmd "quit"
|
||||
end
|
||||
|
||||
vim.cmd "silent! BufferClose"
|
||||
|
||||
if vim.api.nvim_buf_get_name(0) == "" then
|
||||
vim.cmd "quit"
|
||||
end
|
||||
end, { desc = "Close Buffer without errors" })
|
||||
|
||||
-- format on wq and x and replace X, W and Q with x, w and q
|
||||
vim.cmd [[cabbrev wq execute "Format sync" <bar> wq]]
|
||||
vim.cmd [[cabbrev x execute "Format sync" <bar> x]]
|
||||
vim.cmd [[cnoreabbrev W w]]
|
||||
vim.cmd [[cnoreabbrev X execute "Format sync" <bar> x]]
|
||||
vim.cmd [[cnoreabbrev Q q]]
|
||||
vim.cmd [[cnoreabbrev w execute "Format sync" <bar> w]]
|
||||
vim.cmd [[cnoreabbrev x execute "Format sync" <bar> w <bar> CustomCloseBuffer <cr>]]
|
||||
vim.cmd [[cabbrev W w]]
|
||||
vim.cmd [[cabbrev X execute "Format sync" <bar> x]]
|
||||
vim.cmd [[cabbrev Q CustomCloseBuffer]]
|
||||
vim.cmd [[cnoreabbrev q CustomCloseBuffer <cr>]]
|
||||
vim.cmd [[cnoreabbrev qa q]]
|
||||
vim.cmd [[nnoremap ; :]]
|
||||
|
||||
local builtin = require('telescope.builtin')
|
||||
|
|
@ -111,7 +137,8 @@ local builtin = require('telescope.builtin')
|
|||
vim.keymap.set('n', '<leader>s', "<cmd>vertical sb<cr>", {})
|
||||
vim.keymap.set('n', '<leader><leader>', builtin.find_files, {})
|
||||
vim.keymap.set('n', '<leader>f', builtin.live_grep, {})
|
||||
vim.keymap.set('n', '<leader>h', builtin.search_history, {})
|
||||
vim.keymap.set('n', '<leader>h', builtin.pickers, {})
|
||||
-- vim.keymap.set('n', '<leader>h', builtin.search_history, {})
|
||||
vim.keymap.set('n', '<leader>b', (function() builtin.buffers({sort_mru = true}) end), {})
|
||||
vim.keymap.set('n', '<leader>d', "<cmd>Telescope diagnostics bufnr=0<cr>", {})
|
||||
vim.keymap.set('n', '<leader>ad', builtin.diagnostics, {})
|
||||
|
|
@ -119,6 +146,12 @@ vim.keymap.set('n', '<leader>em', "<cmd>RustLsp expandMacro<cr>")
|
|||
vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
|
||||
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
|
||||
|
||||
|
||||
vim.keymap.set('n', '<leader>ct', "<cmd>CustomCloseBuffer<cr>")
|
||||
vim.keymap.set('n', '<leader>co', "<cmd>silent! BufferCloseAllButCurrent<cr>")
|
||||
vim.keymap.set('n', '<leader>cl', "<cmd>silent! BufferCloseBuffersLeft<cr>")
|
||||
vim.keymap.set('n', '<leader>cr', "<cmd>silent! BufferCloseBuffersRight<cr>")
|
||||
|
||||
-- like quit but for a single tab
|
||||
vim.keymap.set('n', '<leader>q', "<cmd>BD<cr>", {})
|
||||
vim.keymap.set('n', '<leader>oq', "<cmd>BufOnly<cr>", {})
|
||||
|
|
|
|||
|
|
@ -60,9 +60,16 @@ in
|
|||
enable = true;
|
||||
|
||||
nixGrammars = true;
|
||||
nixvimInjections = true;
|
||||
|
||||
settings = {
|
||||
indent.enable = true;
|
||||
ensure_installed = "all";
|
||||
ignore_install = [
|
||||
"wing"
|
||||
];
|
||||
|
||||
highlight.enable = true;
|
||||
};
|
||||
};
|
||||
rainbow-delimiters.enable = true;
|
||||
|
|
@ -78,7 +85,7 @@ in
|
|||
|
||||
auto-session = {
|
||||
enable = true;
|
||||
extraOptions = {
|
||||
settings = {
|
||||
auto_save_enabled = true;
|
||||
auto_restore_enabled = true;
|
||||
pre_save_cmds = [ "Neotree close" ];
|
||||
|
|
@ -191,51 +198,52 @@ in
|
|||
auto_attach = true;
|
||||
server = {
|
||||
standalone = false;
|
||||
cmd = [ "rustup" "run" "nightly" "rust-analyzer" ];
|
||||
default_settings = {
|
||||
rust-analyzer = {
|
||||
inlayHints = { lifetimeElisionHints = { enable = "always"; }; };
|
||||
check = { command = "clippy"; };
|
||||
cachePriming.enable = false;
|
||||
};
|
||||
cargo = {
|
||||
buildScripts.enable = true;
|
||||
features = "all";
|
||||
runBuildScripts = true;
|
||||
loadOutDirsFromCheck = true;
|
||||
};
|
||||
checkOnSave = true;
|
||||
check = {
|
||||
allFeatures = true;
|
||||
command = "clippy";
|
||||
extraArgs = [ "--no-deps" ];
|
||||
};
|
||||
procMacro = { enable = true; };
|
||||
imports = {
|
||||
granularity = { group = "module"; };
|
||||
prefix = "self";
|
||||
};
|
||||
files = {
|
||||
excludeDirs =
|
||||
[ ".cargo" ".direnv" ".git" "node_modules" "target" ];
|
||||
};
|
||||
|
||||
inlayHints = {
|
||||
bindingModeHints.enable = true;
|
||||
closureStyle = "rust_analyzer";
|
||||
closureReturnTypeHints.enable = "always";
|
||||
discriminantHints.enable = "always";
|
||||
expressionAdjustmentHints.enable = "always";
|
||||
implicitDrops.enable = true;
|
||||
lifetimeElisionHints.enable = "always";
|
||||
rangeExclusiveHints.enable = true;
|
||||
};
|
||||
|
||||
rustc.source = "discover";
|
||||
|
||||
options.diagnostics = {
|
||||
enable = true;
|
||||
styleLints.enable = true;
|
||||
};
|
||||
# cargo = {
|
||||
# buildScripts.enable = true;
|
||||
# features = "all";
|
||||
# runBuildScripts = true;
|
||||
# loadOutDirsFromCheck = true;
|
||||
# };
|
||||
# checkOnSave = true;
|
||||
# check = {
|
||||
# allFeatures = true;
|
||||
# command = "clippy";
|
||||
# extraArgs = [ "--no-deps" ];
|
||||
# };
|
||||
# procMacro = { enable = true; };
|
||||
# imports = {
|
||||
# granularity = { group = "module"; };
|
||||
# prefix = "self";
|
||||
# };
|
||||
# files = {
|
||||
# excludeDirs =
|
||||
# [ ".cargo" ".direnv" ".git" "node_modules" "target" ];
|
||||
# };
|
||||
#
|
||||
# inlayHints = {
|
||||
# bindingModeHints.enable = true;
|
||||
# closureStyle = "rust_analyzer";
|
||||
# closureReturnTypeHints.enable = "always";
|
||||
# discriminantHints.enable = "always";
|
||||
# expressionAdjustmentHints.enable = "always";
|
||||
# implicitDrops.enable = true;
|
||||
# lifetimeElisionHints.enable = "always";
|
||||
# rangeExclusiveHints.enable = true;
|
||||
# reborrowHints.enable = "mutable";
|
||||
# };
|
||||
#
|
||||
# rustc.source = "discover";
|
||||
#
|
||||
# options.diagnostics = {
|
||||
# enable = true;
|
||||
# styleLints.enable = true;
|
||||
# };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -247,7 +255,7 @@ in
|
|||
servers = {
|
||||
astro.enable = true;
|
||||
cssls.enable = true;
|
||||
nil-ls = {
|
||||
nil_ls = {
|
||||
enable = true;
|
||||
extraOptions = {
|
||||
nix = {
|
||||
|
|
@ -282,20 +290,16 @@ in
|
|||
enable = true;
|
||||
filetypes = [ "python" ];
|
||||
};
|
||||
# taplo = {
|
||||
# enable = true;
|
||||
# filetypes = [ "toml" ];
|
||||
# };
|
||||
bashls = {
|
||||
enable = true;
|
||||
|
||||
filetypes = [ "sh" "bash" ];
|
||||
};
|
||||
ts-ls = {
|
||||
enable = true;
|
||||
filetypes =
|
||||
[ "javascript" "javascriptreact" "typescript" "typescriptreact" ];
|
||||
};
|
||||
# ts_ls = {
|
||||
# enable = true;
|
||||
# filetypes =
|
||||
# [ "javascript" "javascriptreact" "typescript" "typescriptreact" ];
|
||||
# };
|
||||
marksman.enable = true;
|
||||
yamlls = {
|
||||
enable = true;
|
||||
|
|
@ -337,9 +341,12 @@ in
|
|||
};
|
||||
|
||||
# tabs
|
||||
bufferline = {
|
||||
barbar = {
|
||||
enable = true;
|
||||
settings.options.diagnostics = "nvim_lsp";
|
||||
settings = {
|
||||
options.diagnostics = "nvim_lsp";
|
||||
focus_on_close = "previous";
|
||||
};
|
||||
};
|
||||
|
||||
none-ls = {
|
||||
|
|
@ -375,8 +382,14 @@ in
|
|||
vim-gh-line
|
||||
# vim-bufkill
|
||||
BufOnly-vim
|
||||
neoconf-nvim
|
||||
vim-autoswap
|
||||
targets-vim
|
||||
];
|
||||
|
||||
extraConfigLuaPre = ''
|
||||
require("neoconf").setup({})
|
||||
'';
|
||||
extraConfigLua = ''
|
||||
require("render-markdown").setup {
|
||||
latex_converter = '${pkgs.python312Packages.pylatexenc}/bin/latex2text',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue