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