neovim changes

.config/nvim/lua/BluePlum/keymap.lua

@@ -1,58 +1,93 @@
-vim.keymap.set('i', '<M-Up>', '<ESC>:move-2<CR>i')
-vim.keymap.set('i', '<M-Down>', '<ESC>:move+<CR>i')
+local set = vim.keymap.set
 
-vim.keymap.set('n', '<C-Up>', '<C-u>zz')
-vim.keymap.set('n', '<C-Down>', '<C-d>zz')
+set('i', '<M-Up>', '<ESC>:move-2<CR>i')
+set('i', '<M-Down>', '<ESC>:move+<CR>i')
+
+set('n', '<C-Up>', '<C-u>zz')
+set('n', '<C-Down>', '<C-d>zz')
 
 -- yank to clipboard with leader
-vim.keymap.set('n', '<leader>y', '"+y')
-vim.keymap.set('v', '<leader>y', '"+y')
+set('n', '<leader>y', '"+y')
+set('v', '<leader>y', '"+y')
 
-vim.keymap.set('n', 'Q', '<nop>')
+set('n', 'Q', '<nop>')
 
 -- terminal
-vim.keymap.set('n', '<leader>t', ':term<CR>')
-vim.keymap.set('t', '<ESC>', '<C-\\><C-n>')
+-- set('n', '<leader>t', ':split<CR>:term<CR>')
+OpenTerminal = nil
+PreviousBuffer = -1
+set('n', '<leader>t', function()
+	if vim.api.nvim_get_current_buf() == OpenTerminal and PreviousBuffer ~= -1 then
+		vim.api.nvim_set_current_buf(PreviousBuffer)
+		PreviousBuffer = -1
+		return
+	end
+
+	PreviousBuffer = vim.api.nvim_get_current_buf()
+	if OpenTerminal ~= nil then
+		vim.api.nvim_set_current_buf(OpenTerminal)
+	else
+		vim.cmd.term()
+		OpenTerminal = vim.api.nvim_get_current_buf()
+		vim.api.nvim_create_autocmd({ 'BufDelete' }, {
+			callback = function(args)
+				if args.buf == OpenTerminal then
+					OpenTerminal = nil
+				end
+			end,
+		})
+	end
+end)
+set('t', '<ESC>', '<C-\\><C-n>')
 
 -- nice additions
