re-structure neovim plugins

also delete unused ones

.dotter/global.toml

@@ -45,6 +45,24 @@ depends = ["rust"]
 
 [nvim.files]
 "config/nvim" = "~/.config/nvim"
+[nvim.files."config/nvim/lua/aleidk/lazy.lua"]
+target = "~/.config/nvim/lua/aleidk/lazy.lua"
+type = "template"
+prepend = """
+local enabled_plugins = {
+  nvim_core = {{ nvim-core }},
+  nvim_base = {{ nvim-base }},
+  nvim_ide = {{ nvim-ide }},
+}
+
+"""
+
+# Handle package activation from Lazy instead of dotter
+# This will prevent conflics in lazy-lock.json for having different plugins
+[nvim.variables]
+nvim-core = true
+nvim-base = false
+nvim-ide = false
 
 [rust.variables]
 cargo.packages = []

.dotter/work-laptop.toml

@@ -4,3 +4,6 @@ packages = ["cli", "dev", "mise"]
 [files]
 
 [variables]
+nvim-core = true
+nvim-base = true
+nvim-ide = true

config/nvim/.luarc.json

@@ -0,0 +1,5 @@
+{
+    "diagnostics.globals": [
+        "enabled_plugins"
+    ]
+}

config/nvim/init.lua

@@ -1,26 +1,7 @@
 -- Loadnoptions before anything
 require("aleidk.options")
 
--- Init PLugins
-
--- Install package manager https://github.com/folke/lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-	vim.fn.system({
-		"git",
-		"clone",
-		"--filter=blob:none",
-		"https://github.com/folke/lazy.nvim.git",
-		"--branch=stable", -- latest stable release
-		lazypath,
-	})
-end
-vim.opt.rtp:prepend(lazypath)
-
--- Load plugins
-require("lazy").setup("aleidk.plugins")
-
--- Rest of configuratin
+require("aleidk.lazy")
 
 require("aleidk.keymaps")
 require("aleidk.autocmds")

config/nvim/lazy-lock.json

@@ -1,9 +1,6 @@
 {
   "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
-  "auto-session": { "branch": "main", "commit": "4b0728715e674ad9c18f1519127dcaed59f9981b" },
   "ccc.nvim": { "branch": "main", "commit": "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4" },
-  "chezmoi.nvim": { "branch": "main", "commit": "faf61465718424696269b2647077331b3e4605f1" },
-  "chezmoi.vim": { "branch": "main", "commit": "10f2692791b5e512a2c1bb4dc560b42ca5bf71fd" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
@@ -21,10 +18,9 @@
   "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
   "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" },
   "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" },
-  "gopher.nvim": { "branch": "main", "commit": "f55c15ada8e02398000c04a96ef44d986cd01051" },
   "grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" },
   "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "b02c9eae6a250f98908c146d1dc1a891f5019f0a" },
+  "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
   "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" },
   "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
@@ -49,10 +45,8 @@
   "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" },
   "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "octo.nvim": { "branch": "master", "commit": "aa5dfa573220a0a511a25ee14ce1570b6c23e56a" },
   "overseer.nvim": { "branch": "master", "commit": "15b6249eaf71ebbc8bf0ed279e045f2bc1f28007" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" },
   "remote-sshfs.nvim": { "branch": "main", "commit": "8f05563150fbd713027471eed56f391b053ba8b8" },
   "render-markdown": { "branch": "main", "commit": "123048b428eb85618780fcef9ea9f4d68b5d2508" },
   "smart-splits.nvim": { "branch": "master", "commit": "95833675cd92538bf9cded1d2d58d1fc271c5428" },
@@ -62,15 +56,13 @@
   "treesj": { "branch": "main", "commit": "6e8bd008bacd5ad001c3953017c1dca20709e915" },
   "trouble.nvim": { "branch": "main", "commit": "03c1fbf518bef683422a3be9643c3da190903488" },
   "ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" },
