diff --git a/tree/.config/nvim/init.lua b/tree/.config/nvim/init.lua index f334308..1bd70cb 100644 --- a/tree/.config/nvim/init.lua +++ b/tree/.config/nvim/init.lua @@ -31,6 +31,8 @@ require("auto-save").setup({ enabled = false }) +require("todo-comments").setup() + rust_tools.setup({ server = { @@ -46,40 +48,6 @@ rust_tools.setup({ }, }) - --- -- LSP Diagnostics Options Setup --- local sign = function(opts) --- vim.fn.sign_define(opts.name, { --- texthl = opts.name, --- text = opts.text, --- numhl = '' --- }) --- end --- --- sign({name = 'DiagnosticSignError', text = ''}) --- sign({name = 'DiagnosticSignWarn', text = ''}) --- sign({name = 'DiagnosticSignHint', text = ''}) --- sign({name = 'DiagnosticSignInfo', text = ''}) --- --- vim.diagnostic.config({ --- virtual_text = false, --- signs = true, --- update_in_insert = true, --- underline = true, --- severity_sort = false, --- float = { --- border = 'rounded', --- source = 'always', --- header = '', --- prefix = '', --- }, --- }) --- --- vim.cmd([[ --- set signcolumn=yes --- autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false }) --- ]]) - -- Format file on save vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]] diff --git a/tree/.config/nvim/lua/keys.lua b/tree/.config/nvim/lua/keys.lua index cf5fbab..615d590 100644 --- a/tree/.config/nvim/lua/keys.lua +++ b/tree/.config/nvim/lua/keys.lua @@ -4,6 +4,7 @@ vim.keymap.set('n', 'fg', telescope.live_grep, {}) vim.keymap.set('n', 'fb', telescope.buffers, {}) vim.keymap.set('n', 'fh', telescope.help_tags, {}) vim.keymap.set('n', 'fs', telescope.treesitter, {}) -- find symbols +vim.keymap.set('n', 'fu', ":TodoTelescope", {}) -- find symbols vim.keymap.set('n', 'ft', pick_rust_target, {}) -- find symbols vim.keymap.set('n', 'U', ":redo", {}) vim.keymap.set('n', 'p', ":b#", {}) -- goto previous buffer diff --git a/tree/.config/nvim/lua/opts.lua b/tree/.config/nvim/lua/opts.lua index 62fb92f..cb15cf6 100644 --- a/tree/.config/nvim/lua/opts.lua +++ b/tree/.config/nvim/lua/opts.lua @@ -4,11 +4,12 @@ local opt = vim.opt vim.opt.clipboard="unnamedplus" -- [[ Context ]] -opt.colorcolumn = '100' -- str: Show col for max line length +opt.colorcolumn = '100' -- str: Show col for max line length opt.number = true -- bool: Show line numbers opt.relativenumber = true -- bool: Show relative line numbers -opt.scrolloff = 4 -- int: Min num lines of context +opt.scrolloff = 10 -- int: Min num lines of context opt.signcolumn = "yes" -- str: Show the sign column +opt.cursorline = true -- bool: Highlight the cursor line -- [[ Filetypes ]] opt.encoding = 'utf8' -- str: String encoding to use @@ -47,7 +48,6 @@ vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'} vim.opt.shortmess = vim.opt.shortmess + { c = true} vim.api.nvim_set_option('updatetime', 300) - -- Uncomment to enable treesitter folding by default --vim.wo.foldmethod = 'expr' --vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' diff --git a/tree/.config/nvim/lua/plugins.lua b/tree/.config/nvim/lua/plugins.lua index 3f37360..f633a75 100644 --- a/tree/.config/nvim/lua/plugins.lua +++ b/tree/.config/nvim/lua/plugins.lua @@ -70,7 +70,7 @@ return require('packer').startup(function(use) --} -- You can specify multiple plugins in a single call - use {'tjdevries/colorbuddy.vim', {'nvim-treesitter/nvim-treesitter', opt = true}} + use 'tjdevries/colorbuddy.vim' -- You can alias plugin names use {'dracula/vim', as = 'dracula'} @@ -79,6 +79,12 @@ return require('packer').startup(function(use) -- my stuff below use 'ellisonleao/gruvbox.nvim' use 'danilamihailov/beacon.nvim' + use "nvim-lua/plenary.nvim" + use { + 'folke/todo-comments.nvim', + event = 'VimEnter', + requires = { 'nvim-lua/plenary.nvim' } + } -- language server stuff use 'williamboman/mason.nvim' @@ -106,7 +112,6 @@ return require('packer').startup(function(use) use 'hrsh7th/vim-vsnip' -- telescope - use "nvim-lua/plenary.nvim" use { 'nvim-telescope/telescope.nvim', branch = '0.1.x', requires = { {'nvim-lua/plenary.nvim'} }