-vim.keymap.set('n', '<leader>er', function()
+set('n', '<leader>er', function()
 	vim.diagnostic.open_float()
 end)
-vim.keymap.set('n', '<leader>l', ':e#<CR>')
--- vim.keymap.set('n', '<leader>ca', ':CodeActionMenu<CR>')
--- vim.keymap.set('n', '<leader>cn', ':IncRename ')
+set('n', '<leader>l', ':e#<CR>')
+-- set('n', '<leader>ca', ':CodeActionMenu<CR>')
+-- set('n', '<leader>cn', ':IncRename ')
 
-vim.keymap.set('n', '<leader>i', 'cc')
+set('n', '<leader>i', 'cc')
 -- peek
-vim.keymap.set('n', '<leader>p', vim.lsp.buf.hover)
+set('n', '<leader>p', vim.lsp.buf.hover)
 
 -- Scratch pad
-vim.keymap.set(
+set(
 	'n',
 	'<leader>s',
 	':bo vs<CR>:enew<CR>:setlocal noswapfile<CR>:setlocal bufhidden=hide<CR>:setlocal buftype=nofile<CR>:set filetype=markdown<CR>:set syntax=markdown<CR>'
 )
 
 -- Help
-vim.cmd.cnoreabbrev('h vert h')
-vim.keymap.set('n', '<leader>h', ':h <C-r><C-w><CR>')
-
--- Windows
-vim.keymap.set('n', '<leader>q', function()
-	if vim.bo.modified then
-		if Confirm('Buffer has unsaved changes; write?') then
-			vim.cmd.write()
-			vim.cmd.bdelete()
-		else
-			vim.cmd('bd!')
-		end
-	else
-		vim.cmd.bdelete()
-	end
-end)
+-- vim.cmd.cnoreabbrev('h vert h')
+-- set('n', '<leader>h', ':h <C-r><C-w><CR>')
 
 -- Comp mode
-vim.keymap.set('n', '<leader>c<CR>', ':Compile<CR>')
-vim.keymap.set('n', '<leader>cs', ':CompileInterrupt<CR>')
+set('n', '<leader>c<CR>', ':Compile<CR>')
+set('n', '<leader>cs', ':CompileInterrupt<CR>')
 
-vim.keymap.set('n', '<leader>E', ':NextError<CR>')
+set('n', '<leader>E', ':NextError<CR>')
+
+-- Windows
+set('n', '<M-q>', '<C-w>q')
+set('n', '<M-left>', '<C-w><left>')
+set('n', '<M-right>', '<C-w><right>')
+set('n', '<M-up>', '<C-w><up>')
+set('n', '<M-down>', '<C-w><down>')
+
+set('n', '<M-S-right>', '<C-w>t<C-w>H')
+
+Fullscreen = false
+set('n', '<M-f>', function()
+	if Fullscreen then
+		print('full screen')
+		vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<C-w>_<C-w>|', true, false, true), 'm', false)
+	else
+		vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<C-w>=', true, false, true), 'm', false)
+	end
+	Fullscreen = not Fullscreen
+end)
+
+-- Generic
+set('n', '<leader>q', ':bd!<CR>')

.config/nvim/lua/BluePlum/set.lua

@@ -17,7 +17,7 @@ vim.g.mapleader = ' '
 
 -- Terminal
 vim.g.termguicolors = true
-vim.g.terminal_emulator = 'kitty'
+vim.opt.shell = '/bin/fish'
 
 -- LSP
 vim.lsp.inlay_hint.enable()
@@ -39,6 +39,11 @@ vim.api.nvim_create_autocmd('FileType', {
 	command = 'setlocal linebreak',
 })
 
+vim.cmd.cnoreabbrev('grep', 'Grepper')
+
 -- Search
 vim.opt.hlsearch = false
 vim.opt.incsearch = true
+
+-- Make dotfile navigation bareble
+vim.api.nvim_create_user_command('Dot', 'edit ~/.config/nvim', {})

.config/nvim/lua/BluePlum/utility.lua

@@ -1,69 +0,0 @@
-local M = {}
-
-return M
-
--- function Ask(msg)
--- 	vim.cmd.echohl('Question')
--- 	vim.cmd.echo('"' .. msg .. '"')
--- 	vim.cmd.echohl()
--- end
---
--- function Confirm(msg)
--- 	Ask(msg .. ' [Y/n] ')
---
--- 	local answer = vim.fn.getchar()
--- 	return answer ~= 110 and answer ~= 27 and answer ~= 37 -- 'n', <ESC>, <SPACE>
--- end
---
--- function Input(prompt, last)
--- 	local buffer = ''
--- 	while true do
--- 		vim.cmd('redraw | echo')
--- 		vim.api.nvim_echo({
--- 			{ prompt, 'Question' },
--- 			last and { last, 'Visual' } or { buffer, 'Normal' },
--- 		}, false, {})
---
--- 		local character = vim.fn.getchar()
--- 		if pcall(function(char)
--- 			if vim.fn.keytrans(char) ~= '<BS>' then
--- 				error()
--- 			end
--- 		end, character) then
--- 			last = nil
--- 			buffer = vim.fn.slice(buffer, 0, -1)
--- 		elseif character == 27 then
--- 			vim.cmd('redraw | echo')
--- 			return nil
--- 		elseif character == 13 then
--- 			return last or buffer
--- 		elseif
--- 			(character == 32 or pcall(function(char)
--- 				if vim.fn.keytrans(char) ~= '<Right>' then
--- 					error()
--- 				end
--- 			end, character)) and last
--- 		then
--- 			buffer = last
--- 			if character == 32 then
--- 				buffer = buffer .. ' '
--- 			end
--- 			last = nil
--- 		else
--- 			last = nil
--- 			buffer = buffer .. vim.fn.nr2char(character)
--- 		end
--- 	end
--- end
---
--- vim.ui.input = function(opts, after)
--- 	local prompt = (opts.prompt or 'Enter input') .. ' > '
--- 	if prompt == 'Compile command: ' then
--- 		prompt = 'Enter command'
--- 	end
--- 	local last = opts.default or ''
---
--- 	return (after or function(x)
--- 		print('Unhandled data: ' .. x)
--- 	end)(Input(prompt, last))
--- end

.config/nvim/lua/lsp.lua

@@ -129,6 +129,23 @@ cmp.setup({
 	},
 })
 
+cmp.setup.cmdline({ '/', '?' }, {
+	mapping = cmp.mapping.preset.cmdline(),
+	sources = cmp.config.sources({
+		{ name = 'buffer' },
+	}),
+})
+
+cmp.setup.cmdline(':', {
+	mapping = cmp.mapping.preset.cmdline(),
+	sources = cmp.config.sources({
+		{ name = 'path' },
+	}, {
+		{ name = 'cmdline' },
+	}),
+	matching = { disallow_symbol_nonprefix_matching = false },
+})
+
 -- #region Highlight groups
 
 -- Customization for Pmenu

.config/nvim/lua/plugins/additions.lua

@@ -11,9 +11,32 @@ return {
 	},
 	{
 		'aznhe21/actions-preview.nvim',
-		config = function()
-			require('actions-preview').setup({})
-			vim.keymap.set('n', '<leader>ca', require('actions-preview').code_actions)
-		end,
+		keys = { {
+			'<leader>ca',
+			function()
+				require('actions-preview').code_actions()
+			end,
+		} },
+		opts = {},
+		-- config = function()
+		-- 	require('actions-preview').setup({})
+		-- 	vim.keymap.set('n', '<leader>ca', require('actions-preview').code_actions)
+		-- end,
+	},
+	{
+		'vyfor/cord.nvim',
+		event = 'VeryLazy',
+		branch = 'client-server',
+		build = ':Cord update',
+		opts = {},
+	},
+	{
+		'tpope/vim-fugitive',
+		cmd = { 'Git' },
+	},
+	{
+		'mhinz/vim-grepper',
+		cmd = { 'GrepperRg' },
+		opts = {},
 	},
 }