-  "twilight.nvim": { "branch": "main", "commit": "2b632c169a4b51b1eba5be90fde22a80c51c990e" },
   "typescript-tools.nvim": { "branch": "master", "commit": "5da4d695d66f676eb6ea766b946e86f93baaafe7" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d" },
+  "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "da0e75c09c27a82aad078d993bb1b2f4afd43427" },
   "vim-dadbod-ui": { "branch": "master", "commit": "f74a31e8c6c5a9dccc63450a09d5cd64a9294330" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
   "yazi.nvim": { "branch": "main", "commit": "faa03e9acb894533b91c811d0dafd816b995088f" },
-  "zen-mode.nvim": { "branch": "main", "commit": "2694c5a2bc4dc26c7a9e74b9e2b812920c90a830" },
   "zk-nvim": { "branch": "main", "commit": "dbf4eeab55b08856c9d6b6722dbff39630bb35eb" }
 }

config/nvim/lua/aleidk/lazy.lua

@@ -0,0 +1,35 @@
+-- Bootstrap lazy.nvim
+-- Load this file after options has been set
+
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out,                            "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- enabled_plugins is injected as a local variable in the top of the file by the dotfile manager
+-- See: .dotter/global.toml inside [nvim.files] & [nvim.variables] table
+require("lazy").setup({
+  spec = {
+    { import = "aleidk.plugins-core", enabled = enabled_plugins.nvim_core },
+    { import = "aleidk.plugins-base", enabled = enabled_plugins.nvim_base },
+    { import = "aleidk.plugins-ide",  enabled = enabled_plugins.nvim_ide },
+  },
+
+  install = { colorscheme = { "catppuccin" } },
+  checker = { enabled = true },
+})
+
+return {
+  enabled_plugins
+}

config/nvim/lua/aleidk/plugins-base/comments.lua

@@ -31,19 +31,4 @@ return {
 			MAP({ "n", "v" }, "gcl", cb.llline, "Create a comment line")
 		end,
 	},
-	{
-		"danymat/neogen",
-		opts = { snippet_engine = "luasnip" },
-		dependencies = { "nvim-treesitter/nvim-treesitter" },
-		version = "*", -- stable releases
-		keys = {
-			{
-				"gcd",
-				function()
-					require("neogen").generate()
-				end,
-				desc = "Generate comment docstring",
-			},
-		},
-	},
 }

config/nvim/lua/aleidk/plugins-base/file-explorer.lua

@@ -11,7 +11,7 @@ return {
 		},
 		{
 			-- Open in the current working directory
-			"<leader>-",
+			"<leader>E",
 			"<cmd>Yazi cwd<cr>",
 			desc = "Open the file manager in nvim's working directory",
 		},

config/nvim/lua/aleidk/plugins-base/undo-tree.lua

@@ -0,0 +1,13 @@
+return {
+	{
+		"mbbill/undotree",
+		config = function()
+			vim.g.undotree_WindowLayout = 2
+			vim.g.undotree_ShortIndicators = 1
+			vim.g.undotree_SetFocusWhenToggle = 1
+		end,
+		keys = {
+			{ "<leader>fu", vim.cmd.UndotreeToggle, desc = "Undo tree" },
+		},
+	},
+}

config/nvim/lua/aleidk/plugins-core/init.lua

@@ -0,0 +1,14 @@
+return {
+	-- Detect tabstop and shiftwidth automatically
+	"tpope/vim-sleuth",
+	{ "nvim-tree/nvim-web-devicons", lazy = true },
+	{
+		-- Highlight word under cursor
+		"RRethy/vim-illuminate",
+		event = { "BufReadPost", "BufNewFile" },
+		opts = { delay = 200 },
+		config = function(_, opts)
+			require("illuminate").configure(opts)
+		end,
+	},
+}

config/nvim/lua/aleidk/plugins-ide/color-picker.lua

