hulthe/df
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvim: Stuff

Browse Source
This commit is contained in:
Joakim Hulthe
2025-08-02 12:00:01 +02:00
parent e63b1fd2e6
commit 594b3d667b
8 changed files with 696 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tree/.config/nvim/init.lua
View File

@ -22,7 +22,9 @@ vim.opt.rtp:prepend(lazypath)
-- TODO: get colored renders working
vim.g.rustaceanvim = {
-- Plugin configuration
tools = {},
tools = {
float_win_config = { border = 'rounded' },
},
-- LSP configuration
server = {
@ -36,7 +38,12 @@ vim.g.rustaceanvim = {
end,
default_settings = {
['rust-analyzer'] = {
checkOnSave = { overrideCommand = "cargo check --message-format=json-diagnostic-rendered-ansi" },
checkOnSave = true,
check = {
overrideCommand = {
"cargo", "check", "--message-format=json-diagnostic-rendered-ansi",
}
},
},
},
settings = function(project_root)
@ -91,13 +98,22 @@ require("mason").setup({
},
ensure_installed = language_servers,
})
require("mason-lspconfig").setup()
require("mason-lspconfig").setup {
automatic_enable = {
exclude = {
-- rust_analyzer is managed by rustaceanvim
"rust_analyzer",
}
}
}
local lspconfig = require("lspconfig")
for _, l in pairs(language_servers) do
lspconfig[l].setup {}
end
require('dapui').setup();
local compare = require "cmp.config.compare"
require('cmp').setup.filetype({ "rust" }, {
sorting = {

97
tree/.config/nvim/lua/keys.lua
View File

@ -1,15 +1,96 @@
local telescope = require('telescope.builtin')
local wk = require('which-key')
local harpoon = require("harpoon")
local telescope_conf = require("telescope.config").values
harpoon:setup()
vim.keymap.set('n', '<leader>f', telescope.find_files, { desc = "File picker" })
vim.keymap.set('n', '<leader>g', telescope.live_grep, { desc = "Grep recursively" })
vim.keymap.set('n', '<leader>b', telescope.buffers, { desc = "Buffer picker" })
vim.keymap.set('n', '<leader>?', telescope.help_tags, { desc = "Help tags picker" })
vim.keymap.set('n', '<leader>s', telescope.treesitter, { desc = "Treesitter symbol picker" })
vim.keymap.set('n', '<leader>j', telescope.jumplist, { desc = "Jumplist" })
vim.keymap.set('n', '<leader>u', ":TodoTelescope<Enter>", { desc = "Grep for TODOs" })
vim.keymap.set('n', 'U', ":redo<Enter>", {})
vim.keymap.set('n', '<leader>p', ":b#<Enter>", { desc = "Go to last buffer" })
local function toggle_telescope(harpoon_files)
local displayer = require("telescope.pickers.entry_display").create({
separator = " | ",
items = {
--{ width = 0.1 },
{ width = 0.9 },
}
})
local harpoons = {}
for _, item in ipairs(harpoon_files.items) do
table.insert(harpoons, {
filepath = item.value,
col = item.context.col,
row = item.context.row,
})
end
require("telescope.pickers").new({}, {
prompt_title = "Harpoon",
finder = require("telescope.finders").new_table({
results = harpoons,
entry_maker = function(entry)
--vim.print("mapping entry")
--vim.print(entry)
local filepath_with_row = string.format("%s:%d", entry.filepath, entry.row)
return {
-- Value to display. Required. type=any
--value = { "foo", entry.filepath, },
value = entry,
-- Whether to display the entry. Optional. type=bool
valid = true,
-- Optional. type=string|function
--display = entry.filepath,
display = function(entry)
return displayer({
-- NOTE: the number of elements must match the
-- configuration passed to `displayer` above
--{ "foobar" },
{ filepath_with_row }
})
end,
-- Used for filtering. Optional. type=string
ordinal = filepath_with_row,
-- File to open when pressing enter. Optional. type=string
filename = entry.filepath,
-- Buffer to open when pressing enter. Optional. type=number
-- bufnr = 0,
-- Line number of file/buffer to open. Optional. type=number
lnum = entry.row,
-- Line number of file/buffer to open. Optional. type=number
col = entry.row,
}
end
}),
previewer = telescope_conf.grep_previewer({}),
sorter = telescope_conf.generic_sorter({}),
}):find()
end
vim.keymap.set("n", "<leader>h", function() toggle_telescope(harpoon:list()) end,
{ desc = "Open harpoon window" })
vim.keymap.set("n", "<leader>H", function() harpoon:list():add() end,
{ desc = "Launch harpoon" })
-- Toggle previous & next buffers stored within Harpoon list
--vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
--vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
-- Use LspAttach autocommand to only map the following keys
-- after the language server attaches to the current buffer
vim.api.nvim_create_autocmd('LspAttach', {
@ -22,14 +103,19 @@ vim.api.nvim_create_autocmd('LspAttach', {
-- See `:help vim.lsp.*` for documentation on any of the below functions
vim.keymap.set('n', '<leader>ld', telescope.lsp_definitions, { desc = "Show definitons", buffer = ev.buf })
vim.keymap.set('n', '<leader>lr', telescope.lsp_references, { desc = "Show references", buffer = ev.buf })
vim.keymap.set('n', '<leader>li', telescope.lsp_implementations, { desc = "Show implementations", buffer = ev.buf })
vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions, { desc = "Show type definitions", buffer = ev.buf })
vim.keymap.set('n', '<leader>li', telescope.lsp_implementations,
{ desc = "Show implementations", buffer = ev.buf })
vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions,
{ desc = "Show type definitions", buffer = ev.buf })
vim.keymap.set('n', '<leader>le', telescope.diagnostics, { desc = "Show diagnostics", buffer = ev.buf })
vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols, { desc = "Show workspace symbols", buffer = ev.buf })
vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols,
{ desc = "Show workspace symbols", buffer = ev.buf })
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf })
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, { buffer = ev.buf })
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, { desc = "Add workspace folder", buffer = ev.buf })
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, { desc = "Remove workspace folder", buffer = ev.buf })
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder,
{ desc = "Add workspace folder", buffer = ev.buf })
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder,
{ desc = "Remove workspace folder", buffer = ev.buf })
vim.keymap.set('n', '<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, { desc = "List workspace folders", buffer = ev.buf })
@ -40,7 +126,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
{ "<leader>l", desc = "Language server stuff" },
{ "<leader>w", desc = "Workspace stuff" },
})
end,
})

