nvim: shift module styling and core plugins

dot_config/espanso/match/base.yml

@@ -1,3 +1,30 @@
 matches:
+  - trigger: "//md"
+    replace: "{{output}}"
+    vars:
+      - name: clipboard
+        type: clipboard
+      - name: output
+        type: shell
+        params:
+          cmd: "gh md link {{clipboard}}"
+  - trigger: "//ml"
+    replace: "{{output}}"
+    vars:
+      - name: clipboard
+        type: clipboard
+      - name: output
+        type: shell
+        params:
+          cmd: "gh md link --simple {{clipboard}}"
+  - trigger: "//ir"
+    replace: "{{output}}"
+    vars:
+      - name: clipboard
+        type: clipboard
+      - name: output
+        type: shell
+        params:
+          cmd: "gh md ref {{clipboard}}"
   - trigger: "//mp"
     replace: "Monolith Platform"

dot_config/nvim/lua/atta/main/keybindings.lua

@@ -4,15 +4,9 @@ local cmd = vim.cmd
 
 local M = {}
 
+-- General Keybindings
+-- Keybindings not related to a specific plugin or language
 local function keymaps()
-	-- General Keybindings
-	-- Keybindings not related to a specific plugin or language
-	-- Enforce good habits
-	-- map("", "<left>", "<nop>")
-	-- map("", "<right>", "<nop>")
-	-- map("", "<up>", "<nop>")
-	-- map("", "<down>", "<nop>")
-
 	-- jj | escaping
 	noremap("i", "jj", "<esc>")
 	noremap("c", "jj", "<c-c>")
@@ -43,6 +37,9 @@ local function keymaps()
 	noremap("n", "N", "Nzzzv")
 	noremap("n", "J", "mzJ`z")
 
+	noremap("n", "<leader>x", "<cmd>.lua<CR>", { desc = "Execute the current line" })
+	noremap("n", "<leader><leader>x", "<cmd>source %<CR>", { desc = "Execute the current file" })
+
 	-- Quick command mode
 	-- Clears hlsearch after doing a search, otherwise got into command mode
 	cmd([[nnoremap <expr> <CR> {-> v:hlsearch ? ":nohl<CR>" : ":"}()]])

dot_config/nvim/lua/atta/plugins/barbecue.lua

@@ -2,11 +2,9 @@ return {
 	"utilyre/barbecue.nvim",
 	name = "barbecue",
 	version = "*",
+	opts = {},
 	dependencies = {
 		"SmiteshP/nvim-navic",
 		"nvim-tree/nvim-web-devicons",
 	},
-	config = function()
-		require("barbecue").setup()
-	end,
 }

dot_config/nvim/lua/atta/plugins/catppuccin.lua

