Compare commits

...

8 Commits

Author SHA1 Message Date
409
23b911e176 load obsidian.nvim workspaces from .obsidian_vaults file
this decouples the user-specific vaults from the repo
the `.obsidian_vaults` file is expected to be in the root of the nvim
config
2025-05-23 06:48:22 +02:00
409
c5a11347b2 add lazydev 2025-05-23 06:48:11 +02:00
409
36c2767bfc remove spell/ from repo 2025-05-23 06:47:56 +02:00
409
d7a2563550 lazy-lock.json 2025-05-23 05:49:31 +02:00
409
bc354eb60a fix deprecated lsp function call 2025-05-23 05:49:16 +02:00
409
ce0eed7a96 switch to FzfLua buffers for <C-b> 2025-05-23 05:48:44 +02:00
409
14282b6c18 <leader>q for qflist toggle 2025-05-23 05:48:23 +02:00
409
69e929674f add gitignore 2025-05-23 05:47:32 +02:00
10 changed files with 97 additions and 41 deletions

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
spell/
.obsidian_vaults

View File

@@ -3,46 +3,47 @@
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
"blink.cmp": { "branch": "main", "commit": "485c03400608cb6534bbf84da8c1c471fc4808c0" },
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
"conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
"catppuccin": { "branch": "main", "commit": "8162a4bd9afb42837a655e404d1f937a87ba95e6" },
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
"flutter-tools.nvim": { "branch": "main", "commit": "6faf2c70bd56f1fe78620591a2bb73f4dc6f4870" },
"fzf-lua": { "branch": "main", "commit": "98fb51f2820ead2f8e3c37a7071d7a113b07e2c1" },
"gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" },
"flutter-tools.nvim": { "branch": "main", "commit": "d5bb1dc3db78d7ab65dd8c5a6f32a38e383b9cb1" },
"fzf-lua": { "branch": "main", "commit": "8adf950093af5361621cf52208d64995b1af78b5" },
"gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "97366dabc117e5441aea543aad2ee587364a537c" },
"lualine.nvim": { "branch": "master", "commit": "834a5817f7e2be22a7062620032d49c600c35fab" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"mini.indentscope": { "branch": "main", "commit": "613df2830d7faeae7483ba2e736683154b95921e" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"neogen": { "branch": "main", "commit": "05d754004da8c89115b291f2a23ca530a8cac8fd" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "320d5913bc5a0b0f15537e32777331d2323ab7f8" },
"lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "3856bbb0da214d1f2f3d5a2dd3fea26591f930f9" },
"mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" },
"mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" },
"mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
"neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" },
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
"nvim-lspconfig": { "branch": "master", "commit": "442e077e326ac467daf9cd63e72120fb450a850b" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-spectre": { "branch": "master", "commit": "ddd7383e856a7c939cb4f5143278fe041bbb8cb9" },
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
"nvim-lspconfig": { "branch": "master", "commit": "f610208989e9c03561f9f601db3133f6ae398fcd" },
"nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
"nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
"nvim-tree-docs": { "branch": "master", "commit": "5db023d783da1e55339e5e25caaf72a59597e626" },
"nvim-treesitter": { "branch": "master", "commit": "205faba1768a6e4c854f156bc6a21a41b242599c" },
"nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
"nvim-web-devicons": { "branch": "master", "commit": "57dfa947cc88cdf1baa2c7e13ed31edddd8fb1d1" },
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
"oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"render-markdown.nvim": { "branch": "main", "commit": "a615baed85137a8c6fc8e95f5545f64d33f5f384" },
"tailwind-tools.nvim": { "branch": "master", "commit": "2bd8ef6e96d07df83c0b785c40416b98607b2f93" },
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
"render-markdown.nvim": { "branch": "main", "commit": "dac01bd6660af337613e8cfcb23a4aec5d3c0e38" },
"tailwind-tools.nvim": { "branch": "master", "commit": "aa9c7497420b34cdf045d0818a7041cc39a91df6" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "51f548421f8a74680eff27d283c9d5ea6e8d0074" },
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
"tsc.nvim": { "branch": "main", "commit": "5bd25bb5c399b6dc5c00392ade6ac6198534b53a" },
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
"vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
"vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
"vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
"vim-dadbod-ui": { "branch": "master", "commit": "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5" },
"vim-dadbod-ui": { "branch": "master", "commit": "460432301a5cb280ea265ddfa15c9f3dcd1d26b7" },
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
"vim-pencil": { "branch": "master", "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed" },
"vim-tmux-navigator": { "branch": "master", "commit": "791dacfcfc8ccb7f6eb1c853050883b03e5a22fe" }
"vim-tmux-navigator": { "branch": "master", "commit": "0ecda542c0bd3ea26444044c7f03e469a6bb0bff" }
}

