Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions nvim/.config/nvim/lua/core/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,26 @@ vim.g.mapleader = ","
local set = vim.keymap.set

set("i", "jj", "<ESC>")
-- NOTE: check packadd nohlsearch
set("n", "<leader>nh", ":nohl<CR>")
set("n", "<leader>to", ":tabnew<CR>")
set("n", "<leader>tq", ":tabclose<CR>")
-- NOTE: default gt and gT
set("n", "<leader>tl", ":tabn<CR>")
set("n", "<leader>th", ":tabp<CR>")
set("n", "<leader>rn", ":set relativenumber!<CR>")
set("n", "<leader>rn", ":set relativenumber!<CR>")


set("n", "<leader>ih", function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
end, { desc = "toggle inlay_hints"}
end, { desc = "toggle inlay_hints" }
)

vim.api.nvim_create_user_command("W", function()
vim.cmd("terminal sl")
vim.cmd([[autocmd TermClose * ++once lua vim.cmd("bdelete!")]])
end, { nargs = 0 })

-- FIX: maybe move this to telescope.lua
-- UPD: just nuke this
set("n", "<S-h>", "<cmd>Telescope buffers sort_mru=true sort_lastused=true initial_mode=normal<CR>")
2 changes: 0 additions & 2 deletions nvim/.config/nvim/lua/plugins/leap.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
return {
{
"ggandor/leap.nvim",
}
}
44 changes: 23 additions & 21 deletions nvim/.config/nvim/lua/plugins/lsp-config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,42 @@ return {
{
"neovim/nvim-lspconfig",
config = function()
-- NOTE: use enabled list
vim.lsp.enable('clangd')
vim.lsp.enable('texlab')
vim.lsp.enable('asm_lsp')

vim.diagnostic.config({
-- NOTE: use global settings for float windows
float = {
border = "single",
},
virtual_text = true,
update_in_insert = true,
})

vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('my.lsp', {}),
callback = function(args)
local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
if client:supports_method('textDocument/implementation') then
-- Create a keymap for vim.lsp.buf.implementation ...
end
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('my.lsp', {}),
callback = function(args)
local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
if client:supports_method('textDocument/implementation') then
-- Create a keymap for vim.lsp.buf.implementation ...
end

-- Auto-format ("lint") on save.
-- Usually not needed if server supports "textDocument/willSaveWaitUntil".
if not client:supports_method('textDocument/willSaveWaitUntil')
and client:supports_method('textDocument/formatting') then
vim.api.nvim_create_autocmd('BufWritePre', {
group = vim.api.nvim_create_augroup('my.lsp', {clear=false}),
buffer = args.buf,
callback = function()
vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
end,
})
end
end,
})
-- Auto-format ("lint") on save.
-- Usually not needed if server supports "textDocument/willSaveWaitUntil".
if not client:supports_method('textDocument/willSaveWaitUntil')
and client:supports_method('textDocument/formatting') then
vim.api.nvim_create_autocmd('BufWritePre', {
group = vim.api.nvim_create_augroup('my.lsp', { clear = false }),
buffer = args.buf,
callback = function()
vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
end,
})
end
end,
})
end,
}
}
46 changes: 24 additions & 22 deletions nvim/.config/nvim/lua/plugins/luasnip.lua
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
return {
{
"L3MON4D3/LuaSnip",
-- follow latest release.
version = "v2.*", -- Replace <CurrentMajor> by the latest released major (first number of latest release)
-- install jsregexp (optional!).
build = "make install_jsregexp",
config = function()
local ls = require("luasnip")
ls.config.set_config({
enable_autosnippets = true,
})
require("luasnip.loaders.from_lua").lazy_load({paths = "~/.config/nvim/snippets"})
vim.keymap.set({"i"}, "<C-K>", function() ls.expand() end, {silent = true})
vim.keymap.set({"i", "s"}, "jk", function() ls.jump( 1) end, {silent = true})
vim.keymap.set({"i", "s"}, "jl", function() ls.jump(-1) end, {silent = true})
vim.keymap.set({"i", "s"}, "<C-E>", function()
if ls.choice_active() then
ls.change_choice(1)
end
end, {silent = true})
end,
},
"L3MON4D3/LuaSnip",
-- follow latest release.
version = "v2.*", -- Replace <CurrentMajor> by the latest released major (first number of latest release)
-- install jsregexp (optional!).
build = "make install_jsregexp",
config = function()
local ls = require("luasnip")
ls.config.set_config({
enable_autosnippets = true,
-- NOTE: check ft_func = cursor_pos
-- NOTE: check update_event
})
require("luasnip.loaders.from_lua").lazy_load({ paths = "./snippets" })
-- TODO: rewrite this with lazy keys, and use ls.jumpable(1)
vim.keymap.set({ "i" }, "<C-K>", function() ls.expand() end, { silent = true })
vim.keymap.set({ "i", "s" }, "jk", function() ls.jump(1) end, { silent = true })
vim.keymap.set({ "i", "s" }, "jl", function() ls.jump(-1) end, { silent = true })
vim.keymap.set({ "i", "s" }, "<C-E>", function()
if ls.choice_active() then
ls.change_choice(1)
end
end, { silent = true })
end,
},
}