@@ -0,0 +1,15 @@
+return {
+	{
+		-- Color Picker
+		"uga-rosa/ccc.nvim",
+		event = "VeryLazy",
+		opts = {
+			auto_enable = true,
+			lsp = true,
+		},
+		keys = {
+			{ "<leader>uc", "<CMD>CccPick<CR>",              desc = "Open Color picker" },
+			{ "<leader>uC", "<CMD>CccHighlighterToggle<CR>", desc = "Toggle Color highlight" },
+		},
+	},
+}

config/nvim/lua/aleidk/plugins-ide/database.lua

@@ -1,7 +1,7 @@
 return {
 	"kristijanhusak/vim-dadbod-ui",
 	dependencies = {
-		{ "tpope/vim-dadbod", lazy = true },
+		{ "tpope/vim-dadbod",                     lazy = true },
 		{ "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
 	},
 	cmd = {

config/nvim/lua/aleidk/plugins-ide/doc-gen.lua

@@ -0,0 +1,15 @@
+return {
+	"danymat/neogen",
+	opts = { snippet_engine = "luasnip" },
+	dependencies = { "nvim-treesitter/nvim-treesitter" },
+	version = "*", -- stable releases
+	keys = {
+		{
+			"gcd",
+			function()
+				require("neogen").generate()
+			end,
+			desc = "Generate comment docstring",
+		},
+	},
+}

config/nvim/lua/aleidk/plugins-ide/git.lua

@@ -27,7 +27,7 @@ return {
 				map("n", "u", gs.undo_stage_hunk, "Undo Stage Hunk")
 				map("n", "R", gs.reset_buffer, "Reset Buffer")
 				map("n", "<TAB>", gs.preview_hunk, "Preview Hunk")
-				map("n", "l", function() gs.blame_line({full = true}) end, "Blame Line")
+				map("n", "l", function() gs.blame_line({ full = true }) end, "Blame Line")
 				map("n", "d", gs.diffthis, "Diff This")
 			end,
 		},
@@ -45,9 +45,9 @@ return {
 	{
 		"NeogitOrg/neogit",
 		dependencies = {
-			"nvim-lua/plenary.nvim", -- required
+			"nvim-lua/plenary.nvim",      -- required
 			"nvim-telescope/telescope.nvim", -- optional
-			"sindrets/diffview.nvim", -- optional
+			"sindrets/diffview.nvim",     -- optional
 		},
 		config = true,
 		opts = {
@@ -94,21 +94,4 @@ return {
 			},
 		},
 	},
-
-	{
-		"pwntester/octo.nvim",
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"nvim-telescope/telescope.nvim",
-			"nvim-tree/nvim-web-devicons",
-		},
-		opts = { enable_builtin = true },
-		keys = {
-			{
-				"<leader>go",
-				"<CMD>Octo<CR>",
-				desc = "Octo.nvim",
-			},
-		},
-	},
 }

config/nvim/lua/aleidk/plugins-ide/typescript-tools.lua

@@ -0,0 +1,18 @@
+return {
+	"pmizio/typescript-tools.nvim",
+	dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
+	opts = {
+		init_options = {
+			preferences = {
+				disableSuggestions = true,
+			},
+		},
+		settings = {
+			-- array of strings("fix_all"|"add_missing_imports"|"remove_unused"|
+			-- "remove_unused_imports"|"organize_imports") -- or string "all"
+			-- to include all supported code actions
+			-- specify commands exposed as code_actions
+			expose_as_code_action = "all",
+		},
+	},
+}

config/nvim/lua/aleidk/plugins/init.lua

@@ -1,56 +0,0 @@
-return {
-	-- Detect tabstop and shiftwidth automatically
-	"tpope/vim-sleuth",
-	{ "nvim-tree/nvim-web-devicons", lazy = true },
-	{
-		"mbbill/undotree",
-		config = function()
-			vim.g.undotree_WindowLayout = 2
-			vim.g.undotree_ShortIndicators = 1
-			vim.g.undotree_SetFocusWhenToggle = 1
-		end,
-		keys = {
-			{ "<leader>fu", vim.cmd.UndotreeToggle, desc = "Undo tree" },
-		},
-	},
-	{
-		-- Highlight word under cursor
-		"RRethy/vim-illuminate",
-		event = { "BufReadPost", "BufNewFile" },
-		opts = { delay = 200 },
-		config = function(_, opts)
-			require("illuminate").configure(opts)
-		end,
-	},
-	{
-		-- Color Picker
-		"uga-rosa/ccc.nvim",
-		event = "VeryLazy",
-		opts = {
-			auto_enable = true,
-			lsp = true,
-		},
-		keys = {
-			{ "<leader>uc", "<CMD>CccPick<CR>",              desc = "Open Color picker" },
-			{ "<leader>uC", "<CMD>CccHighlighterToggle<CR>", desc = "Toggle Color highlight" },
-		},
-	},
-	{
-		"pmizio/typescript-tools.nvim",
-		dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
-		opts = {
-			init_options = {
-				preferences = {
-					disableSuggestions = true,
-				},
-			},
-			settings = {
-				-- array of strings("fix_all"|"add_missing_imports"|"remove_unused"|
-				-- "remove_unused_imports"|"organize_imports") -- or string "all"
-				-- to include all supported code actions
-				-- specify commands exposed as code_actions
-				expose_as_code_action = "all",
-			},
-		},
-	},
-}

config/nvim/lua/aleidk/plugins/pretty-fold.lua

@@ -1,43 +0,0 @@
-return {
-	enabled = false,
-	"anuvyklack/pretty-fold.nvim",
-	opts = {
-		sections = {
-			left = {
-				"+",
-				function()
-					return string.rep("-", vim.v.foldlevel)
-				end,
-				" ",
-				"content",
-				" ",
-				"number_of_folded_lines",
-				" ",
-				function()
-					return string.rep("-", vim.v.foldlevel)
-				end,
-				"+",
-			},
-		},
-		fill_char = " ",
-
-		-- Possible values:
-		-- "delete" : Delete all comment signs from the fold string.
-		-- "spaces" : Replace all comment signs with equal number of spaces.
-		-- false    : Do nothing with comment signs.
-		process_comment_signs = "delete",
-
-		-- List of patterns that will be removed from content foldtext section.
-		stop_words = {
-			"@brief%s*", -- (for C++) Remove '@brief' and all spaces after.
-		},
-
-		matchup_patterns = {
-			{ "{",  "}" },
-			{ "%(", ")" }, -- % to escape lua pattern char
-			{ "%[", "]" }, -- % to escape lua pattern char
-		},
-
-		ft_ignore = { "neorg" },
-	},
-}

config/nvim/lua/aleidk/plugins/sessions.lua

@@ -1,23 +0,0 @@
-return {
-	-- sessions
-	"rmagatti/auto-session",
-	config = function()
-		---@diagnostic disable-next-line: missing-fields
-		require("auto-session").setup({
-			log_level = "error",
-			auto_session_suppress_dirs = {
-				"/",
-				"~/",
-				"~/.config/**",
-				"~/.local/share/chezmoi/",
-				"~/.local/share/db_ui",
-				"~/.local/share/db_ui/**",
-				"~/Downloads",
-			},
-			bypass_session_save_file_types = {
-				"NeogitStatus",
-				"Lazy",
-			},
-		})
-	end,
-}

config/nvim/lua/aleidk/plugins/zen.lua

@@ -1,81 +0,0 @@
-return {
-	"folke/zen-mode.nvim",
-	dependencies = {
-		{
-			"folke/twilight.nvim",
-			opts = {
-				-- your configuration comes here
-				-- or leave it empty to use the default settings
-				-- refer to the configuration section below
-			},
-		},
-	},
-	keys = {
-		{
-			"<leader>uz",
-			function()
-				require("zen-mode").toggle({})
-			end,
-			desc = "Toggle zen mode",
-		},
-	},
-	opts = {
-		window = {
-			backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
-			-- height and width can be:
-			-- * an absolute number of cells when > 1
-			-- * a percentage of the width / height of the editor when <= 1
-			-- * a function that returns the width or the height
-			width = 0.8, -- width of the Zen window
-			height = 1, -- height of the Zen window
-			-- by default, no options are changed for the Zen window
-			-- uncomment any of the options below, or add other vim.wo options you want to apply
-			options = {
-				-- signcolumn = "no", -- disable signcolumn
-				-- number = false, -- disable number column
-				-- relativenumber = false, -- disable relative numbers
-				cursorline = false, -- disable cursorline
-				-- cursorcolumn = false, -- disable cursor column
-				-- foldcolumn = "0", -- disable fold column
-				list = false, -- disable whitespace characters
-			},
-		},
-		plugins = {
-			-- disable some global vim options (vim.o...)
-			-- comment the lines to not apply the options
-			options = {
-				enabled = true,
-				ruler = true, -- disables the ruler text in the cmd line area
-				showcmd = false, -- disables the command in the last line of the screen
-				-- you may turn on/off statusline in zen mode by setting 'laststatus'
-				-- statusline will be shown only if 'laststatus' == 3
-				laststatus = 0, -- turn off the statusline in zen mode
-			},
-			twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
-			gitsigns = { enabled = false }, -- disables git signs
-			tmux = { enabled = true }, -- disables the tmux statusline
-			-- this will change the font size on kitty when in zen mode
-			-- to make this work, you need to set the following kitty options:
-			-- - allow_remote_control socket-only
-			-- - listen_on unix:/tmp/kitty
-			kitty = {
-				enabled = true,
-				font = "+8", -- font size increment
-			},
-			-- this will change the font size on alacritty when in zen mode
-			-- requires  Alacritty Version 0.10.0 or higher
-			-- uses `alacritty msg` subcommand to change font size
-			alacritty = {
-				enabled = true,
-				font = "14", -- font size
-			},
-			-- this will change the font size on wezterm when in zen mode
-			-- See else also the Plugins/Wezterm section in this projects README
-			wezterm = {
-				enabled = true,
-				-- can be either an absolute font size or the number of incremental steps
-				font = "+4", -- (10% increase per step)
-			},
-		},
-	},
-}

config/nvim/lua/aleidk/utils.lua

@@ -0,0 +1,7 @@
+local M = {}
+
+function M.plugin_should_be_enabled()
+	print("Plugin should be enabled")
+end
+
+return M

config/yazi/keymap.toml

@@ -45,11 +45,11 @@ keymap = [
 	{ on = ["J"], run = "seek 5",  desc = "Seek down 5 units in the preview" },
 
 	# Selection
-	{ on = [ "<Space>" ], run = [ "toggle", "arrow 1" ], desc = "Toggle the current selection state" },
+	{ on = [ "<Space>" ], run = [ "select", "arrow 1" ], desc = "Toggle the current selection state" },
 	{ on = [ "v" ],       run = "visual_mode",                        desc = "Enter visual mode (selection mode)" },
 	{ on = [ "V" ],       run = "visual_mode --unset",                desc = "Enter visual mode (unset mode)" },
-	{ on = [ "<C-a>" ],   run = "toggle_all",            desc = "Select all files" },
-	{ on = [ "<C-r>" ],   run = "toggle_all on",            desc = "Inverse selection of all files" },
+	{ on = [ "<C-a>" ],   run = "select_all --state=true",            desc = "Select all files" },
+	{ on = [ "<C-r>" ],   run = "select_all --state=none",            desc = "Inverse selection of all files" },
 
 	# Operation
 	{ on = [ "o" ],         run = "open",                                                 desc = "Open the selected files" },