View File

@@ -51,7 +51,15 @@ return {
},
},
sources = {
default = { "lsp", "path", "buffer" },
default = { "lsp", "lazydev", "path", "buffer" },
providers = {
lazydev = {
name = "LazyDev",
module = "lazydev.integrations.blink",
-- make lazydev completions top priority (see `:h blink.cmp`)
score_offset = 100,
},
},
},
completion = {
accept = {

View File

@@ -0,0 +1,13 @@
return {
{
"folke/lazydev.nvim",
ft = "lua", -- only load on lua files
opts = {
library = {
-- See the configuration section for more details
-- Load luvit types when the `vim.uv` word is found
{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
},
},
},
}

View File

@@ -38,14 +38,14 @@ return {
vim.keymap.set("n", "gd", function()
vim.lsp.buf.definition({
on_list = function(list)
vim.lsp.util.jump_to_location(list.items[1].user_data, "utf-8", true)
vim.lsp.util.show_document(list.items[1].user_data, "utf-8", { focus = true })
end,
})
end, { buffer = bufnr, remap = false, nowait = true })
vim.keymap.set("n", "gi", function()
vim.lsp.buf.implementation({
on_list = function(list)
vim.lsp.util.jump_to_location(list.items[1].user_data, "utf-8", true)
vim.lsp.util.show_document(list.items[1].user_data, "utf-8", { focus = true })
end,
})
end, lsp_opts)
@@ -59,10 +59,10 @@ return {
vim.diagnostic.open_float()
end, lsp_opts)
vim.keymap.set("n", "[d", function()
vim.diagnostic.goto_next()
vim.diagnostic.jump({ count = 1 })
end, lsp_opts)
vim.keymap.set("n", "]d", function()
vim.diagnostic.goto_prev()
vim.diagnostic.jump({ count = -1 })
end, lsp_opts)
vim.keymap.set("n", "<leader>vca", function()
vim.lsp.buf.code_action()
@@ -184,7 +184,7 @@ return {
if
opts.inlay_hints.enabled
and client ~= nil
and client.supports_method("textDocument/inlayHint")
and client.supports_method(client, "textDocument/inlayHint")
then
vim.lsp.inlay_hint.enable(true)
end
@@ -195,7 +195,7 @@ return {
pattern = { "*.svelte", "*.js", "*.ts" },
group = vim.api.nvim_create_augroup("svelte_ondidchangetsorjsfile", { clear = true }),
callback = function(ctx)
client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
client.notify(client, "$/onDidChangeTsOrJsFile", { uri = ctx.match })
end,
})
end
@@ -204,7 +204,7 @@ return {
vim.api.nvim_create_autocmd("BufWritePost", {
pattern = { "*.svelte", "*.js", "*.ts" },
callback = function(ctx)
client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
client.notify(client, "$/onDidChangeTsOrJsFile", { uri = ctx.match })
end,
})
end

View File

@@ -154,7 +154,7 @@ return {
{
"<C-b>",
function()
require("telescope.builtin").buffers()
require('fzf-lua').buffers()
end,
desc = "Find buffers",
},

View File

@@ -41,11 +41,27 @@ return {
ui = {
enable = false,
},
workspaces = {
{
name = "personal",
path = "~/obsidian/409",
},
},
workspaces = (function()
local vaults = {}
local vaults_file_path = vim.fn.stdpath("config") .. "/.obsidian_vaults"
local vaults_file = io.open(vaults_file_path, "r")
if vaults_file == nil then
return vaults
end
for line in vaults_file:lines() do
for vault_name, vault_path in string.gmatch(line, "%s*(%S+)%s*=%s*(.+)%s*") do
vaults[#vaults + 1] = {
name = vault_name,
path = vault_path,
}
vim.print(vaults[#vaults])
end
end
return vaults
end)(),
},
}

View File

@@ -47,3 +47,20 @@ vim.keymap.set("v", ">", ">gv")
vim.keymap.set("n", "]q", "<cmd>cnext<CR>")
vim.keymap.set("n", "[q", "<cmd>cprev<CR>")
-- toggle quickfix list
vim.keymap.set("n", "<leader>q", function()
local qf_exists = false
for _, win in pairs(vim.fn.getwininfo()) do
if win["quickfix"] == 1 then
qf_exists = true
end
end
if qf_exists == true then
vim.cmd("cclose")
return
end
if not vim.tbl_isempty(vim.fn.getqflist()) then
vim.cmd("copen")
end
end)

View File

@@ -1 +0,0 @@
TODO

Binary file not shown.