1
tree/.config/nvim/lua/opts.lua
View File

@ -50,4 +50,3 @@ vim.api.nvim_set_option('updatetime', 300)
-- Uncomment to enable treesitter folding by default
--vim.wo.foldmethod = 'expr'
--vim.wo.foldexpr = 'nvim_treesitter#foldexpr()'

28
tree/.config/nvim/lua/plugins.lua
View File

@ -48,6 +48,20 @@ require("lazy").setup({
words = { enabled = true },
},
},
{
"folke/flash.nvim",
event = "VeryLazy",
---@type Flash.Config
opts = {},
-- stylua: ignore
keys = {
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
},
},
-- -- language server stuff
{ 'williamboman/mason.nvim' },
@ -55,10 +69,13 @@ require("lazy").setup({
{ 'neovim/nvim-lspconfig' },
{
'mrcjkb/rustaceanvim',
version = '^4',
version = '^6',
lazy = false, -- This plugin is already lazy
},
{ 'mfussenegger/nvim-dap' },
{ 'rcarriga/nvim-dap-ui', dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' } },
{ 'theHamsta/nvim-dap-virtual-text' },
{ 'jay-babu/mason-nvim-dap.nvim' },
-- -- nushell support
-- --use { 'LhKipp/nvim-nu', run = function() vim.fn[':TSInstall nu'] end} }
@ -79,9 +96,16 @@ require("lazy").setup({
{ 'hrsh7th/vim-vsnip' },
{ 'ryo33/nvim-cmp-rust' },
{ 'nvim-telescope/telescope.nvim', branch = '0.1.x',
{
'nvim-telescope/telescope.nvim',
branch = '0.1.x',
dependencies = { 'nvim-lua/plenary.nvim' }
},
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" }
},
-- -- status line
{ 'linrongbin16/lsp-progress.nvim' },