Compare commits
No commits in common. "19c95400f79f3b74bdb0fe60c4c5afea539f30a5" and "d99c908ac31d911b2c4c0061ed08c5658cd81624" have entirely different histories.
19c95400f7
...
d99c908ac3
7 changed files with 30 additions and 53 deletions
|
@ -23,9 +23,9 @@
|
||||||
"cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" },
|
"cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||||
"completion-vcard": { "branch": "master", "commit": "2220fd517a985ececed1adcf0e5be8f2815564c7" },
|
"completion-vcard": { "branch": "master", "commit": "2220fd517a985ececed1adcf0e5be8f2815564c7" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "60e6fbddbdf37d7790de07dc7420beefaf650e5e" },
|
"conform.nvim": { "branch": "master", "commit": "797d1f622a23d4a21bb58218bdf5999a9beac4ef" },
|
||||||
"dial.nvim": { "branch": "master", "commit": "54b503f906bc9e5ab85288414840a1b86d40769f" },
|
"dial.nvim": { "branch": "master", "commit": "54b503f906bc9e5ab85288414840a1b86d40769f" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" },
|
"dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
|
||||||
"fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
|
"fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
|
||||||
"flash.nvim": { "branch": "main", "commit": "7bb4a9c75d1e20cd24185afedeaa11681829ba23" },
|
"flash.nvim": { "branch": "main", "commit": "7bb4a9c75d1e20cd24185afedeaa11681829ba23" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
|
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
|
||||||
|
@ -37,7 +37,7 @@
|
||||||
"image.nvim": { "branch": "master", "commit": "da64ce69598875c9af028afe129f916b02ccc42e" },
|
"image.nvim": { "branch": "master", "commit": "da64ce69598875c9af028afe129f916b02ccc42e" },
|
||||||
"img-clip.nvim": { "branch": "main", "commit": "fc30500c35663aa1762697f5aba31d43b86028f0" },
|
"img-clip.nvim": { "branch": "main", "commit": "fc30500c35663aa1762697f5aba31d43b86028f0" },
|
||||||
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
|
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "c882227f1fdc4580d14212df8f814a0772951e3d" },
|
"lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" },
|
||||||
"lsp-setup.nvim": { "branch": "main", "commit": "6e4e977512ce426d8b52c27f3b6e6aefc73e1452" },
|
"lsp-setup.nvim": { "branch": "main", "commit": "6e4e977512ce426d8b52c27f3b6e6aefc73e1452" },
|
||||||
"ltex_extra.nvim": { "branch": "dev", "commit": "57192d7ae5ba8cef3c10e90f2cd62d4a7cdaab69" },
|
"ltex_extra.nvim": { "branch": "dev", "commit": "57192d7ae5ba8cef3c10e90f2cd62d4a7cdaab69" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
|
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
|
||||||
|
@ -57,32 +57,31 @@
|
||||||
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
|
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
||||||
"nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" },
|
"nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" },
|
||||||
"nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
|
"nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" },
|
"nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
|
"nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
|
"nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" },
|
||||||
"nvim-toggleterm.lua": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
|
"nvim-toggleterm.lua": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
|
||||||
"nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
|
"nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" },
|
"nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" },
|
||||||
"nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" },
|
"nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" },
|
||||||
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
|
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
|
||||||
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" },
|
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "1428108f18ce9d8cc4481dcedebeeb490eabf395" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" },
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
|
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
|
||||||
"otter.nvim": { "branch": "main", "commit": "45db1799625eacda838c196c728974058d922d80" },
|
"otter.nvim": { "branch": "main", "commit": "cbb1be0586eae18cbea38ada46af428d2bebf81a" },
|
||||||
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
|
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
||||||
"quarto-nvim": { "branch": "main", "commit": "09fabb62d414e56ee3245c558aaedbdc662b6493" },
|
"quarto-nvim": { "branch": "main", "commit": "a6e7452de5944f7f38a4b12f1d50e460c1dccd95" },
|
||||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "12b1a1e095d968887a17ef791c2edb78d7595d46" },
|
"rainbow-delimiters.nvim": { "branch": "master", "commit": "12b1a1e095d968887a17ef791c2edb78d7595d46" },
|
||||||
"smartcolumn.nvim": { "branch": "main", "commit": "d01b99355c7fab13233f48d0f28dc097e68a03f7" },
|
"smartcolumn.nvim": { "branch": "main", "commit": "d01b99355c7fab13233f48d0f28dc097e68a03f7" },
|
||||||
"stickybuf.nvim": { "branch": "master", "commit": "2160fcd536d81f5fa43f7167dba6634e814e3154" },
|
"stickybuf.nvim": { "branch": "master", "commit": "2160fcd536d81f5fa43f7167dba6634e814e3154" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "935bedf39c440de2f97ce58dbbb44a40402057c1" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
|
||||||
"telescope-luasnip.nvim": { "branch": "master", "commit": "11668478677de360dea45cf2b090d34f21b8ae07" },
|
"telescope-luasnip.nvim": { "branch": "master", "commit": "11668478677de360dea45cf2b090d34f21b8ae07" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||||
"texpresso.vim": { "branch": "main", "commit": "1cc949fde8ed3220968039b6b1b6ccdd9f475087" },
|
"trouble.nvim": { "branch": "main", "commit": "09380a8ed0694dbfbbcf59f9eaac499e259cb75c" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "57761ba7148164f0315ed203e714ac242329abd4" },
|
|
||||||
"twilight.nvim": { "branch": "main", "commit": "8bb7fa7b918baab1ca81b977102ddb54afa63512" },
|
"twilight.nvim": { "branch": "main", "commit": "8bb7fa7b918baab1ca81b977102ddb54afa63512" },
|
||||||
"undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },
|
"undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },
|
||||||
"vifm.vim": { "branch": "master", "commit": "a8130c37d144b51d84bee19f0532abcd3583383f" },
|
"vifm.vim": { "branch": "master", "commit": "a8130c37d144b51d84bee19f0532abcd3583383f" },
|
||||||
|
|
|
@ -6,7 +6,7 @@ appear in the buffer list. Useful for e.g. jotting down quick notes and thoughts
|
||||||
If called with bang, will replace the current buffer with the scratch
|
If called with bang, will replace the current buffer with the scratch
|
||||||
window, otherwise opens a new split.
|
window, otherwise opens a new split.
|
||||||
|
|
||||||
The buffer, by default is set to the markdown filetype.
|
The buffer, by default is set to the pandoc filetype.
|
||||||
This can be changed by setting the `g:scratchpad_ft` variable or the `b:scratchpad_ft`
|
This can be changed by setting the `g:scratchpad_ft` variable or the `b:scratchpad_ft`
|
||||||
variable to the intended filetype.
|
variable to the intended filetype.
|
||||||
]]
|
]]
|
||||||
|
@ -25,9 +25,9 @@ function M.create(split, ft)
|
||||||
else
|
else
|
||||||
split = true
|
split = true
|
||||||
end
|
end
|
||||||
-- which filetype to set for the scratchpad, defaults to markdown
|
-- which filetype to set for the scratchpad, defaults to pandoc
|
||||||
if isempty(ft) then
|
if isempty(ft) then
|
||||||
ft = vim.b["scratchpad_ft"] or vim.g["scratchpad_ft"] or "markdown"
|
ft = vim.b["scratchpad_ft"] or vim.g["scratchpad_ft"] or "pandoc"
|
||||||
end
|
end
|
||||||
|
|
||||||
local buf = api.nvim_create_buf(false, true)
|
local buf = api.nvim_create_buf(false, true)
|
||||||
|
|
|
@ -100,6 +100,7 @@ return {
|
||||||
account = vim.env["HOME"] .. "/documents/records/budget/main.beancount", -- TODO implement dynamically
|
account = vim.env["HOME"] .. "/documents/records/budget/main.beancount", -- TODO implement dynamically
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{ name = "otter" },
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
{ name = "nvim_lsp_signature_help" },
|
{ name = "nvim_lsp_signature_help" },
|
||||||
{ name = "luasnip", keyword_length = 1 },
|
{ name = "luasnip", keyword_length = 1 },
|
||||||
|
|
|
@ -39,6 +39,7 @@ local servers = {
|
||||||
basedpyright = {},
|
basedpyright = {},
|
||||||
ruff = {},
|
ruff = {},
|
||||||
serve_d = {},
|
serve_d = {},
|
||||||
|
tailwindcss = {},
|
||||||
taplo = {},
|
taplo = {},
|
||||||
texlab = {},
|
texlab = {},
|
||||||
tsserver = {},
|
tsserver = {},
|
||||||
|
@ -157,13 +158,12 @@ lspconfig.nushell.setup({})
|
||||||
lspconfig.marksman.setup({
|
lspconfig.marksman.setup({
|
||||||
filetypes = { "markdown", "quarto" },
|
filetypes = { "markdown", "quarto" },
|
||||||
on_attach = function(client, bufnr)
|
on_attach = function(client, bufnr)
|
||||||
-- TODO: for some reason this stays true even after rootdir switch?
|
-- TODO: for some reason this is always true even though it shouldn't be
|
||||||
if client.config.in_zk_notebook then
|
if client.config.in_zk_notebook then
|
||||||
vim.defer_fn(function()
|
vim.defer_fn(function()
|
||||||
vim.lsp.buf_detach_client(bufnr, client.id)
|
vim.lsp.buf_detach_client(bufnr, client.id)
|
||||||
end, 1000)
|
end, 1000)
|
||||||
end
|
end
|
||||||
on_attach(client, bufnr)
|
|
||||||
end,
|
end,
|
||||||
on_new_config = function(conf, new_root)
|
on_new_config = function(conf, new_root)
|
||||||
if require("lspconfig.util").root_pattern(".zk")(new_root) then
|
if require("lspconfig.util").root_pattern(".zk")(new_root) then
|
||||||
|
@ -219,7 +219,6 @@ if require("core.util").is_available("arduino") then
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
-- attach ltex for fitting ft only when spell checking becomes enabled
|
|
||||||
vim.api.nvim_create_autocmd("User", {
|
vim.api.nvim_create_autocmd("User", {
|
||||||
pattern = "SpellEnable",
|
pattern = "SpellEnable",
|
||||||
callback = function()
|
callback = function()
|
||||||
|
|
|
@ -173,11 +173,6 @@ return {
|
||||||
evaluate_single = true,
|
evaluate_single = true,
|
||||||
items = {
|
items = {
|
||||||
starter.sections.builtin_actions(),
|
starter.sections.builtin_actions(),
|
||||||
{
|
|
||||||
name = "Scratchpad",
|
|
||||||
action = "lua require('personal.scratchpad').create()",
|
|
||||||
section = "Builtin actions",
|
|
||||||
},
|
|
||||||
starter.sections.recent_files(10, true),
|
starter.sections.recent_files(10, true),
|
||||||
starter.sections.recent_files(10, false),
|
starter.sections.recent_files(10, false),
|
||||||
-- Use this if you set up 'mini.sessions'
|
-- Use this if you set up 'mini.sessions'
|
||||||
|
|
|
@ -16,21 +16,21 @@ local formatters = {
|
||||||
astro = { { "prettierd", "prettier" } },
|
astro = { { "prettierd", "prettier" } },
|
||||||
bash = { "shfmt" },
|
bash = { "shfmt" },
|
||||||
bib = { "bibtex-tidy" },
|
bib = { "bibtex-tidy" },
|
||||||
css = { { "prettierd", "prettier" }, "rustywind" },
|
css = { { "prettierd", "prettier" } },
|
||||||
graphql = { { "prettierd", "prettier" } },
|
graphql = { { "prettierd", "prettier" } },
|
||||||
html = { { "prettierd", "prettier" }, "rustywind" },
|
html = { { "prettierd", "prettier" } },
|
||||||
javascript = { { "prettierd", "prettier" } },
|
javascript = { { "prettierd", "prettier" } },
|
||||||
javascriptreact = { { "prettierd", "prettier" } },
|
javascriptreact = { { "prettierd", "prettier" } },
|
||||||
json = { "jq" },
|
json = { "jq" },
|
||||||
liquid = { { "prettierd", "prettier" } },
|
liquid = { { "prettierd", "prettier" } },
|
||||||
lua = { "stylua" },
|
lua = { "stylua" },
|
||||||
markdown = { { "prettierd", "prettier" } },
|
markdown = { { "prettierd", "prettier" } },
|
||||||
python = { "ruff_fix", "ruff_format", "ruff_organize_imports" },
|
python = { "ruff_fix", "ruff_format" },
|
||||||
sh = { "shfmt" },
|
sh = { "shfmt" },
|
||||||
svelte = { { "prettierd", "prettier" } },
|
svelte = { { "prettierd", "prettier" } },
|
||||||
typescript = { { "prettierd", "prettier" } },
|
typescript = { { "prettierd", "prettier" } },
|
||||||
typescriptreact = { { "prettierd", "prettier" } },
|
typescriptreact = { { "prettierd", "prettier" } },
|
||||||
vue = { { "prettierd", "prettier" }, "rustywind" },
|
vue = { { "prettierd", "prettier" } },
|
||||||
yaml = { { "prettierd", "prettier" } },
|
yaml = { { "prettierd", "prettier" } },
|
||||||
zsh = { "shfmt" },
|
zsh = { "shfmt" },
|
||||||
}
|
}
|
||||||
|
@ -141,7 +141,7 @@ return {
|
||||||
"stevearc/conform.nvim",
|
"stevearc/conform.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("conform").setup({
|
require("conform").setup({
|
||||||
lsp_format = "fallback",
|
lsp_fallback = true,
|
||||||
format_after_save = function(bufnr)
|
format_after_save = function(bufnr)
|
||||||
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
|
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
|
||||||
return
|
return
|
||||||
|
@ -149,6 +149,12 @@ return {
|
||||||
return { lsp_fallback = true }
|
return { lsp_fallback = true }
|
||||||
end,
|
end,
|
||||||
formatters_by_ft = formatters,
|
formatters_by_ft = formatters,
|
||||||
|
formatters = {
|
||||||
|
-- enable python isort functionality
|
||||||
|
ruff_fix = {
|
||||||
|
prepend_args = { "--select", "I" },
|
||||||
|
},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
vim.api.nvim_create_user_command("FormatDisable", function(args)
|
vim.api.nvim_create_user_command("FormatDisable", function(args)
|
||||||
if args.bang then
|
if args.bang then
|
||||||
|
@ -196,7 +202,7 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
event = { "BufWritePre" },
|
event = { "BufReadPost", "BufNewFile", "BufWritePre" },
|
||||||
opts = {},
|
opts = {},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -219,28 +225,6 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- automatic docstring creation for a variety of languages
|
|
||||||
{
|
|
||||||
"danymat/neogen",
|
|
||||||
dependencies = "nvim-treesitter/nvim-treesitter",
|
|
||||||
opts = {
|
|
||||||
snippet_engine = "luasnip",
|
|
||||||
},
|
|
||||||
cmd = {
|
|
||||||
"Neogen",
|
|
||||||
},
|
|
||||||
keys = {
|
|
||||||
{
|
|
||||||
"<localleader>lg",
|
|
||||||
function()
|
|
||||||
require("neogen").generate()
|
|
||||||
end,
|
|
||||||
silent = true,
|
|
||||||
desc = "generate docstring",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- testing setup
|
-- testing setup
|
||||||
{
|
{
|
||||||
"nvim-neotest/neotest",
|
"nvim-neotest/neotest",
|
||||||
|
|
|
@ -5,7 +5,6 @@ c.url.searchengines = {
|
||||||
"anna": "https://annas-archive.org/search?q={}",
|
"anna": "https://annas-archive.org/search?q={}",
|
||||||
"aur": "https://aur.archlinux.org/packages/?K={}",
|
"aur": "https://aur.archlinux.org/packages/?K={}",
|
||||||
"bgg": "https://boardgamegeek.com/geeksearch.php?action=search&q={}&objecttype=boardgame",
|
"bgg": "https://boardgamegeek.com/geeksearch.php?action=search&q={}&objecttype=boardgame",
|
||||||
"bw": "https://bookwyrm.social/search?q={}",
|
|
||||||
"d": "https://www.dict.cc/?s={}",
|
"d": "https://www.dict.cc/?s={}",
|
||||||
"ddg": "https://duckduckgo.com/?q={}",
|
"ddg": "https://duckduckgo.com/?q={}",
|
||||||
"dt": "https://www.deepl.com/translator#en/de/{}",
|
"dt": "https://www.deepl.com/translator#en/de/{}",
|
||||||
|
|
Loading…
Reference in a new issue