diff --git a/init.lua b/init.lua index 87fd5564..acf9f275 100644 --- a/init.lua +++ b/init.lua @@ -5,7 +5,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.opt` @@ -76,8 +76,8 @@ vim.opt.scrolloff = 10 vim.keymap.set('n', '', 'Neotree toggle') -- vim.keymap.set('n', 'g', 'Neotree float git_status') vim.keymap.set('n', 'u', vim.cmd.UndotreeToggle, { desc = 'Toggle [U]ndoTree' }) -vim.keymap.set('n', ';', 'A;', { desc = 'Append [;] to line' }) -vim.keymap.set('n', ',', 'A,', { desc = 'Append [,] to line' }) +-- vim.keymap.set('n', ';', 'A;', { desc = 'Append [;] to line' }) +-- vim.keymap.set('n', ',', 'A,', { desc = 'Append [,] to line' }) vim.keymap.set('n', '', ':bnext', { desc = 'Next buffer' }) vim.keymap.set('n', '', ':bprev', { desc = 'Previous buffer' }) vim.opt.winborder = 'rounded' @@ -398,6 +398,12 @@ require('lazy').setup({ [''] = { 'select_next', 'fallback' }, [''] = { 'select_prev', 'fallback' }, }, + appearance = { + nerd_font_variant = 'normal', + }, + completion = { + documentation = { auto_show = true }, + }, sources = { -- add lazydev to your completion providers default = { 'lazydev', 'lsp', 'path', 'snippets', 'buffer' }, @@ -429,6 +435,24 @@ require('lazy').setup({ 'williamboman/mason.nvim', dependencies = { 'WhoIsSethDaniel/mason-tool-installer.nvim' }, config = function() + local ensure_installed = vim.tbl_keys {} + vim.list_extend(ensure_installed, { + 'stylua', -- Used to format Lua code + { + 'lua-language-server', + settings = { + Lua = { + completion = { + callSnippet = 'Replace', + }, + }, + }, + }, + 'clangd', + 'rust-analyzer', + 'powershell-editor-services', + }) + require('mason-tool-installer').setup { ensure_installed = ensure_installed } require('mason').setup() end, }, @@ -920,6 +944,7 @@ require('lazy').setup({ -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` { import = 'custom.plugins' }, + { import = 'misc' }, }, { ui = { -- If you are using a Nerd Font: set icons to an empty table which will use the diff --git a/lua/misc/blink.nvim.lua b/lua/misc/blink.nvim.lua new file mode 100644 index 00000000..e5f5efb2 --- /dev/null +++ b/lua/misc/blink.nvim.lua @@ -0,0 +1,35 @@ +return { + 'saghen/blink.nvim', + build = 'cargo build --release', -- for delimiters + keys = { + -- chartoggle + { + ';', + function() + require('blink.chartoggle').toggle_char_eol ';' + end, + mode = { 'n', 'v' }, + desc = 'Toggle ; at eol', + }, + { + ',', + function() + require('blink.chartoggle').toggle_char_eol ',' + end, + mode = { 'n', 'v' }, + desc = 'Toggle , at eol', + }, + + -- tree + { '', 'BlinkTree reveal', desc = 'Reveal current file in tree' }, + { 'E', 'BlinkTree toggle', desc = 'Reveal current file in tree' }, + { 'e', 'BlinkTree toggle-focus', desc = 'Toggle file tree focus' }, + }, + -- all modules handle lazy loading internally + lazy = false, + opts = { + chartoggle = { enabled = true }, + indent = { enabled = false }, + tree = { enabled = false }, + }, +} diff --git a/todo.md b/todo.md new file mode 100644 index 00000000..b85f47e1 --- /dev/null +++ b/todo.md @@ -0,0 +1,3 @@ +- snippets +- comic code nerdfont +- telescope replacement