Sync config for all systems

This commit is contained in:
Martin
2025-07-10 20:03:17 +02:00
parent 2517fd0269
commit 4d7caf0abe
10 changed files with 176 additions and 35 deletions

View File

@ -98,16 +98,9 @@ cmp.setup.cmdline(':', {
local capabilities = require('cmp_nvim_lsp').default_capabilities()
local lspconfig = require("lspconfig")
-- lspconfig.svelte.setup({ capabilities = capabilities })
-- lspconfig.omnisharp.setup({ capabilities = capabilities })
-- lspconfig.clangd.setup({ capabilities = capabilities })
-- lspconfig.dockerls.setup({ capabilities = capabilities })
-- lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
-- lspconfig.flow.setup({ capabilities = capabilities })
-- lspconfig.sqls.setup({ capabilities = capabilities })
-- lspconfig.yamlls.setup({ capabilities = capabilities })
-- lspconfig.nil_ls.setup({ capabilities = capabilities })
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.foldingRange = {
dynamicRegistration = false,
lineFoldingOnly = true
@ -282,7 +275,13 @@ require('gitsigns').setup {
},
}
require("conform").setup({
python = {"black"},
rust = {"rustfmt"},
go = {"gofmt"},
})
require("trouble").setup()
require("todo-comments").setup()
require("dapui").setup()
require("nvim-dap-virtual-text").setup()
@ -301,7 +300,7 @@ dap.listeners.before.event_exited.dapui_config = function()
dapui.close()
end
require("obsidian").setup({
if vim.fn.has("mac") then
workspaces = {
{
name = "privat",
@ -311,10 +310,32 @@ require("obsidian").setup({
name = "joplin",
path = "~/Documents/notes/fromjoplin",
},
},
}
daily_notes = {
folder = "Journal",
date_format = "%Y-%m-%d",
default_tags = { "journal" },
template = "daily.md"
}
elseif vim.fn.has("win32") then
workspaces = {
{
name = "work",
path = "/mnt/c/Users/marti/Documents/notes/Work",
},
{
name = "privat",
path = "/mnt/c/Users/marti/Documents/notes/privat",
},
}
daily_notes = {}
end
require("obsidian").setup({
workspaces = workspaces,
templates = {
folder = "_templates",
date_format = "%Y-%m-%d-%a",
date_format = "%Y-%m-%d %a",
time_format = "%H:%M",
},
ui = {
@ -324,6 +345,7 @@ require("obsidian").setup({
["x"] = { char = "", hl_group = "ObsidianDone" },
["~"] = { char = "󰰱", hl_group = "ObsidianTilde" },
["!"] = { char = "", hl_group = "ObsidianImportant" },
["?"] = { char = "?", hl_group = "ObsidianImportant" }
},
},
disable_frontmatter = false,
@ -335,8 +357,6 @@ require("obsidian").setup({
local out = { id = note.id, tags = note.tags }
-- `note.metadata` contains any manually added fields in the frontmatter.
-- So here we just make sure those fields are kept in the frontmatter.
if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
for k, v in pairs(note.metadata) do
out[k] = v
@ -346,18 +366,8 @@ require("obsidian").setup({
return out
end,
note_path_func = function(spec)
-- This is equivalent to the default behavior.
local path = spec.dir / spec.title
return path:with_suffix(".md")
end,
daily_notes = {
-- Optional, if you keep daily notes in a separate directory.
folder = "Journal",
-- Optional, if you want to change the date format for the ID of daily notes.
date_format = "%Y-%m-%d",
-- Optional, default tags to add to each new daily note created.
default_tags = { "journal" },
-- Optional, if you want to automatically insert a template from your template directory like 'daily.md'
template = "daily.md"
},
daily_notes = daily_notes,
})