From 5e4bde294d08488b95afd14294ffa2fc02f629f3 Mon Sep 17 00:00:00 2001 From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com> Date: Thu, 20 Feb 2025 08:57:01 -0600 Subject: [PATCH] re-enable a bunch of plugins --- init.lua | 88 ++++++++++++++-------------- lua/custom/plugins/obsidian-nvim.lua | 54 ++++++++--------- lua/custom/plugins/undotree.lua | 10 +--- 3 files changed, 72 insertions(+), 80 deletions(-) diff --git a/init.lua b/init.lua index c2da5da7..21f61f8d 100644 --- a/init.lua +++ b/init.lua @@ -393,7 +393,7 @@ require('lazy').setup({ { 'j-hui/fidget.nvim', opts = {} }, -- Allows extra capabilities provided by nvim-cmp - -- 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-nvim-lsp', }, config = function() -- Brief aside: **What is LSP?** @@ -531,7 +531,7 @@ require('lazy').setup({ -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. local capabilities = vim.lsp.protocol.make_client_capabilities() - -- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) + capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) -- Enable the following language servers -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. @@ -723,7 +723,7 @@ require('lazy').setup({ -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, + [''] = cmp.mapping.confirm { select = true }, --[''] = cmp.mapping.select_next_item(), --[''] = cmp.mapping.select_prev_item(), @@ -793,43 +793,43 @@ require('lazy').setup({ -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - -- { -- Collection of various small independent plugins/modules - -- 'echasnovski/mini.nvim', - -- config = function() - -- -- Better Around/Inside textobjects - -- -- - -- -- Examples: - -- -- - va) - [V]isually select [A]round [)]paren - -- -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- -- - ci' - [C]hange [I]nside [']quote - -- require('mini.ai').setup { n_lines = 500 } - -- - -- -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- -- - -- -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- -- - sd' - [S]urround [D]elete [']quotes - -- -- - sr)' - [S]urround [R]eplace [)] ['] - -- require('mini.surround').setup() - -- - -- -- Simple and easy statusline. - -- -- You could remove this setup call if you don't like it, - -- -- and try some other statusline plugin - -- local statusline = require 'mini.statusline' - -- -- set use_icons to true if you have a Nerd Font - -- statusline.setup { use_icons = vim.g.have_nerd_font } - -- - -- -- You can configure sections in the statusline by overriding their - -- -- default behavior. For example, here we set the section for - -- -- cursor location to LINE:COLUMN - -- ---@diagnostic disable-next-line: duplicate-set-field - -- statusline.section_location = function() - -- return '%2l:%-2v' - -- end - -- - -- -- ... and there is more! - -- -- Check out: https://github.com/echasnovski/mini.nvim - -- end, - -- }, + { -- Collection of various small independent plugins/modules + 'echasnovski/mini.nvim', + config = function() + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yinq - [Y]ank [I]nside [N]ext [Q]uote + -- - ci' - [C]hange [I]nside [']quote + require('mini.ai').setup { n_lines = 500 } + + -- Add/delete/replace surroundings (brackets, quotes, etc.) + -- + -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- - sd' - [S]urround [D]elete [']quotes + -- - sr)' - [S]urround [R]eplace [)] ['] + require('mini.surround').setup() + + -- Simple and easy statusline. + -- You could remove this setup call if you don't like it, + -- and try some other statusline plugin + local statusline = require 'mini.statusline' + -- set use_icons to true if you have a Nerd Font + statusline.setup { use_icons = vim.g.have_nerd_font } + + -- You can configure sections in the statusline by overriding their + -- default behavior. For example, here we set the section for + -- cursor location to LINE:COLUMN + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() + return '%2l:%-2v' + end + + -- ... and there is more! + -- Check out: https://github.com/echasnovski/mini.nvim + end, + }, { -- Highlight, edit, and navigate code 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', @@ -869,12 +869,12 @@ require('lazy').setup({ -- Here are some example plugins that I've included in the Kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- - -- require 'kickstart.plugins.debug', + require 'kickstart.plugins.debug', -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', + require 'kickstart.plugins.lint', -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. diff --git a/lua/custom/plugins/obsidian-nvim.lua b/lua/custom/plugins/obsidian-nvim.lua index 48761030..a0039409 100644 --- a/lua/custom/plugins/obsidian-nvim.lua +++ b/lua/custom/plugins/obsidian-nvim.lua @@ -1,32 +1,28 @@ -if true then - return {} -else - return { - 'epwalsh/obsidian.nvim', - version = '*', -- recommended, use latest release instead of latest commit - lazy = true, - ft = 'markdown', - -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: - -- event = { - -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. - -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md" - -- -- refer to `:h file-pattern` for more examples - -- "BufReadPre path/to/my-vault/*.md", - -- "BufNewFile path/to/my-vault/*.md", - -- }, - dependencies = { - -- Required. - 'nvim-lua/plenary.nvim', +return { + 'epwalsh/obsidian.nvim', + version = '*', -- recommended, use latest release instead of latest commit + lazy = true, + ft = 'markdown', + -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: + -- event = { + -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. + -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md" + -- -- refer to `:h file-pattern` for more examples + -- "BufReadPre path/to/my-vault/*.md", + -- "BufNewFile path/to/my-vault/*.md", + -- }, + dependencies = { + -- Required. + 'nvim-lua/plenary.nvim', - -- see below for full list of optional dependencies 👇 - }, - opts = { - workspaces = { - { - name = 'obsidian-vault', - path = '~/workspace/github.com/0x4D5352/obsidian-vault', - }, + -- see below for full list of optional dependencies 👇 + }, + opts = { + workspaces = { + { + name = 'obsidian-vault', + path = '~/workspace/github.com/0x4D5352/obsidian-vault', }, }, - } -end + }, +} diff --git a/lua/custom/plugins/undotree.lua b/lua/custom/plugins/undotree.lua index 3c698118..16d9baba 100644 --- a/lua/custom/plugins/undotree.lua +++ b/lua/custom/plugins/undotree.lua @@ -1,7 +1,3 @@ -if true then - return {} -else - return { - 'https://github.com/mbbill/undotree', - } -end +return { + 'https://github.com/mbbill/undotree', +}