@@ -1,39 +1,36 @@
-local M = {
+return {
 	"catppuccin/nvim",
 	name = "catppuccin",
-}
-
-function M.config()
-	local catppuccin = require("catppuccin")
+	config = function()
+		local catppuccin = require("catppuccin")
 
-	catppuccin.setup({
-		flavour = "mocha",
-		styles = {
-			comments = { "italic" },
-			conditionals = {},
-			loops = {},
-			functions = {},
-			keywords = {},
-			strings = {},
-			variables = {},
-			numbers = {},
-			booleans = {},
-			properties = {},
-			types = {},
-			operators = {},
-		},
-		integrations = {
-			cmp = true,
-			fern = true,
-			telescope = true,
-			lsp_saga = true,
-			indent_blankline = {
-				enabled = true,
+		catppuccin.setup({
+			flavour = "mocha",
+			styles = {
+				comments = { "italic" },
+				conditionals = {},
+				loops = {},
+				functions = {},
+				keywords = {},
+				strings = {},
+				variables = {},
+				numbers = {},
+				booleans = {},
+				properties = {},
+				types = {},
+				operators = {},
 			},
-		},
-	})
-
-	vim.api.nvim_command("colorscheme catppuccin")
-end
+			integrations = {
+				cmp = true,
+				fern = true,
+				telescope = true,
+				lsp_saga = true,
+				indent_blankline = {
+					enabled = true,
+				},
+			},
+		})
 
-return M
+		vim.api.nvim_command("colorscheme catppuccin")
+	end,
+}

dot_config/nvim/lua/atta/plugins/chezmoi.lua

@@ -1,27 +1,24 @@
-local M = {
-  {
-    'xvzc/chezmoi.nvim',
-    dependencies = { 'nvim-lua/plenary.nvim',
-      {
-        'alker0/chezmoi.vim',
-        lazy = false,
-        init = function()
-          vim.g['chezmoi#use_tmp_buffer'] = true
-        end,
-      },
-    },
-    config = function()
-      require("chezmoi").setup({})
+return {
+	"xvzc/chezmoi.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		{
+			"alker0/chezmoi.vim",
+			lazy = false,
+			init = function()
+				vim.g["chezmoi#use_tmp_buffer"] = true
+			end,
+		},
+	},
+	config = function()
+		require("chezmoi").setup({})
 
-      -- Apply chances when editing any file inside the chezmoi directory
-      vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
-        pattern = { os.getenv("HOME") .. "/.local/share/chezmoi/*" },
-        callback = function()
-          vim.schedule(require("chezmoi.commands.__edit").watch)
-        end,
-      })
-    end
-  },
+		-- Apply chances when editing any file inside the chezmoi directory
+		vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+			pattern = { os.getenv("HOME") .. "/.local/share/chezmoi/*" },
+			callback = function()
+				vim.schedule(require("chezmoi.commands.__edit").watch)
+			end,
+		})
+	end,
 }
-
-return M

dot_config/nvim/lua/atta/plugins/comment.lua

