This commit is contained in:
Michael Thomson
2026-02-09 09:42:02 -05:00
parent da8683896c
commit f8857cf147
8 changed files with 67 additions and 127 deletions

View File

@@ -51,6 +51,10 @@ vim.o.termguicolors = true
vim.g.netrw_liststyle = 0
vim.g.netrw_banner = 0
-- conceal and foldlevel
vim.o.conceallevel = 3
vim.o.foldlevel = 99
-- Basic Keymaps
-- improves C-u and C-d by centering on scroll
vim.keymap.set('n', '<C-u>', '<C-u>zz', { desc = 'Scroll Up' })
@@ -84,14 +88,28 @@ vim.pack.add({
{ src = 'https://github.com/neovim/nvim-lspconfig' },
{ src = 'https://github.com/stevearc/oil.nvim' },
{ src = 'https://github.com/saghen/blink.cmp', version = vim.version.range('1.*') },
{ src = 'https://github.com/zk-org/zk-nvim' },
})
-- treesitter
local tsfiletypes = { 'lua', 'markdown', 'haskell' }
vim.api.nvim_create_autocmd('FileType', {
pattern = '*',
callback = function()
pcall(vim.treesitter.start)
vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
vim.wo[0][0].foldmethod = 'expr'
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
end,
})
-- Theme (vague)
vim.cmd('colorscheme modus')
vim.cmd('colorscheme modus_operandi')
-- Blink
require('blink.cmp').setup({
signature = { enabled = true }
signature = { enabled = true },
completion = { documentation = { auto_show = true }}
})
-- Oil
@@ -110,6 +128,18 @@ vim.keymap.set('n', '<leader>fg', MiniPick.builtin.grep_live, { desc = 'Grep Fil
-- Oil
vim.keymap.set('n', '<leader>fe', '<CMD>Oil<CR>', { desc = 'Explore Files' })
-- zk
require('zk').setup({
picker = "minipick"
})
vim.keymap.set("n", "<leader>zn", "<Cmd>ZkNew { title = vim.fn.input('Title: ') }<CR>")
vim.keymap.set("v", "<leader>znt", ":'<,'>ZkNewFromTitleSelection<CR>")
vim.keymap.set("n", "<leader>zf", "<Cmd>ZkNotes { sort = { 'modified' } }<CR>")
vim.keymap.set("n", "<leader>zt", "<Cmd>ZkTags<CR>")
vim.keymap.set("n", "<leader>zl", "<Cmd>ZkLinks<CR>")
vim.keymap.set("n", "<leader>zg", "<Cmd>ZkNotes { sort = { 'modified' }, match = { vim.fn.input('Search: ') } }<CR>")
vim.keymap.set("v", "<leader>zm", ":'<,'>ZkMatch<CR>")
-- LSP
-- global on_attach
local function lsp_on_attach(client, bufnr)