Skip to content

Commit 5e4bde2

Browse files
committed
re-enable a bunch of plugins
1 parent 391833f commit 5e4bde2

File tree

3 files changed

+72
-80
lines changed

3 files changed

+72
-80
lines changed

init.lua

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ require('lazy').setup({
393393
{ 'j-hui/fidget.nvim', opts = {} },
394394

395395
-- Allows extra capabilities provided by nvim-cmp
396-
-- 'hrsh7th/cmp-nvim-lsp',
396+
'hrsh7th/cmp-nvim-lsp',
397397
},
398398
config = function()
399399
-- Brief aside: **What is LSP?**
@@ -531,7 +531,7 @@ require('lazy').setup({
531531
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
532532
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
533533
local capabilities = vim.lsp.protocol.make_client_capabilities()
534-
-- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
534+
capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
535535

536536
-- Enable the following language servers
537537
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
@@ -723,7 +723,7 @@ require('lazy').setup({
723723

724724
-- If you prefer more traditional completion keymaps,
725725
-- you can uncomment the following lines
726-
--['<CR>'] = cmp.mapping.confirm { select = true },
726+
['<CR>'] = cmp.mapping.confirm { select = true },
727727
--['<Tab>'] = cmp.mapping.select_next_item(),
728728
--['<S-Tab>'] = cmp.mapping.select_prev_item(),
729729

@@ -793,43 +793,43 @@ require('lazy').setup({
793793
-- Highlight todo, notes, etc in comments
794794
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
795795

796-
-- { -- Collection of various small independent plugins/modules
797-
-- 'echasnovski/mini.nvim',
798-
-- config = function()
799-
-- -- Better Around/Inside textobjects
800-
-- --
801-
-- -- Examples:
802-
-- -- - va) - [V]isually select [A]round [)]paren
803-
-- -- - yinq - [Y]ank [I]nside [N]ext [Q]uote
804-
-- -- - ci' - [C]hange [I]nside [']quote
805-
-- require('mini.ai').setup { n_lines = 500 }
806-
--
807-
-- -- Add/delete/replace surroundings (brackets, quotes, etc.)
808-
-- --
809-
-- -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
810-
-- -- - sd' - [S]urround [D]elete [']quotes
811-
-- -- - sr)' - [S]urround [R]eplace [)] [']
812-
-- require('mini.surround').setup()
813-
--
814-
-- -- Simple and easy statusline.
815-
-- -- You could remove this setup call if you don't like it,
816-
-- -- and try some other statusline plugin
817-
-- local statusline = require 'mini.statusline'
818-
-- -- set use_icons to true if you have a Nerd Font
819-
-- statusline.setup { use_icons = vim.g.have_nerd_font }
820-
--
821-
-- -- You can configure sections in the statusline by overriding their
822-
-- -- default behavior. For example, here we set the section for
823-
-- -- cursor location to LINE:COLUMN
824-
-- ---@diagnostic disable-next-line: duplicate-set-field
825-
-- statusline.section_location = function()
826-
-- return '%2l:%-2v'
827-
-- end
828-
--
829-
-- -- ... and there is more!
830-
-- -- Check out: https://github.com/echasnovski/mini.nvim
831-
-- end,
832-
-- },
796+
{ -- Collection of various small independent plugins/modules
797+
'echasnovski/mini.nvim',
798+
config = function()
799+
-- Better Around/Inside textobjects
800+
--
801+
-- Examples:
802+
-- - va) - [V]isually select [A]round [)]paren
803+
-- - yinq - [Y]ank [I]nside [N]ext [Q]uote
804+
-- - ci' - [C]hange [I]nside [']quote
805+
require('mini.ai').setup { n_lines = 500 }
806+
807+
-- Add/delete/replace surroundings (brackets, quotes, etc.)
808+
--
809+
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
810+
-- - sd' - [S]urround [D]elete [']quotes
811+
-- - sr)' - [S]urround [R]eplace [)] [']
812+
require('mini.surround').setup()
813+
814+
-- Simple and easy statusline.
815+
-- You could remove this setup call if you don't like it,
816+
-- and try some other statusline plugin
817+
local statusline = require 'mini.statusline'
818+
-- set use_icons to true if you have a Nerd Font
819+
statusline.setup { use_icons = vim.g.have_nerd_font }
820+
821+
-- You can configure sections in the statusline by overriding their
822+
-- default behavior. For example, here we set the section for
823+
-- cursor location to LINE:COLUMN
824+
---@diagnostic disable-next-line: duplicate-set-field
825+
statusline.section_location = function()
826+
return '%2l:%-2v'
827+
end
828+
829+
-- ... and there is more!
830+
-- Check out: https://github.com/echasnovski/mini.nvim
831+
end,
832+
},
833833
{ -- Highlight, edit, and navigate code
834834
'nvim-treesitter/nvim-treesitter',
835835
build = ':TSUpdate',
@@ -869,12 +869,12 @@ require('lazy').setup({
869869
-- Here are some example plugins that I've included in the Kickstart repository.
870870
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
871871
--
872-
-- require 'kickstart.plugins.debug',
872+
require 'kickstart.plugins.debug',
873873
-- require 'kickstart.plugins.indent_line',
874-
-- require 'kickstart.plugins.lint',
874+
require 'kickstart.plugins.lint',
875875
-- require 'kickstart.plugins.autopairs',
876-
-- require 'kickstart.plugins.neo-tree',
877-
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
876+
require 'kickstart.plugins.neo-tree',
877+
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
878878

879879
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
880880
-- This is the easiest way to modularize your config.
Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
1-
if true then
2-
return {}
3-
else
4-
return {
5-
'epwalsh/obsidian.nvim',
6-
version = '*', -- recommended, use latest release instead of latest commit
7-
lazy = true,
8-
ft = 'markdown',
9-
-- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
10-
-- event = {
11-
-- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
12-
-- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md"
13-
-- -- refer to `:h file-pattern` for more examples
14-
-- "BufReadPre path/to/my-vault/*.md",
15-
-- "BufNewFile path/to/my-vault/*.md",
16-
-- },
17-
dependencies = {
18-
-- Required.
19-
'nvim-lua/plenary.nvim',
1+
return {
2+
'epwalsh/obsidian.nvim',
3+
version = '*', -- recommended, use latest release instead of latest commit
4+
lazy = true,
5+
ft = 'markdown',
6+
-- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
7+
-- event = {
8+
-- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
9+
-- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md"
10+
-- -- refer to `:h file-pattern` for more examples
11+
-- "BufReadPre path/to/my-vault/*.md",
12+
-- "BufNewFile path/to/my-vault/*.md",
13+
-- },
14+
dependencies = {
15+
-- Required.
16+
'nvim-lua/plenary.nvim',
2017

21-
-- see below for full list of optional dependencies 👇
22-
},
23-
opts = {
24-
workspaces = {
25-
{
26-
name = 'obsidian-vault',
27-
path = '~/workspace/github.com/0x4D5352/obsidian-vault',
28-
},
18+
-- see below for full list of optional dependencies 👇
19+
},
20+
opts = {
21+
workspaces = {
22+
{
23+
name = 'obsidian-vault',
24+
path = '~/workspace/github.com/0x4D5352/obsidian-vault',
2925
},
3026
},
31-
}
32-
end
27+
},
28+
}

lua/custom/plugins/undotree.lua

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
if true then
2-
return {}
3-
else
4-
return {
5-
'https://github.com/mbbill/undotree',
6-
}
7-
end
1+
return {
2+
'https://github.com/mbbill/undotree',
3+
}

0 commit comments

Comments
 (0)