chore(nvim): simplify imports and clean up plugin files

hammerspoon/functions.lua

@@ -122,5 +122,6 @@ function ReloadConfig(files)
 		hs.reload()
 	end
 end
+
 hs.pathwatcher.new(os.getenv("HOME") .. "/.hammerspoon/", ReloadConfig):start()
 hs.alert.show("Hammerspoon")

nvim/after/plugin/abolish.lua

@@ -0,0 +1,3 @@
+-- https://github.com/tpope/vim-abolish
+vim.api.nvim_command("Abolish teh the")
+vim.api.nvim_command("Abolish {despa,sepe}rat{e,es,ed,ing,ely,ion,ions,or}  {despe,sepa}rat{}")

nvim/after/plugin/abolish.vim

@@ -1,3 +0,0 @@
-" https://github.com/tpope/vim-abolish
-Abolish teh the
-Abolish {despa,sepe}rat{e,es,ed,ing,ely,ion,ions,or}  {despe,sepa}rat{}

nvim/after/plugin/alpha.lua

@@ -1,10 +1,7 @@
 -- https://github.com/goolord/alpha-nvim
-local status_ok, alpha = pcall(require, "alpha")
-if not status_ok then
-	return
-end
-
+local alpha = require("alpha")
 local dashboard = require("alpha.themes.dashboard")
