diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index f17bf4f..3cfd3a5 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -17,11 +17,13 @@ vim.schedule(function() require('plugins.render-markdown') -- Render markdown directly in neovim vim.pack.add({ + 'https://github.com/windwp/nvim-autopairs', -- Autocomplete symbol pairs when typing TODO: disabled for now, using snippets instead. remove if that feels better 'https://github.com/tpope/vim-surround', -- Change surrounding characters (doesn't need setup called) 'https://github.com/tpope/vim-fugitive', -- _The_ Git integration plugin people have been using forever 'https://github.com/habamax/vim-godot' -- Godot specific bindings and debug }) + require('nvim-autopairs').setup() -- Automatic pair completion of paranteticals, braces, quotes, etc. require('plugins.dap') -- DAP debugging plugin require('plugins.dap-python') -- Debug plugin settings specifically for python diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 70d9db8..b4ab0ff 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -1,6 +1,5 @@ vim.pack.add({ - 'https://github.com/kevinhwang91/nvim-bqf', - 'https://github.com/nvim-telescope/telescope-file-browser.nvim', + -- 'https://github.com/kevinhwang91/nvim-bqf', 'https://github.com/nvim-lua/plenary.nvim', 'https://github.com/nvim-telescope/telescope.nvim', }) @@ -23,9 +22,7 @@ require('telescope').setup { layout_config = { prompt_position = 'bottom' }, -- layout_strategy = 'vertical', mappings = { - i = { - [''] = require('telescope.actions').close, - }, + i = { [''] = require('telescope.actions').close, }, }, prompt_prefix = '  ', results_title = false, @@ -35,7 +32,6 @@ require('telescope').setup { }, pickers = { diagnostics = { - -- theme = 'ivy', initial_mode = 'normal', layout_config = { preview_cutoff = 9999, @@ -46,18 +42,12 @@ require('telescope').setup { local builtin = require('telescope.builtin') -vim.keymap.set('n', ';f', function() - builtin.find_files({ - no_ignore = false, - hidden = true, - }) -end) - -vim.keymap.set('n', ';r', function() builtin.live_grep() end) -vim.keymap.set('n', ';b', function() builtin.buffers() end) -vim.keymap.set('n', ';h', function() builtin.help_tags() end) vim.keymap.set('n', ';;', function() builtin.resume() end) +vim.keymap.set('n', ';b', function() builtin.buffers() end) vim.keymap.set('n', ';d', function() builtin.diagnostics() end) -vim.keymap.set('n', ';t', function() builtin.treesitter() end) +vim.keymap.set('n', ';f', function() builtin.find_files({ no_ignore = false, hidden = true }) end) +vim.keymap.set('n', ';h', function() builtin.help_tags() end) +vim.keymap.set('n', ';r', function() builtin.live_grep() end) vim.keymap.set('n', ';s', function() builtin.lsp_document_symbols() end) +vim.keymap.set('n', ';t', function() builtin.treesitter() end) vim.keymap.set('n', ';w', function() builtin.lsp_dynamic_workspace_symbols() end) diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 87391fd..7a0e63c 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -8,7 +8,7 @@ vim.opt.cursorcolumn = true -- Highlight vim.opt.cursorline = true -- Highlight the line the cursor is on. vim.opt.expandtab = true -- Expand tabs into spaces vim.opt.fileformat = 'unix' -- Explicitly state that files should use the unix style EOL characters. --- vim.opt.fillchars = 'fold: ' -- Sets the character that fills in a fold line (removes the dots) +vim.opt.fillchars = 'fold: ' -- Sets the character that fills in a fold line (removes the dots) vim.opt.foldcolumn = '0' -- Disables the foldcolumn vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -- Uses Treesitter to determine where code folding should occur vim.opt.foldlevel = 10 -- Sets the initial level at which folds will be closed @@ -22,7 +22,7 @@ vim.opt.listchars = 'tab:|·,trail:¬,extends:»,precedes:«,nbsp:+' -- Chara vim.opt.mouse = 'a' -- Enable mouse mode vim.opt.number = true -- Show the line number in the gutter. vim.opt.pumheight = 15 -- Maximum height of the auto complete floating window -vim.opt.relativenumber = true -- Relative line number +-- vim.opt.relativenumber = true -- Relative line number vim.opt.sidescrolloff = 8 -- Side scrolling leadoff to keep the cursor a few characters from the screen edge instead of going all the way to it vim.opt.shiftround = true -- Round indentation to shiftwidth vim.opt.shiftwidth = 4 -- Number of spaces a tab counts for when converting tabs to spaces diff --git a/nvim/snippets/all.lua b/nvim/snippets/all.lua index 96e91b6..8d4a7d9 100644 --- a/nvim/snippets/all.lua +++ b/nvim/snippets/all.lua @@ -30,7 +30,7 @@ ls.add_snippets('all', { pair('"', '"'), pair('`', '`'), }, { - type = 'autosnippets', - key = 'all_auto', + -- type = 'autosnippets', + -- key = 'all_auto', }) -- end autopairs