5 changes: 3 additions & 2 deletions nvim/.config/nvim/lua/plugins/mason-lspconfig.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
-- FIX: move this to mason.lua
return {
{
"mason-org/mason-lspconfig.nvim",
opts = {},
dependencies = {
{ "mason-org/mason.nvim", opts = {} },
"neovim/nvim-lspconfig",
{ "mason-org/mason.nvim", opts = {} },
"neovim/nvim-lspconfig",
},
}
}
7 changes: 4 additions & 3 deletions nvim/.config/nvim/lua/plugins/nvim-surround.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ return {
"kylechui/nvim-surround",
version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
event = "VeryLazy",
-- FIX: just use opts = true
config = function()
require("nvim-surround").setup({
-- Configuration here, or leave empty to use defaults
})
require("nvim-surround").setup({
-- Configuration here, or leave empty to use defaults
})
end
}
}
1 change: 1 addition & 0 deletions nvim/.config/nvim/lua/plugins/peak.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ return {
throttle_time = 'auto', -- minimum amount of time in milliseconds
-- that has to pass before starting new render
})
FIX: use lazy cmd
vim.api.nvim_create_user_command("PeekOpen", require("peek").open, {})
vim.api.nvim_create_user_command("PeekClose", require("peek").close, {})
end,
Expand Down
6 changes: 2 additions & 4 deletions nvim/.config/nvim/lua/plugins/render-markdown.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
return {
{
'MeanderingProgrammer/render-markdown.nvim',
opts = {},
},
'MeanderingProgrammer/render-markdown.nvim',
opts = {},
}
18 changes: 11 additions & 7 deletions nvim/.config/nvim/lua/plugins/telescope.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
return {
'nvim-telescope/telescope.nvim', tag = '0.1.8',
'nvim-telescope/telescope.nvim',
tag = '0.1.8',
-- or , branch = '0.1.x',
dependencies = { 'nvim-lua/plenary.nvim' },
config = function()
local telescope = require("telescope")
local set = vim.keymap.set
local act = require("telescope.actions")
-- TODO: use opts = { default ... }
telescope.setup({
defaults = {
path_display = { "smart" },
Expand All @@ -23,10 +24,13 @@ return {
})
end,
keys = {
{'<leader>ff', function() require('telescope.builtin').find_files() end, desc = 'Telescope find files'},
{'<leader>fg', function() require('telescope.builtin').live_grep() end, desc = 'Telescope live grep'},
{'<leader>fb', "<cmd>Telescope buffers sort_mru=true sort_lastused=true initial_mode=normal<CR>",
desc = 'Telescope buffers'},
{'<leader>fh', function() require('telescope.builtin').help_tags() end, desc = 'Telescope help tags'},
{ '<leader>ff', function() require('telescope.builtin').find_files() end, desc = 'Telescope find files' },
{ '<leader>fg', function() require('telescope.builtin').live_grep() end, desc = 'Telescope live grep' },
{
'<leader>fb',
"<cmd>Telescope buffers sort_mru=true sort_lastused=true initial_mode=normal<CR>",
desc = 'Telescope buffers'
},
{ '<leader>fh', function() require('telescope.builtin').help_tags() end, desc = 'Telescope help tags' },
}
}
9 changes: 4 additions & 5 deletions nvim/.config/nvim/lua/plugins/tmux-navigator.lua
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
return {
{ 'alexghergh/nvim-tmux-navigation', config = function()

'alexghergh/nvim-tmux-navigation',
config = function()
local nvim_tmux_nav = require('nvim-tmux-navigation')

nvim_tmux_nav.setup {
disable_when_zoomed = true -- defaults to false
disable_when_zoomed = true -- defaults to false
}

-- TODO: use lazy keys (why use this plugin anyway)
vim.keymap.set('n', "<C-h>", nvim_tmux_nav.NvimTmuxNavigateLeft)
vim.keymap.set('n', "<C-j>", nvim_tmux_nav.NvimTmuxNavigateDown)
vim.keymap.set('n', "<C-k>", nvim_tmux_nav.NvimTmuxNavigateUp)
vim.keymap.set('n', "<C-l>", nvim_tmux_nav.NvimTmuxNavigateRight)
vim.keymap.set('n', "<C-\\>", nvim_tmux_nav.NvimTmuxNavigateLastActive)
vim.keymap.set('n', "<C-Space>", nvim_tmux_nav.NvimTmuxNavigateNext)

end
}
}
4 changes: 1 addition & 3 deletions nvim/.config/nvim/lua/plugins/treesitter.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
return {
{
"nvim-treesitter/nvim-treesitter",
}
"nvim-treesitter/nvim-treesitter",
}
27 changes: 12 additions & 15 deletions nvim/.config/nvim/lua/plugins/vimtex.lua
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
return {
{
"lervag/vimtex",
lazy = true,
init = function()
vim.g.vimtex_view_method = "zathura"
vim.g.tex_flavor = "latex"
vim.g.vimtex_quickfix_mode = 0
vim.g.tex_conceal = "abdmg"
vim.cmd("filetype plugin on")
end,
config = function()
vim.opt.conceallevel = 1
end,
},
"lervag/vimtex",
lazy = true,
init = function()
vim.g.vimtex_view_method = "zathura"
vim.g.tex_flavor = "latex"
vim.g.vimtex_quickfix_mode = 0
vim.g.tex_conceal = "abdmg"
vim.cmd("filetype plugin on")
end,
config = function()
vim.opt.conceallevel = 1
end,
}

2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/plugins/vivify.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
return {
{ "jannis-baum/vivify.vim" }
"jannis-baum/vivify.vim"
}
Loading