@@ -1,12 +1,6 @@
-local g = vim.g
-
-local M = {
+return {
 	"numToStr/Comment.nvim",
+	config = function()
+		require("Comment").setup()
+	end,
 }
-
-function M.config()
-	local comment = require("Comment")
-	comment.setup()
-end
-
-return M

dot_config/nvim/lua/atta/plugins/copilot.lua

@@ -1,15 +1,11 @@
-local M = {
-	-- Co-pilot
+return {
 	"zbirenbaum/copilot.lua",
 	event = "VeryLazy",
 	dependencies = {
 		"zbirenbaum/copilot-cmp",
 	},
+	config = function()
+		require("copilot").setup()
+		require("copilot_cmp").setup()
+	end,
 }
-
-function M.config()
-	require("copilot").setup()
-	require("copilot_cmp").setup()
-end
-
-return M

dot_config/nvim/lua/atta/plugins/crates.lua

@@ -1,13 +1,10 @@
-local M = {
+return {
 	"saecki/crates.nvim",
 	ft = { "rust", "toml" },
-}
-
-function M.config()
-	local crates = require("crates")
+	config = function()
+		local crates = require("crates")
 
-	crates.setup()
-	crates.show()
-end
-
-return M
+		crates.setup()
+		crates.show()
+	end,
+}

dot_config/nvim/lua/atta/plugins/diffview.lua

@@ -1,6 +1,4 @@
-local M = {
+return {
 	"sindrets/diffview.nvim",
 	dependencies = { "nvim-lua/plenary.nvim" },
 }
-
-return M

dot_config/nvim/lua/atta/plugins/glyph_palette.lua

@@ -1,17 +1,12 @@
-local cmd = vim.cmd
-
-local M = {
+return {
 	"lambdalisue/glyph-palette.vim",
+	config = function()
+		vim.cmd([[
+      augroup GlyphPaletteGroup
+        autocmd!
+        autocmd FileType fern call glyph_palette#apply()
+        autocmd FileType nerdtree,startify call glyph_palette#apply()
+      augroup END
+    ]])
+	end,
 }
-
-function M.config()
-	cmd([[
-    augroup GlyphPaletteGroup
-      autocmd!
-      autocmd FileType fern call glyph_palette#apply()
-      autocmd FileType nerdtree,startify call glyph_palette#apply()
-    augroup END
-  ]])
-end
-
-return M

dot_config/nvim/lua/atta/plugins/indent-blankline.lua

@@ -1,39 +1,36 @@
-local M = {
+return {
 	"lukas-reineke/indent-blankline.nvim",
 	event = "BufReadPre",
 	dependencies = {
 		"https://gitlab.com/HiPhish/rainbow-delimiters.nvim",
 	},
-}
-
-function M.config()
-	local indent_blankline = require("ibl")
-	local ibl_hooks = require("ibl.hooks")
-	local rainbow_delimiters = require("rainbow-delimiters.setup")
+	config = function()
+		local indent_blankline = require("ibl")
+		local ibl_hooks = require("ibl.hooks")
+		local rainbow_delimiters = require("rainbow-delimiters.setup")
 
-	local highlight = {
-		"RainbowRed",
-		"RainbowYellow",
-		"RainbowBlue",
-		"RainbowOrange",
-		"RainbowGreen",
-		"RainbowViolet",
-		"RainbowCyan",
-	}
+		local highlight = {
+			"RainbowRed",
+			"RainbowYellow",
+			"RainbowBlue",
+			"RainbowOrange",
+			"RainbowGreen",
+			"RainbowViolet",
+			"RainbowCyan",
+		}
 
-	ibl_hooks.register(ibl_hooks.type.HIGHLIGHT_SETUP, function()
-		vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" })
-		vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" })
-		vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" })
-		vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" })
-		vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" })
-		vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" })
-		vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" })
-	end)
-	ibl_hooks.register(ibl_hooks.type.SCOPE_HIGHLIGHT, ibl_hooks.builtin.scope_highlight_from_extmark)
+		ibl_hooks.register(ibl_hooks.type.HIGHLIGHT_SETUP, function()
+			vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" })
+			vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" })
+			vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" })
+			vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" })
+			vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" })
+			vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" })
+			vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" })
+		end)
+		ibl_hooks.register(ibl_hooks.type.SCOPE_HIGHLIGHT, ibl_hooks.builtin.scope_highlight_from_extmark)
 
-	rainbow_delimiters.setup({ highlight = highlight })
-	indent_blankline.setup({ scope = { show_start = false, show_end = false, highlight = highlight } })
-end
-
-return M
+		rainbow_delimiters.setup({ highlight = highlight })
+		indent_blankline.setup({ scope = { show_start = false, show_end = false, highlight = highlight } })
+	end,
+}

dot_config/nvim/lua/atta/plugins/init.lua

@@ -5,7 +5,6 @@ local M = {
 	"tpope/vim-sexp-mappings-for-regular-people",
 	"ggandor/lightspeed.nvim",
 	"wellle/targets.vim",
-	"folke/neodev.nvim",
 
 	-- Lua nvim utils
 	"nvim-lua/popup.nvim",
@@ -18,8 +17,11 @@ local M = {
 	-- Improved splits ergonomics
 	"mrjones2014/smart-splits.nvim",
 
-	-- Terminal
-	{ "akinsho/toggleterm.nvim", version = "*" },
+	-- wezterm types
+	"justinsgithub/wezterm-types",
+
+	-- tmux
+	"christoomey/vim-tmux-navigator",
 
 	-- Languages
 	"cespare/vim-toml",
@@ -29,16 +31,12 @@ local M = {
 	{ "simrat39/rust-tools.nvim", ft = "rust" },
 	"vim-ruby/vim-ruby",
 	"maxmellon/vim-jsx-pretty",
-	"bakpakin/fennel.vim",
 	"euclidianAce/BetterLua.vim",
 	"mustache/vim-mustache-handlebars",
 	"jparise/vim-graphql",
-	"martinda/Jenkinsfile-vim-syntax",
 	"habamax/vim-godot",
 	"ron-rs/ron.vim",
 	"wuelnerdotexe/vim-astro",
-	-- Make sure chezmoi files highlight like the actual files they represent
-	-- { "alker0/chezmoi.vim", lazy = true },
 }
 
 return M