.config/nvim/lua/plugins/deco.lua

@@ -22,6 +22,8 @@ return {
 		'sphamba/smear-cursor.nvim',
 		opts = {
 			time_interval = 10,
+			legacy_computing_symbols_support = true,
+			cursor_color = '#fcdc34',
 		},
 	},
 }

.config/nvim/lua/plugins/emacs.lua

@@ -1,6 +1,7 @@
 return {
 	{
 		'ej-shafran/compile-mode.nvim',
+		enabled = false,
 		dependencies = {
 			'nvim-lua/plenary.nvim',
 			'm00qek/baleia.nvim',

.config/nvim/lua/plugins/fold.lua

@@ -1,63 +1,64 @@
 return {
 	{
-        'kevinhwang91/nvim-ufo',
-        dependencies = {
-            {
-                'kevinhwang91/promise-async',
-            },
-        },
-        config = function()
-            -- Implement custom marker provider.
-            local CustomMarkerProvider = {}
+		'kevinhwang91/nvim-ufo',
+		dependencies = {
+			{
+				'kevinhwang91/promise-async',
+			},
+		},
+		enabled = false,
+		config = function()
+			-- Implement custom marker provider.
+			local CustomMarkerProvider = {}
 
-            function CustomMarkerProvider.getFolds(bufnr)
-                local buf = require('ufo.bufmanager'):get(bufnr)
-                if not buf then
-                    return
-                end
+			function CustomMarkerProvider.getFolds(bufnr)
+				local buf = require('ufo.bufmanager'):get(bufnr)
+				if not buf then
+					return
+				end
 
-                local openRegex = '#region'
-                local closeRegex = '#endregion'
+				local openRegex = '#region'
+				local closeRegex = '#endregion'
 
-                local summaryRegx = openRegex .. '%s*(.*)'
+				local summaryRegx = openRegex .. '%s*(.*)'
 
-                local ranges = {}
-                local stack = {}
-                local lines = buf:lines(1, -1)
+				local ranges = {}
+				local stack = {}
+				local lines = buf:lines(1, -1)
 
-                for lnum, line in ipairs(lines) do
-                    -- Check for start marker
-                    if line:match(openRegex) then
-                        table.insert(stack, lnum)
-                        -- Check for end marker
-                    elseif line:match(closeRegex) then
-                        local startLnum = table.remove(stack)
-                        if startLnum then
-                            local summary = lines[startLnum]:match(summaryRegx)
-                            table.insert(ranges, require('ufo.model.foldingrange').new(startLnum - 1, lnum - 1, summary))
-                        end
-                    end
-                end
+				for lnum, line in ipairs(lines) do
+					-- Check for start marker
+					if line:match(openRegex) then
+						table.insert(stack, lnum)
+						-- Check for end marker
+					elseif line:match(closeRegex) then
+						local startLnum = table.remove(stack)
+						if startLnum then
+							local summary = lines[startLnum]:match(summaryRegx)
+							table.insert(ranges, require('ufo.model.foldingrange').new(startLnum - 1, lnum - 1, summary))
+						end
+					end
+				end
 
-                return ranges
-            end
+				return ranges
+			end
 
-            local function customizeSelector(bufnr)
-                local ranges = CustomMarkerProvider.getFolds(bufnr)
-                local maybe_additional_ranges = require('ufo').getFolds(bufnr, 'treesitter')
-                if next(maybe_additional_ranges) ~= nil then
-                    ranges = vim.list_extend(ranges, maybe_additional_ranges)
-                else
-                    ranges = vim.list_extend(ranges, require('ufo').getFolds(bufnr, 'indent'))
-                end
-                return ranges
-            end
+			local function customizeSelector(bufnr)
+				local ranges = CustomMarkerProvider.getFolds(bufnr)
+				local maybe_additional_ranges = require('ufo').getFolds(bufnr, 'treesitter')
+				if next(maybe_additional_ranges) ~= nil then
+					ranges = vim.list_extend(ranges, maybe_additional_ranges)
+				else
+					ranges = vim.list_extend(ranges, require('ufo').getFolds(bufnr, 'indent'))
+				end
+				return ranges
+			end
 
-            require('ufo').setup({
-                provider_selector = function(bufnr, filetype, buftype)
-                    return customizeSelector
-                end,
-            })
-        end,
-    },
+			require('ufo').setup({
+				provider_selector = function(bufnr, filetype, buftype)
+					return customizeSelector
+				end,
+			})
+		end,
+	},
 }

.config/nvim/lua/plugins/format.lua

@@ -2,6 +2,7 @@ return {
 	{
 		'tjex/formatter.nvim',
 		branch = 'fix-305-index-out-of-bounds',
+		event = 'BufWritePost',
 		config = function()
 			local util = require('formatter.util')
 
@@ -47,6 +48,15 @@ return {
 					scss = {
 						prettier,
 					},
+					rust = {
+						function()
+							return {
+								exe = 'rustfmt',
+								args = {},
+								stdin = false,
+							}
+						end,
+					},
 
 					lua = {
 						function()
@@ -84,7 +94,7 @@ return {
 			})
 			autocmd('BufWritePost', {
 				group = '__formatter__',
-				command = ':FormatWrite',
+				command = ':FormatWriteLock',
 			})
 		end,
 	},

.config/nvim/lua/plugins/lsp.lua

@@ -1,20 +1,36 @@
 return {
 	-- Mason
-	{ 'williamboman/mason.nvim', opts = {}, cmd = 'Mason' },
-	{ 'williamboman/mason-lspconfig.nvim', opts = {} },
+	{ 'williamboman/mason.nvim', opts = {}, cmd = 'Mason', event = 'VeryLazy' },
+	{ 'williamboman/mason-lspconfig.nvim', opts = {}, event = 'VeryLazy' },
 
 	-- Lsp configuration
 	{ 'VonHeikemen/lsp-zero.nvim' },
 	{ 'neovim/nvim-lspconfig' },
 
 	-- Completion
-	{ 'hrsh7th/nvim-cmp', dependencies = { 'hrsh7th/cmp-calc', 'L3MON4D3/LuaSnip', 'hrsh7th/cmp-nvim-lsp', 'onsails/lspkind.nvim' } },
+	{
+		'hrsh7th/nvim-cmp',
+		event = 'VeryLazy',
+		dependencies = {
+			'hrsh7th/cmp-calc',
+			'hrsh7th/cmp-cmdline',
+			'hrsh7th/cmp-path',
+			'hrsh7th/cmp-buffer',
+			'L3MON4D3/LuaSnip',
+			'hrsh7th/cmp-nvim-lsp',
+			'onsails/lspkind.nvim',
+		},
+	},
 
 	-- Additions
-	{ 'ray-x/lsp_signature.nvim', event = 'VeryLazy', opts = {
-		hint_prefix = '',
-	} },
+	{
+		'ray-x/lsp_signature.nvim',
+		event = 'VeryLazy',
+		opts = {
+			hint_prefix = '',
+		},
+	},
 
 	-- Rust
-	{ 'mrcjkb/rustaceanvim' },
+	-- { 'mrcjkb/rustaceanvim' },
 }

.config/nvim/lua/plugins/nav.lua

@@ -4,12 +4,16 @@ return {
 		'nvim-telescope/telescope.nvim',
 		dependencies = { 'nvim-lua/plenary.nvim' },
 		keys = {
-			{ '<leader>ff', function() require('telescope.builtin').find_files({ show_hidden = true }) end },
+			{
+				'<leader>ff',
+				function()
+					require('telescope.builtin').find_files({ show_hidden = true })
+				end,
+			},
 			{ '<leader>fs', require('telescope.builtin').live_grep },
 			{ '<leader>bb', require('telescope.builtin').buffers },
 		},
 	},
-	{ 'nvim-lua/plenary.nvim' },
 
 	-- Oil
 	{

.config/nvim/lua/plugins/treesitter.lua

@@ -2,6 +2,8 @@ return {
 	-- Highlighting
 	{
 		'nvim-treesitter/nvim-treesitter',
+		-- enabled = false,
+		event = 'VeryLazy',
 		config = function()
 			vim.cmd('TSUpdate')
 			require('nvim-treesitter.configs').setup({