+
 dashboard.section.header.val = {
 	[[🟨🟨🟨🟨🟨🟨🟨🟨]],
 	[[🟨🟨🟨🟨🟨🟨🟨🟨]],
@@ -30,7 +27,6 @@ dashboard.section.buttons.val = {
 dashboard.section.footer.opts.hl = "Type"
 dashboard.section.header.opts.hl = "Include"
 dashboard.section.buttons.opts.hl = "Keyword"
-
 dashboard.opts.opts.noautocmd = true
 
 alpha.setup(dashboard.opts)

nvim/after/plugin/astro.lua

@@ -1,3 +1,2 @@
 -- https://github.com/wuelnerdotexe/vim-astro
-
 vim.g.astro_typescript = "enable"

nvim/after/plugin/autopairs.lua

@@ -1,10 +1,8 @@
 -- https://github.com/windwp/nvim-autopairs
-local status_ok, autopairs = pcall(require, "nvim-autopairs")
-if not status_ok then
-	return
-end
+local cmp = require("cmp")
+local cmp_autopairs = require("nvim-autopairs.completion.cmp")
 
-autopairs.setup({
+require("nvim-autopairs").setup({
 	check_ts = true,
 	ts_config = {
 		lua = { "string", "source" },
@@ -25,10 +23,4 @@ autopairs.setup({
 	},
 })
 
-local cmp_autopairs = require("nvim-autopairs.completion.cmp")
-local cmp_status_ok, cmp = pcall(require, "cmp")
-if not cmp_status_ok then
-	return
-end
-
 cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))

nvim/after/plugin/autotag.lua

@@ -1,9 +1,4 @@
 -- https://github.com/windwp/nvim-ts-autotag
-local status_ok, autotag = pcall(require, "nvim-ts-autotag")
-if not status_ok then
-	return
-end
-
-autotag.setup({
+require("nvim-ts-autotag").setup({
 	disable_filetype = { "TelescopePrompt", "vim" },
 })

nvim/after/plugin/blamer.lua

@@ -1,10 +1,8 @@
 -- https://github.com/APZelos/blamer.nvim
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 vim.g.blamer_enabled = 0
 vim.g.blamer_relative_time = 1
 vim.g.blamer_delay = 200
 
--- Keymaps
-keymap("n", "<leader>tb", [[<Cmd>BlamerToggle<CR>]], opts)
+vim.keymap.set("n", "<leader>tb", [[<Cmd>BlamerToggle<CR>]], opts)

nvim/after/plugin/bufferline.lua

@@ -1,10 +1,5 @@
 -- https://github.com/akinsho/bufferline.nvim
-local status_ok, bufferline = pcall(require, "bufferline")
-if not status_ok then
-	return
-end
-
-bufferline.setup({
+require("bufferline").setup({
 	highlights = {
 		fill = {
 			bg = "#282828",

nvim/after/plugin/catppuccin.lua

@@ -1,9 +1,6 @@
 -- https://github.com/catppuccin/catppuccin
-local status_ok, catppucin = pcall(require, "catppuccin")
-if not status_ok then
-	return
-end
 
-vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha
+-- latte, frappe, macchiato, mocha
+vim.g.catppuccin_flavour = "mocha"
 
 require("catppuccin").setup()

nvim/after/plugin/cmp.lua

@@ -1,13 +1,6 @@
 -- https://github.com/hrsh7th/nvim-cmp
-local cmp_status_ok, cmp = pcall(require, "cmp")
-if not cmp_status_ok then
-	return
-end
-
-local snip_status_ok, luasnip = pcall(require, "luasnip")
-if not snip_status_ok then
-	return
-end
+local cmp = require("cmp")
+local luasnip = require("luasnip")
 
 require("luasnip/loaders/from_vscode").lazy_load()
 
@@ -16,7 +9,6 @@ local check_backspace = function()
 	return col == 0 or vim.fn.getline("."):sub(col, col):match("%s")
 end
 
---   פּ ﯟ   some other good icons
 local kind_icons = {
 	Text = "",
 	Method = "m",
@@ -45,7 +37,6 @@ local kind_icons = {
 	TypeParameter = "",
 	Octoface = "",
 }
--- find more here: https://www.nerdfonts.com/cheat-sheet
 
 cmp.setup({
 	snippet = {

nvim/after/plugin/codewindow.lua

@@ -1,8 +1,5 @@
 -- https://github.com/gorbit99/codewindow.nvim
-local status, codewindow = pcall(require, "codewindow")
-if not status then
-	return
-end
+local codewindow = require("codewindow")
 
 codewindow.setup()
 

nvim/after/plugin/colorizer.lua

@@ -1,10 +1,5 @@
 -- https://github.com/norcalli/nvim-colorizer.lua
-local status, colorizer = pcall(require, "colorizer")
-if not status then
-	return
-end
-
-colorizer.setup({
+require("colorizer").setup({
 	"css",
 	"html",
 	"javascript",
@@ -12,13 +7,13 @@ colorizer.setup({
 	"typescript",
 	"typescriptreact",
 }, {
-	RGB = true, -- #RGB hex codes
-	RRGGBB = true, -- #RRGGBB hex codes
-	names = true, -- "Name" codes like Blue
-	RRGGBBAA = true, -- #RRGGBBAA hex codes
-	rgb_fn = true, -- CSS rgb() and rgba() functions
-	hsl_fn = true, -- CSS hsl() and hsla() functions
-	css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
-	css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn
-	mode = "background", -- Set the display mode.)
+	RGB = true,
+	RRGGBB = true,
+	names = true,
+	RRGGBBAA = true,
+	rgb_fn = true,
+	hsl_fn = true,
+	css = true,
+	css_fn = true,
+	mode = "background",
 })

nvim/after/plugin/comment.lua

@@ -1,10 +1,5 @@
 -- https://github.com/numToStr/comment.nvim
-local status_ok, comment = pcall(require, "Comment")
-if not status_ok then
-	return
-end
-
-comment.setup({
+require("Comment").setup({
 	pre_hook = function(ctx)
 		local U = require("Comment.utils")
 

nvim/after/plugin/context.lua

@@ -1,10 +1,5 @@
 -- https://github.com/nvim-treesitter/nvim-treesitter-context
-local status_ok, context = pcall(require, "treesitter-context")
-if not status_ok then
-	return
-end
-
-context.setup({
+require("treesitter-context").setup({
 	patterns = {
 		default = {
 			"class",

nvim/after/plugin/cursorline.lua

@@ -1,10 +1,5 @@
 -- https://github.com/yamatsum/nvim-cursorline
-local status, cursorline = pcall(require, "nvim-cursorline")
-if not status then
-	return
-end
-
-cursorline.setup({
+require("nvim-cursorline").setup({
 	cursorline = {
 		enable = true,
 		timeout = 1000,

nvim/after/plugin/dial.lua

@@ -1,10 +1,5 @@
--- https://github.com/karb94/neoscroll.nvim
-local status, augend = pcall(require, "dial.augend")
-if not status then
-	return
-end
-
-local keymap = vim.keymap.set
+-- https://github.com/monaqa/dial.nvim
+local augend = require("dial.augend")
 local opts = { noremap = true, silent = true }
 
 require("dial.config").augends:register_group({
@@ -19,10 +14,9 @@ require("dial.config").augends:register_group({
 	},
 })
 
--- Keymaps
-keymap("n", "<C-a>", require("dial.map").inc_normal(), opts)
-keymap("n", "<C-x>", require("dial.map").dec_normal(), opts)
-keymap("v", "<C-a>", require("dial.map").inc_visual(), opts)
-keymap("v", "<C-x>", require("dial.map").dec_visual(), opts)
-keymap("v", "g<C-a>", require("dial.map").inc_gvisual(), opts)
-keymap("v", "g<C-x>", require("dial.map").dec_gvisual(), opts)
+vim.keymap.set("n", "<C-a>", require("dial.map").inc_normal(), opts)
+vim.keymap.set("n", "<C-x>", require("dial.map").dec_normal(), opts)
+vim.keymap.set("v", "<C-a>", require("dial.map").inc_visual(), opts)
+vim.keymap.set("v", "<C-x>", require("dial.map").dec_visual(), opts)
+vim.keymap.set("v", "g<C-a>", require("dial.map").inc_gvisual(), opts)
+vim.keymap.set("v", "g<C-x>", require("dial.map").dec_gvisual(), opts)

nvim/after/plugin/dressing.lua

@@ -1,7 +1,2 @@
 -- https://github.com/stevearc/dressing.nvim
-local status, dressing = pcall(require, "dressing")
-if not status then
-	return
-end
-
-dressing.setup()
+require("dressing").setup()

nvim/after/plugin/export-to-vscode.lua

@@ -1,6 +1,4 @@
 --- https://github.com/elijahmanor/export-to-vscode.nvim
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
--- Keymaps
-keymap("n", "<leader>code", [[<Cmd>lua require("export-to-vscode").launch()<CR>]], opts)
+vim.keymap.set("n", "<leader>code", [[<Cmd>lua require("export-to-vscode").launch()<CR>]], opts)

nvim/after/plugin/fzf.lua

@@ -1,44 +1,35 @@
 -- https://github.com/ibhagwan/fzf-lua
-local cmp_status_ok, fzf_lua = pcall(require, "fzf-lua")
-if not cmp_status_ok then
-	return
-end
-
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
-fzf_lua.setup({
+require("fzf-lua").setup({
 	lsp = {
 		async_or_timeout = 3000, -- make lsp requests synchronous so they work with null-ls
 	},
 })
 
--- Keymaps
--- keymap("n", "<C-p>", [[<Cmd>:FzfLua files<CR>]], opts)
--- keymap("n", "<leader>b", [[<Cmd>:FzfLua buffers<CR>]], opts)
-keymap("n", "<leader>zbl", [[<Cmd>FzfLua blines<CR>]], opts)
-keymap("n", "<leader>zf", [[<Cmd>FzfLua files<CR>]], opts)
-keymap("n", "<leader>zg", [[<Cmd>FzfLua grep<CR>]], opts)
-keymap("n", "<leader>zgb", [[<Cmd>FzfLua git_branches<CR>]], opts)
-keymap("n", "<leader>zgc", [[<Cmd>FzfLua git_commits<CR>]], opts)
-keymap("n", "<leader>zgl", [[<Cmd>FzfLua grep_last<CR>]], opts)
-keymap("n", "<leader>zgp", [[<Cmd>FzfLua grep_project<CR>]], opts)
-keymap("n", "<leader>zgs", [[<Cmd>FzfLua git_status<CR>]], opts)
-keymap("n", "<leader>zgst", [[<Cmd>FzfLua git_stash<CR>]], opts)
-keymap("n", "<leader>zgv", [[<Cmd>FzfLua grep_visual<CR>]], opts)
-keymap("n", "<leader>zgw", [[<Cmd>FzfLua grep_cword<CR>]], opts)
-keymap("n", "<leader>zh", [[<Cmd>FzfLua oldfiles<CR>]], opts)
-keymap("n", "<leader>zl", [[<Cmd>FzfLua lines<CR>]], opts)
-keymap("n", "<leader>zlca", [[<Cmd>FzfLua code_actions<CR>]], opts)
-keymap("n", "<leader>zld", [[<Cmd>FzfLua lsp_definitions<CR>]], opts)
-keymap("n", "<leader>zlds", [[<Cmd>FzfLua lsp_document_symbols<CR>]], opts)
-keymap("n", "<leader>zlg", [[<Cmd>FzfLua live_grep<CR>]], opts)
-keymap("n", "<leader>zlgr", [[<Cmd>FzfLua live_grep_resume<CR>]], opts)
-keymap("n", "<leader>zlr", [[<Cmd>FzfLua lsp_references<CR>]], opts)
-keymap("n", "<leader>zltd", [[<Cmd>FzfLua lsp_typedef<CR>]], opts)
-keymap("n", "<leader>zlws", [[<Cmd>FzfLua lsp_live_workspace_symbols<CR>]], opts)
-keymap("n", "<leader>zm", [[<Cmd>FzfLua marks<CR>]], opts)
-keymap("n", "<leader>zqfq", [[<Cmd>FzfLua quickfix<CR>]], opts)
-keymap("n", "<leader>zr", [[<Cmd>FzfLua resume<CR>]], opts)
-keymap("n", "<leader>zss", [[<Cmd>FzfLua spell_suggest<CR>]], opts)
-keymap("n", "<leader>ztg", [[<Cmd>FzfLua tabs<CR>]], opts)
+vim.keymap.set("n", "<leader>zbl", [[<Cmd>FzfLua blines<CR>]], opts)
+vim.keymap.set("n", "<leader>zf", [[<Cmd>FzfLua Files<CR>]], opts)
+vim.keymap.set("n", "<leader>zg", [[<Cmd>FzfLua Grep<CR>]], opts)
+vim.keymap.set("n", "<leader>zgb", [[<Cmd>FzfLua git_branches<CR>]], opts)
+vim.keymap.set("n", "<leader>zgc", [[<Cmd>FzfLua git_commits<CR>]], opts)
+vim.keymap.set("n", "<leader>zgl", [[<Cmd>FzfLua grep_last<CR>]], opts)
+vim.keymap.set("n", "<leader>zgp", [[<Cmd>FzfLua grep_project<CR>]], opts)
+vim.keymap.set("n", "<leader>zgs", [[<Cmd>FzfLua git_status<CR>]], opts)
+vim.keymap.set("n", "<leader>zgst", [[<Cmd>FzfLua git_stash<CR>]], opts)
+vim.keymap.set("n", "<leader>zgv", [[<Cmd>FzfLua grep_visual<CR>]], opts)
+vim.keymap.set("n", "<leader>zgw", [[<Cmd>FzfLua grep_cword<CR>]], opts)
+vim.keymap.set("n", "<leader>zh", [[<Cmd>FzfLua oldfiles<CR>]], opts)
+vim.keymap.set("n", "<leader>zl", [[<Cmd>FzfLua lines<CR>]], opts)
+vim.keymap.set("n", "<leader>zlca", [[<Cmd>FzfLua code_actions<CR>]], opts)
+vim.keymap.set("n", "<leader>zld", [[<Cmd>FzfLua lsp_definitions<CR>]], opts)
+vim.keymap.set("n", "<leader>zlds", [[<Cmd>FzfLua lsp_document_symbols<CR>]], opts)
+vim.keymap.set("n", "<leader>zlg", [[<Cmd>FzfLua live_grep<CR>]], opts)
+vim.keymap.set("n", "<leader>zlgr", [[<Cmd>FzfLua live_grep_resume<CR>]], opts)
+vim.keymap.set("n", "<leader>zlr", [[<Cmd>FzfLua lsp_references<CR>]], opts)
+vim.keymap.set("n", "<leader>zltd", [[<Cmd>FzfLua lsp_typedef<CR>]], opts)
+vim.keymap.set("n", "<leader>zlws", [[<Cmd>FzfLua lsp_live_workspace_symbols<CR>]], opts)
+vim.keymap.set("n", "<leader>zm", [[<Cmd>FzfLua marks<CR>]], opts)
+vim.keymap.set("n", "<leader>zqfq", [[<Cmd>FzfLua quickfix<CR>]], opts)
+vim.keymap.set("n", "<leader>zr", [[<Cmd>FzfLua resume<CR>]], opts)
+vim.keymap.set("n", "<leader>zss", [[<Cmd>FzfLua spell_suggest<CR>]], opts)
+vim.keymap.set("n", "<leader>ztg", [[<Cmd>FzfLua tabs<CR>]], opts)

nvim/after/plugin/git-worktree.lua

@@ -1,9 +1,4 @@
 -- https://github.com/ThePrimeagen/git-worktree.nvim
-local cmp_status_ok, worktree = pcall(require, "git-worktree")
-if not cmp_status_ok then
-	return
-end
-
 vim.g.git_worktree_log_level = "error"
 
-worktree.setup()
+require("git-worktree").setup()

nvim/after/plugin/gitsigns.lua

@@ -1,10 +1,5 @@
 -- https://github.com/lewis6991/gitsigns.nvim
-local status_ok, gitsigns = pcall(require, "gitsigns")
-if not status_ok then
-	return
-end
-
-gitsigns.setup({
+require("gitsigns").setup({
 	signs = {
 		add = { hl = "GitSignsAdd", text = "▎", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
 		change = { hl = "GitSignsChange", text = "▎", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },

nvim/after/plugin/glance.lua

@@ -1,16 +1,9 @@
 -- https://github.com/DNLHC/glance.nvim
-local status_ok, glance = pcall(require, "glance")
-if not status_ok then
-	return
-end
-
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
-glance.setup()
+vim.keymap.set("n", "gld", "<CMD>Glance definitions<CR>", opts)
+vim.keymap.set("n", "gli", "<CMD>Glance implementations<CR>", opts)
+vim.keymap.set("n", "glr", "<CMD>Glance references<CR>", opts)
+vim.keymap.set("n", "glt", "<CMD>Glance type_definitions<CR>", opts)
 
--- Keymaps
-keymap("n", "gld", "<CMD>Glance definitions<CR>", opts)
-keymap("n", "gli", "<CMD>Glance implementations<CR>", opts)
-keymap("n", "glr", "<CMD>Glance references<CR>", opts)
-keymap("n", "glt", "<CMD>Glance type_definitions<CR>", opts)
+require("glance").setup()

nvim/after/plugin/harpoon.lua

@@ -1,18 +1,12 @@
 -- https://github.com/ThePrimeagen/harpoon
-local status, harpoon = pcall(require, "harpoon")
-if not status then
-	return
-end
-
-local keymap = vim.keymap.set
+local harpoon = require("harpoon")
 local opts = { noremap = true, silent = true }
 
-harpoon.setup()
+vim.keymap.set("n", "<leader>a", [[<Cmd>lua require("harpoon.mark").add_file()<CR>]], opts)
+vim.keymap.set("n", "<leader>,", [[<Cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>]], opts)
+vim.keymap.set("n", "<leader>1", [[<Cmd>lua require("harpoon.ui").nav_file(1)<CR>]], opts)
+vim.keymap.set("n", "<leader>2", [[<Cmd>lua require("harpoon.ui").nav_file(2)<CR>]], opts)
+vim.keymap.set("n", "<leader>3", [[<Cmd>lua require("harpoon.ui").nav_file(3)<CR>]], opts)
+vim.keymap.set("n", "<leader>4", [[<Cmd>lua require("harpoon.ui").nav_file(4)<CR>]], opts)
 
--- Keymaps
-keymap("n", "<leader>a", [[<Cmd>lua require("harpoon.mark").add_file()<CR>]], opts)
-keymap("n", "<leader>,", [[<Cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>]], opts)
-keymap("n", "<leader>1", [[<Cmd>lua require("harpoon.ui").nav_file(1)<CR>]], opts)
-keymap("n", "<leader>2", [[<Cmd>lua require("harpoon.ui").nav_file(2)<CR>]], opts)
-keymap("n", "<leader>3", [[<Cmd>lua require("harpoon.ui").nav_file(3)<CR>]], opts)
-keymap("n", "<leader>4", [[<Cmd>lua require("harpoon.ui").nav_file(4)<CR>]], opts)
+harpoon.setup()

nvim/after/plugin/impatient.lua

@@ -1,7 +1,4 @@
 -- https://github.com/lewis6991/impatient.nvim
-local status_ok, impatient = pcall(require, "impatient")
-if not status_ok then
-	return
-end
+local impatient = require("impatient")
 
 impatient.enable_profile()

nvim/after/plugin/indentline.lua

@@ -1,14 +1,10 @@
 -- https://github.com/lukas-reineke/indent-blankline.nvim
-local status_ok, indent_blankline = pcall(require, "indent_blankline")
-if not status_ok then
-	return
-end
+local indent_blankline = require("indent_blankline")
 
 vim.opt.termguicolors = true
-vim.cmd([[
-highlight IndentBlanklineIndent1 guibg=#1f1f1f gui=nocombine
-highlight IndentBlanklineIndent2 guibg=#1a1a1a gui=nocombine
-]])
+
+vim.api.nvim_set_hl(0, "IndentBlanklineIndent1", { bg = "#1f1f1f", nocombine = true })
+vim.api.nvim_set_hl(0, "IndentBlanklineIndent2", { bg = "#1a1a1a", nocombine = true })
 
 indent_blankline.setup({
 	char = "",

nvim/after/plugin/legendary.lua

@@ -1,13 +1,7 @@
 -- https://github.com/mrjones2014/legendary.nvim
-local status, legendary = pcall(require, "legendary")
-if not status then
-	return
-end
-
-local keymap = vim.keymap.set
+local legendary = require("legendary")
 local opts = { noremap = true, silent = true }
 
-legendary.setup({ which_key = { auto_register = true } })
+vim.keymap.set("n", "LL", "<CMD>Legendary<CR>", opts)
 
--- Keymaps
-keymap("n", "LL", "<CMD>Legendary<CR>", opts)
+legendary.setup({ which_key = { auto_register = true } })

nvim/after/plugin/lualine.lua

@@ -1,13 +1,7 @@
 -- https://github.com/nvim-lualine/lualine.nvim
-local status, lualine = pcall(require, "lualine")
-if not status then
-	return
-end
-
-lualine.setup({
+require("lualine").setup({
 	options = {
 		icons_enabled = true,
-		--[[ theme = "onedark", ]]
 		theme = "tokyonight",
 		component_separators = { left = "", right = "" },
 		section_separators = { left = "", right = "" },

nvim/after/plugin/neoscroll.lua

@@ -1,7 +0,0 @@
--- https://github.com/karb94/neoscroll.nvim
-local status, neoscroll = pcall(require, "neoscroll")
-if not status then
-	return
-end
-
---[[ neoscroll.setup() ]]

nvim/after/plugin/neovide.lua

@@ -0,0 +1,8 @@
+-- https://github.com/neovide/neovide
+if vim.fn.exists("g:neovide") then
+	vim.o.guifont = "FiraCode Nerd Font:h20"
+
+	vim.g.neovide_cursor_vfx_mode = "railgun"
+	vim.g.neovide_floating_blur_amount_x = 2.0
+	vim.g.neovide_floating_blur_amount_y = 2.0
+end

nvim/after/plugin/neovide.vim

@@ -1,8 +0,0 @@
-" https://github.com/neovide/neovide
-if exists("g:neovide")
-  set guifont=FiraCode\ Nerd\ Font:h20
-
-  let g:neovide_cursor_vfx_mode = "railgun"
-  let g:neovide_floating_blur_amount_x = 2.0
-  let g:neovide_floating_blur_amount_y = 2.0
-endif

nvim/after/plugin/nvim-tree.lua

@@ -1,10 +1,5 @@
 -- https://github.com/kyazdani42/nvim-tree.lua
-local status_ok, nvim_tree = pcall(require, "nvim-tree")
-if not status_ok then
-	return
-end
-
-nvim_tree.setup({
+require("nvim-tree").setup({
 	update_focused_file = {
 		enable = true,
 		update_root = true,

nvim/after/plugin/octo.lua

@@ -1,7 +1,2 @@
 -- https://github.com/pwntester/octo.nvim
-local status_ok, octo = pcall(require, "octo")
-if not status_ok then
-	return
-end
-
-octo.setup()
+require("octo").setup()

nvim/after/plugin/project.lua

@@ -1,10 +1,9 @@
 -- https://github.com/ahmedkhalf/project.nvim
-local status_ok, project = pcall(require, "project_nvim")
-if not status_ok then
-	return
-end
+local opts = { noremap = true, silent = true }
 
-project.setup({
+vim.keymap.set("n", "<leader>pm", [[<Cmd>:Telescope projects<CR>]], opts)
+
+require("project_nvim").setup({
 	active = true,
 	on_config_done = nil,
 	manual_mode = false,
@@ -23,8 +22,3 @@ project.setup({
 	ignore_lsp = {},
 	datapath = vim.fn.stdpath("data"),
 })
-
-local keymap = vim.keymap.set
-local opts = { noremap = true, silent = true }
-
-keymap("n", "<leader>pm", [[<Cmd>:Telescope projects<CR>]], opts)

nvim/after/plugin/sad.lua

@@ -1,10 +1,5 @@
 -- https://github.com/ray-x/sad.nvim
-local status_ok, sad = pcall(require, "sad")
-if not status_ok then
-	return
-end
-
-sad.setup({
+require("sad").setup({
 	diff = "delta", -- you can use `diff`, `diff-so-fancy`
 	ls_file = "fd", -- also git ls_file
 	exact = false, -- exact match

nvim/after/plugin/spectre.lua

@@ -1,7 +1,2 @@
 -- https://github.com/nvim-pack/nvim-spectre
-local status_ok, spectre = pcall(require, "spectre")
-if not status_ok then
-	return
-end
-
-spectre.setup()
+require("spectre").setup()

nvim/after/plugin/surround.lua

@@ -1,7 +1,2 @@
 -- https://github.com/kylechui/nvim-surround
-local status_ok, surround = pcall(require, "nvim-surround")
-if not status_ok then
-	return
-end
-
-surround.setup()
+require("nvim-surround").setup()

nvim/after/plugin/symbols-outline.lua

@@ -1,9 +1,4 @@
 -- https://github.com/simrat39/symbols-outline.nvim
-local status_ok, outline = pcall(require, "symbols-outline")
-if not status_ok then
-	return
-end
-
-outline.setup({
+require("symbols-outline").setup({
 	width = 25,
 })

nvim/after/plugin/tabular.vim

@@ -6,7 +6,6 @@ AddTabularPattern! ruby_hash    /^[^=>]*\zs=>/
 AddTabularPattern! commas       /,\s*\zs\s/l0
 AddTabularPattern! colons       /^[^:]*:\s*\zs\s/l0
 
-" Mappings
 inoremap <silent> <Bar> <Bar><Esc>:call <SID>align()<CR>a
 
 " Automatic Tabular.vim with the (|)

nvim/after/plugin/telescope.lua

@@ -1,15 +1,33 @@
 -- https://github.com/nvim-telescope/telescope.nvim/
-local status_ok, telescope = pcall(require, "telescope")
-if not status_ok then
-	return
-end
-
-local keymap = vim.keymap.set
+local telescope = require("telescope")
+local actions = require("telescope.actions")
 local opts = { noremap = true, silent = true }
 
-local actions = require("telescope.actions")
+vim.keymap.set("n", "<C-p>", [[<Cmd>Telescope find_files<CR>]], opts)
+vim.keymap.set("n", "<leader>C", [[<Cmd>Cheatsheet<CR>]], opts)
+vim.keymap.set("n", "<leader>F", [[<Cmd>Telescope live_grep<CR>]], opts)
+vim.keymap.set("n", "<leader>H", [[<Cmd>Telescope headings<CR>]], opts)
+vim.keymap.set("n", "<leader>S", [[<Cmd>Telescope spell_suggest<CR>]], opts)
+vim.keymap.set("n", "<leader>b", [[<Cmd>Telescope buffers<CR>]], opts)
+vim.keymap.set("n", "<leader>bm", [[<Cmd>Telescope bookmarks<CR>]], opts)
+vim.keymap.set("n", "<leader>f", [[<Cmd>Telescope current_buffer_fuzzy_find<CR>]], opts)
+vim.keymap.set("n", "<leader>fa", [[<Cmd>Telescope find_files hidden=true<CR>]], opts)
+vim.keymap.set("n", "<leader>fb", [[<Cmd>Telescope file_browser<CR>]], opts)
+vim.keymap.set("n", "<leader>fd", [[<Cmd>Telescope dir live_grep<CR>]], opts)
+vim.keymap.set("n", "<leader>ff", [[<Cmd>Telescope dir find_files<CR>]], opts)
+vim.keymap.set("n", "<leader>gb", [[<Cmd>Telescope git_branches<CR>]], opts)
+vim.keymap.set("n", "<leader>gs", [[<Cmd>Telescope git_status<CR>]], opts)
+vim.keymap.set("n", "<leader>gwc", [[<Cmd>Telescope git_worktree create_git_worktree<CR>]], opts)
+vim.keymap.set("n", "<leader>gww", [[<Cmd>Telescope git_worktree git_worktrees<CR>]], opts)
+vim.keymap.set("n", "<leader>ht", [[<Cmd>Telescope help_tags<CR>]], opts)
+vim.keymap.set("n", "<leader>km", [[<Cmd>Telescope keymaps<CR>]], opts)
+vim.keymap.set("n", "<leader>m", [[<Cmd>Telescope marks<CR>]], opts)
+vim.keymap.set("n", "<leader>mru", [[<Cmd>Telescope frecency<CR>]], opts)
+vim.keymap.set("n", "<leader>nm", [[<Cmd>Telescope node_modules list<CR>]], opts)
+vim.keymap.set("n", "<leader>r", [[<Cmd>Telescope resume<CR>]], opts)
+vim.keymap.set("n", "<leader>tg", [[<Cmd>Telescope tags<CR>]], opts)
+vim.keymap.set("n", "<leader>ty", [[<Cmd>Telescope symbols<CR>]], opts)
 
--- Extensions
 telescope.load_extension("bookmarks")
 telescope.load_extension("node_modules")
 telescope.load_extension("file_browser")
@@ -23,33 +41,6 @@ telescope.load_extension("gh")
 telescope.load_extension("git_worktree")
 telescope.load_extension("dir")
 
--- Keymaps
-keymap("n", "<C-p>", [[<Cmd>Telescope find_files<CR>]], opts)
-keymap("n", "<leader>C", [[<Cmd>Cheatsheet<CR>]], opts)
-keymap("n", "<leader>F", [[<Cmd>Telescope live_grep<CR>]], opts)
-keymap("n", "<leader>H", [[<Cmd>Telescope headings<CR>]], opts)
-keymap("n", "<leader>S", [[<Cmd>Telescope spell_suggest<CR>]], opts)
-keymap("n", "<leader>b", [[<Cmd>Telescope buffers<CR>]], opts)
-keymap("n", "<leader>bm", [[<Cmd>Telescope bookmarks<CR>]], opts)
-keymap("n", "<leader>f", [[<Cmd>Telescope current_buffer_fuzzy_find<CR>]], opts)
-keymap("n", "<leader>fa", [[<Cmd>Telescope find_files hidden=true<CR>]], opts)
-keymap("n", "<leader>fb", [[<Cmd>Telescope file_browser<CR>]], opts)
-keymap("n", "<leader>fd", [[<Cmd>Telescope dir live_grep<CR>]], opts)
-keymap("n", "<leader>ff", [[<Cmd>Telescope dir find_files<CR>]], opts)
-keymap("n", "<leader>gb", [[<Cmd>Telescope git_branches<CR>]], opts)
-keymap("n", "<leader>gs", [[<Cmd>Telescope git_status<CR>]], opts)
-keymap("n", "<leader>gwc", [[<Cmd>Telescope git_worktree create_git_worktree<CR>]], opts)
-keymap("n", "<leader>gww", [[<Cmd>Telescope git_worktree git_worktrees<CR>]], opts)
-keymap("n", "<leader>ht", [[<Cmd>Telescope help_tags<CR>]], opts)
-keymap("n", "<leader>km", [[<Cmd>Telescope keymaps<CR>]], opts)
-keymap("n", "<leader>m", [[<Cmd>Telescope marks<CR>]], opts)
-keymap("n", "<leader>mru", [[<Cmd>Telescope frecency<CR>]], opts)
-keymap("n", "<leader>nm", [[<Cmd>Telescope node_modules list<CR>]], opts)
-keymap("n", "<leader>r", [[<Cmd>Telescope resume<CR>]], opts)
-keymap("n", "<leader>tg", [[<Cmd>Telescope tags<CR>]], opts)
-keymap("n", "<leader>ty", [[<Cmd>Telescope symbols<CR>]], opts)
-
--- Setup
 telescope.setup({
 	defaults = {
 		prompt_prefix = " ",

nvim/after/plugin/todo-comments.lua

@@ -1,7 +1,2 @@
 -- https://github.com/folke/todo-comments.nvim
-local status_ok, todo = pcall(require, "todo-comments")
-if not status_ok then
-	return
-end
-
-todo.setup()
+require("todo-comments").setup()

nvim/after/plugin/toggleterm.lua

@@ -1,8 +1,17 @@
 -- https://github.com/akinsho/toggleterm.nvim
-local status_ok, toggleterm = pcall(require, "toggleterm")
-if not status_ok then
-	return
-end
+local toggleterm = require("toggleterm")
+local Terminal = require("toggleterm.terminal").Terminal
+local opts = { noremap = true, silent = true }
+
+-- Keymaps
+vim.keymap.set("n", "<M-g>", "<cmd>lua _LAZYGIT_TOGGLE()<CR>", opts)
+vim.keymap.set("n", "<M-o>", "<cmd>lua _RANGER_TOGGLE()<CR>", opts)
+vim.keymap.set("n", "<leader>lg", "<cmd>lua _LAZYGIT_TOGGLE()<CR>", opts)
+vim.keymap.set("n", "<leader>ncdu", "<cmd>lua _NCDU_TOGGLE()<CR>", opts)
+vim.keymap.set("n", "<leader>node", "<cmd>lua _NODE_TOGGLE()<CR>", opts)
+vim.keymap.set("n", "<leader>rg", "<cmd>lua _RANGER_TOGGLE()<CR>", opts)
+vim.keymap.set("n", "<leader>top", "<cmd>lua _HTOP_TOGGLE()<CR>", opts)
+vim.keymap.set("n", "<leader>y", "<cmd>lua _PYTHON_TOGGLE()<CR>", opts)
 
 toggleterm.setup({
 	size = 20,
@@ -42,16 +51,13 @@ end
 
 vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()")
 
-local Terminal = require("toggleterm.terminal").Terminal
-local lazygit = Terminal:new({
-	cmd = "lazygit",
-	hidden = true,
-})
-
-local ranger = Terminal:new({
-	cmd = "ranger",
-	hidden = true,
-})
+local lazygit = Terminal:new({ cmd = "lazygit", hidden = true })
+local ranger = Terminal:new({ cmd = "ranger", hidden = true })
+local tig = Terminal:new({ cmd = "tig", hidden = true })
+local node = Terminal:new({ cmd = "node", hidden = true })
+local ncdu = Terminal:new({ cmd = "ncdu", hidden = true })
+local htop = Terminal:new({ cmd = "htop", hidden = true })
+local python = Terminal:new({ cmd = "python", hidden = true })
 
 function _LAZYGIT_TOGGLE()
 	lazygit:toggle()
@@ -61,60 +67,22 @@ function _RANGER_TOGGLE()
 	ranger:toggle()
 end
 
-local tig = Terminal:new({
-	cmd = "tig",
-	hidden = true,
-})
-
 function _TIG_TOGGLE()
 	tig:toggle()
 end
 
-local node = Terminal:new({
-	cmd = "node",
-	hidden = true,
-})
-
 function _NODE_TOGGLE()
 	node:toggle()
 end
 
-local ncdu = Terminal:new({
-	cmd = "ncdu",
-	hidden = true,
-})
-
 function _NCDU_TOGGLE()
 	ncdu:toggle()
 end
 
-local htop = Terminal:new({
-	cmd = "htop",
-	hidden = true,
-})
-
 function _HTOP_TOGGLE()
 	htop:toggle()
 end
 
-local python = Terminal:new({
-	cmd = "python",
-	hidden = true,
-})
-
 function _PYTHON_TOGGLE()
 	python:toggle()
 end
-
-local keymap = vim.keymap.set
-local opts = { noremap = true, silent = true }
-
--- Keymaps
-keymap("n", "<M-g>", "<cmd>lua _LAZYGIT_TOGGLE()<CR>", opts)
-keymap("n", "<M-o>", "<cmd>lua _RANGER_TOGGLE()<CR>", opts)
-keymap("n", "<leader>lg", "<cmd>lua _LAZYGIT_TOGGLE()<CR>", opts)
-keymap("n", "<leader>ncdu", "<cmd>lua _NCDU_TOGGLE()<CR>", opts)
-keymap("n", "<leader>node", "<cmd>lua _NODE_TOGGLE()<CR>", opts)
-keymap("n", "<leader>rg", "<cmd>lua _RANGER_TOGGLE()<CR>", opts)
-keymap("n", "<leader>top", "<cmd>lua _HTOP_TOGGLE()<CR>", opts)
-keymap("n", "<leader>y", "<cmd>lua _PYTHON_TOGGLE()<CR>", opts)

nvim/after/plugin/treesitter.lua

@@ -1,10 +1,5 @@
 -- https://github.com/nvim-treesitter/nvim-treesitter/
-local status_ok, configs = pcall(require, "nvim-treesitter.configs")
-if not status_ok then
-	return
-end
-
-configs.setup({
+require("nvim-treesitter.configs").setup({
 	ensure_installed = "all",
 	sync_install = false,
 	ignore_install = { "" }, -- List of parsers to ignore installing

nvim/after/plugin/ufo.lua

@@ -1,20 +1,12 @@
 -- https://github.com/kevinhwang91/nvim-ufo
-local status_ok, ufo = pcall(require, "ufo")
-if not status_ok then
-	return
-end
-
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
--- Options
 vim.o.foldcolumn = "1"
 vim.o.foldlevel = 99
 vim.o.foldlevelstart = 99
 vim.o.foldenable = true
 
-ufo.setup()
+vim.keymap.set("n", "zR", require("ufo").openAllFolds, opts)
+vim.keymap.set("n", "zM", require("ufo").closeAllFolds, opts)
 
--- Keymaps
-keymap("n", "zR", require("ufo").openAllFolds, opts)
-keymap("n", "zM", require("ufo").closeAllFolds, opts)
+require("ufo").setup()

nvim/after/plugin/vim-gh-line.lua

@@ -1,3 +1,2 @@
 -- https://github.com/ruanyl/vim-gh-line
-
 vim.g.gh_github_domain = "source.xing.com"

nvim/after/plugin/vimux.lua

@@ -1,15 +1,13 @@
 -- https://github.com/preservim/vimux
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 vim.g.VimuxHeight = "30"
 vim.g.VimuxOrientation = "h"
 vim.g.VimuxUseNearestPane = 0
 
--- Keymaps
-keymap("n", "<leader>vt", [[<cmd>VimuxTogglePane<CR>]], opts)
-keymap("n", "<leader>vp", [[<cmd>VimuxPromptCommand<CR>]], opts)
-keymap("n", "<leader>vl", [[<cmd>VimuxRunLastCommand<CR>]], opts)
-keymap("n", "<leader>vj", [[<cmd>RunJest<CR>]], opts)
-keymap("n", "<leader>vjb", [[<cmd>RunJestOnBuffer<CR>]], opts)
-keymap("n", "<leader>vjf", [[<cmd>RunJestFocused<CR>]], opts)
+vim.keymap.set("n", "<leader>vt", [[<cmd>VimuxTogglePane<CR>]], opts)
+vim.keymap.set("n", "<leader>vp", [[<cmd>VimuxPromptCommand<CR>]], opts)
+vim.keymap.set("n", "<leader>vl", [[<cmd>VimuxRunLastCommand<CR>]], opts)
+vim.keymap.set("n", "<leader>vj", [[<cmd>RunJest<CR>]], opts)
+vim.keymap.set("n", "<leader>vjb", [[<cmd>RunJestOnBuffer<CR>]], opts)
+vim.keymap.set("n", "<leader>vjf", [[<cmd>RunJestFocused<CR>]], opts)

nvim/after/plugin/whichkey.lua

@@ -1,8 +1,5 @@
 -- https://github.com/folke/which-key.nvim
-local status_ok, which_key = pcall(require, "which-key")
-if not status_ok then
-	return
-end
+local which_key = require("which-key")
 
 local mappings = {
 	b = { "<CMD>Telescope buffers<CR>", "Buffers" },

nvim/after/plugin/zen-mode.lua

@@ -1,10 +1,5 @@
 -- https://github.com/folke/zen-mode.nvim
-local status_ok, zenmode = pcall(require, "zen-mode")
-if not status_ok then
-	return
-end
-
-zenmode.setup({
+require("zen-mode").setup({
 	window = {
 		backdrop = 0.98,
 		width = 80,

nvim/lua/kogakure/functions.lua

@@ -1,6 +1,10 @@
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
-local cfg = vim.fn.stdpath("config")
+
+-- Toggle between soft wrap and no wrap
+vim.keymap.set("n", "<leader>tw", [[<cmd>call ToggleWrap()<CR>]], opts)
+
+-- Toggle between soft wrap and no wrap
+vim.keymap.set("n", "<leader>cc", [[<cmd>call ToggleColorColumn()<CR>]], opts)
 
 vim.cmd([[
 function! ToggleWrap()
@@ -42,10 +46,3 @@ function! SpellDe()
   set spellfile=~/.config/nvim/spell/de.utf-8.add
 endfunction
 ]])
-
--- Keymaps
--- Toggle between soft wrap and no wrap
-keymap("n", "<leader>tw", [[<cmd>call ToggleWrap()<CR>]], opts)
-
--- Toggle between soft wrap and no wrap
-keymap("n", "<leader>tcc", [[<cmd>call ToggleColorColumn()<CR>]], opts)

nvim/lua/kogakure/keymaps.lua

@@ -1,162 +1,161 @@
-local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 --- Remap space as <leader> key
-keymap("", "<space>", "<Nop>", opts)
+vim.keymap.set("", "<space>", "<Nop>", opts)
 
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
 -- Quick toggle between buffers
-keymap("n", "<leader>j", ":b#<CR>", opts)
+vim.keymap.set("n", "<leader>j", ":b#<CR>", opts)
 
 -- Add semicolon or comma to the end of the line
-keymap("n", ";;", "A;<ESC>", opts)
-keymap("n", ",,", "A,<ESC>", opts)
+vim.keymap.set("n", ";;", "A;<ESC>", opts)
+vim.keymap.set("n", ",,", "A,<ESC>", opts)
 
 -- Maintain the cursor position when yanking a visual selection
-keymap("v", "y", "myy`y", opts)
+vim.keymap.set("v", "y", "myy`y", opts)
 
 -- Delete last character of line
-keymap("n", "<leader>x", "$x", opts)
+vim.keymap.set("n", "<leader>x", "$x", opts)
 
 -- Do not yank with x
-keymap("n", "x", '"_x', opts)
+vim.keymap.set("n", "x", '"_x', opts)
 
 -- Open vim config in a new buffer, reload vim config
-keymap("n", "<leader>ve", "<cmd>e $MYVIMRC<CR>", opts)
-keymap("n", "<leader>vr", "<cmd>source $MYVIMRC<CR>", opts)
+vim.keymap.set("n", "<leader>ve", "<cmd>e $MYVIMRC<CR>", opts)
+vim.keymap.set("n", "<leader>vr", "<cmd>source $MYVIMRC<CR>", opts)
 
 -- Increment/decrement
-keymap("n", "+", "<C-a>", opts)
-keymap("n", "-", "<C-x>", opts)
+vim.keymap.set("n", "+", "<C-a>", opts)
+vim.keymap.set("n", "-", "<C-x>", opts)
 
 -- Splits
-keymap("n", "ss", ":split<CR><C-w>w", opts)
-keymap("n", "sv", ":vsplit<CR><C-w>w", opts)
+vim.keymap.set("n", "ss", ":split<CR><C-w>w", opts)
+vim.keymap.set("n", "sv", ":vsplit<CR><C-w>w", opts)
 
 -- Select all
-keymap("n", "<C-a>", "gg<S-v>G", opts)
+vim.keymap.set("n", "<C-a>", "gg<S-v>G", opts)
 
 -- Delete current buffer
-keymap("n", "<leader>q", ":Bdelete<CR>", opts)
+vim.keymap.set("n", "<leader>q", ":Bdelete<CR>", opts)
 
 -- Delete all buffers
-keymap("n", "<leader>X", ":bufdo bdelete<CR>", opts)
+vim.keymap.set("n", "<leader>X", ":bufdo bdelete<CR>", opts)
 
 -- Allow gf to open non-existent files
-keymap("", "gf", ":edit <cfile><CR>", opts)
+vim.keymap.set("", "gf", ":edit <cfile><CR>", opts)
 
 -- Reselect visual selection after indenting
-keymap("v", "<", "<gv", opts)
-keymap("v", ">", ">gv", opts)
+vim.keymap.set("v", "<", "<gv", opts)
+vim.keymap.set("v", ">", ">gv", opts)
 
 -- Set spell checker to `s`
 -- zg (good), zG (good temp), zw (wrong), zW (wrong temp)
-keymap("n", "<leader>rs", ":set spell!<CR>", opts)
+vim.keymap.set("n", "<leader>rs", ":set spell!<CR>", opts)
 
 -- Switch off highlighting
-keymap("n", "<leader>h", ":nohlsearch<CR>", opts)
+vim.keymap.set("n", "<leader>h", ":nohlsearch<CR>", opts)
 
 -- Toggle list
-keymap("n", "<leader>l", ":set list!<CR>", opts)
+vim.keymap.set("n", "<leader>l", ":set list!<CR>", opts)
 
 -- Indent the whole source code
-keymap("n", "<leader>pf", "gg=G''", opts)
+vim.keymap.set("n", "<leader>pf", "gg=G''", opts)
 
 -- Reverse the mark mapping
-keymap("n", "'", "`", opts)
-keymap("n", "`", "'", opts)
+vim.keymap.set("n", "'", "`", opts)
+vim.keymap.set("n", "`", "'", opts)
 
 -- Visuall select of just pasted content
-keymap("n", "gP", "`[v`]", opts)
-keymap("n", "gy", "`[v`]y", opts)
+vim.keymap.set("n", "gP", "`[v`]", opts)
+vim.keymap.set("n", "gy", "`[v`]y", opts)
 
 -- When text is wrapped, move by terminal rows, not lines, unless a count is provided
-keymap("n", "<expr> j", "(v:count == 0 ? 'gj' : 'j')", opts)
-keymap("n", "<expr> k", "(v:count == 0 ? 'gk' : 'k')", opts)
+vim.keymap.set("n", "<expr> j", "(v:count == 0 ? 'gj' : 'j')", opts)
+vim.keymap.set("n", "<expr> k", "(v:count == 0 ? 'gk' : 'k')", opts)
 
 -- Open a quickfix window for the last search
-keymap("n", "<leader>?", ":execute 'vimgrep /'.@/.'/g %'<CR>:copen<CR>", opts)
+vim.keymap.set("n", "<leader>?", ":execute 'vimgrep /'.@/.'/g %'<CR>:copen<CR>", opts)
 
 -- Faster linewise scrolling
-keymap("n", "<C-e>", "3<C-e>", opts)
-keymap("n", "<C-y>", "3<C-y>", opts)
+vim.keymap.set("n", "<C-e>", "3<C-e>", opts)
+vim.keymap.set("n", "<C-y>", "3<C-y>", opts)
 
 -- Keep the window centered
-keymap("n", "G", "Gzzzv", opts)
-keymap("n", "n", "nzzzv", opts)
-keymap("n", "N", "Nzzzv", opts)
-keymap("n", "<C-d>", "<C-d>zz", opts)
-keymap("n", "<C-u>", "<C-u>zz", opts)
+vim.keymap.set("n", "G", "Gzzzv", opts)
+vim.keymap.set("n", "n", "nzzzv", opts)
+vim.keymap.set("n", "N", "Nzzzv", opts)
+vim.keymap.set("n", "<C-d>", "<C-d>zz", opts)
+vim.keymap.set("n", "<C-u>", "<C-u>zz", opts)
 
 -- Copy to the end of the line
-keymap("n", "Y", "yg$", opts)
+vim.keymap.set("n", "Y", "yg$", opts)
 
 -- Close all buffers
-keymap("n", "XX", ":qa<CR>", opts)
+vim.keymap.set("n", "XX", ":qa<CR>", opts)
 
 -- Add lines in NORMAL Mode
-keymap("n", "gN", "o<ESC>k", opts)
-keymap("n", "gNN", "O<ESC>j", opts)
+vim.keymap.set("n", "gN", "o<ESC>k", opts)
+vim.keymap.set("n", "gNN", "O<ESC>j", opts)
 
 -- Change to the folder of the current file
-keymap("n", "<leader>cf", ":cd %:p:h<CR>:pwd<CR>", opts)
+vim.keymap.set("n", "<leader>cf", ":cd %:p:h<CR>:pwd<CR>", opts)
 
 -- Reformat a line into a block
-keymap("n", "<leader>rq", "gqip", opts)
+vim.keymap.set("n", "<leader>rq", "gqip", opts)
 
 -- Reformat a block into a line
-keymap("n", "<leader>rqq", "vipJ", opts)
+vim.keymap.set("n", "<leader>rqq", "vipJ", opts)
 
 -- Easier split navigation
-keymap("n", "<C-J>", "<C-W><C-K>", opts)
-keymap("n", "<C-K>", "<C-W><C-L>", opts)
-keymap("n", "<C-L>", "<C-W><C-H>", opts)
-keymap("n", "<C-H>", "<C-W><C-H>", opts)
+vim.keymap.set("n", "<C-J>", "<C-W><C-K>", opts)
+vim.keymap.set("n", "<C-K>", "<C-W><C-L>", opts)
+vim.keymap.set("n", "<C-L>", "<C-W><C-H>", opts)
+vim.keymap.set("n", "<C-H>", "<C-W><C-H>", opts)
 
 -- Resize with arrows
-keymap("n", "<C-M-Up>", ":resize +2<CR>", opts)
-keymap("n", "<C-M-Down>", ":resize -2<CR>", opts)
-keymap("n", "<C-M-Left>", ":vertical resize +2<CR>", opts)
-keymap("n", "<C-M-Right>", ":vertical resize -2<CR>", opts)
+vim.keymap.set("n", "<C-M-Up>", ":resize +2<CR>", opts)
+vim.keymap.set("n", "<C-M-Down>", ":resize -2<CR>", opts)
+vim.keymap.set("n", "<C-M-Left>", ":vertical resize +2<CR>", opts)
+vim.keymap.set("n", "<C-M-Right>", ":vertical resize -2<CR>", opts)
 
 -- Stay in indent mode
-keymap("v", "<", "<gv", opts)
-keymap("v", ">", ">gv", opts)
+vim.keymap.set("v", "<", "<gv", opts)
+vim.keymap.set("v", ">", ">gv", opts)
 
 -- Move text up and down
-keymap("v", "<A-j>", ":m .+1<CR>==", opts)
-keymap("v", "<A-k>", ":m .-2<CR>==", opts)
+vim.keymap.set("v", "<A-j>", ":m .+1<CR>==", opts)
+vim.keymap.set("v", "<A-k>", ":m .-2<CR>==", opts)
 
 -- Navigate buffers
---[[ keymap("n", "<S-l>", ":bnext<CR>", opts) ]]
---[[ keymap("n", "<S-h>", ":bprevious<CR>", opts) ]]
+--[[ vim.keymap.set("n", "<S-l>", ":bnext<CR>", opts) ]]
+--[[ vim.keymap.set("n", "<S-h>", ":bprevious<CR>", opts) ]]
 
 -- Remap Jump to Tag
-keymap("n", "ü", "<C-]>", opts)
-keymap("n", "Ü", "<C-O>", opts)
+vim.keymap.set("n", "ü", "<C-]>", opts)
+vim.keymap.set("n", "Ü", "<C-O>", opts)
 
 -- Open for Markdown in iA Writer
-keymap("n", "<leader>ia", ":silent !open -a iA\\ Writer.app '%:p'<CR>", opts)
+vim.keymap.set("n", "<leader>ia", ":silent !open -a iA\\ Writer.app '%:p'<CR>", opts)
 
 -- Custom Text-Objects
-keymap("o", "il", ":<c-u>normal! $v^<CR>", opts)
-keymap("x", "il", ":<c-u>normal! $v^<CR>", opts)
-keymap("o", "al", ":<c-u>normal! $v0<CR>", opts)
-keymap("x", "al", ":<c-u>normal! $v0<CR>", opts)
+vim.keymap.set("o", "il", ":<c-u>normal! $v^<CR>", opts)
+vim.keymap.set("x", "il", ":<c-u>normal! $v^<CR>", opts)
+vim.keymap.set("o", "al", ":<c-u>normal! $v0<CR>", opts)
+vim.keymap.set("x", "al", ":<c-u>normal! $v0<CR>", opts)
 
 -- LSP formatting
-keymap("n", "<leader>o", "<cmd>lua vim.lsp.buf.format()<CR>", opts)
+vim.keymap.set("n", "<leader>o", "<cmd>lua vim.lsp.buf.format()<CR>", opts)
 
 -- Manual Prettier
-keymap("n", "<leader>P", "<cmd>Prettier<CR>", opts)
+vim.keymap.set("n", "<leader>P", "<cmd>Prettier<CR>", opts)
 
 -- Get the filename and path of current file
-keymap("n", "<leader>kn", ":let @+=@%<CR>", opts)
+vim.keymap.set("n", "<leader>kn", ":let @+=@%<CR>", opts)
 
 -- Remove console.log statements
-keymap("n", "<leader>kc", ":g/console.log/d<CR>", opts)
+vim.keymap.set("n", "<leader>kc", ":g/console.log/d<CR>", opts)
 
 -- Convert Markdown to HTML and copy to Clipboard
-keymap("v", "<leader>kp", ":'<,'> w !pandoc --no-highlight --wrap=none | pbcopy <CR>", opts)
+vim.keymap.set("v", "<leader>kp", ":'<,'> w !pandoc --no-highlight --wrap=none | pbcopy <CR>", opts)

nvim/lua/kogakure/plugins.lua

@@ -128,7 +128,6 @@ return packer.startup(function(use)
 	use("MattesGroeger/vim-bookmarks") -- Bookmarks
 	use("folke/which-key.nvim") -- Display possible keybindings
 	use("mrjones2014/legendary.nvim") -- Legend for keymaps, commands, and autocommands
-	use("karb94/neoscroll.nvim") -- Smooth scrolling
 	use("APZelos/blamer.nvim") -- Git Blame
 	use("tpope/vim-fugitive") -- Git plugin
 	use("elijahmanor/export-to-vscode.nvim") -- Export active Buffers to Visual Studio Code
@@ -137,7 +136,7 @@ return packer.startup(function(use)
 	use("pwntester/octo.nvim") -- GitHub in Neovim
 	use("nvim-pack/nvim-spectre") -- Search and replace
 	use("stevearc/dressing.nvim") -- Improve the default vim.ui interfaces
-	use("folke/zen-mode.nvim") -- Zen Mode (2)
+	use("folke/zen-mode.nvim") -- Zen Mode
 	use("tpope/vim-eunuch") -- UNIX Shell commands
 	use("folke/twilight.nvim") -- Dim inactive code
 	use("ray-x/guihua.lua") -- Lua GUI lib