From 25475767ed13a5bcdf9f336a28b93c2b3426ac99 Mon Sep 17 00:00:00 2001
From: Jason Hilder <jhilder95@gmail.com>
Date: Thu, 7 May 2026 09:48:12 +0200
Subject: [PATCH] Minor house cleaning.

---
 bootstraph.sh                     |  2 --
 config/nvim/init.lua              |  7 +------
 config/nvim/lua/autocmds/init.lua |  7 +++++--
 config/nvim/lua/plugins/init.lua  | 11 ++++++++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/bootstraph.sh b/bootstraph.sh
index 113e3ad..29ab9cc 100755
--- a/bootstraph.sh
+++ b/bootstraph.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 # ---------------------------------------------------------------------------------
 # Bootstrap script for fresh Debian 13 (Trixie) install
 # Run this after a minimal install (SSH server + system essentials, no desktop)
@@ -48,7 +47,6 @@ echo 'deb [ signed-by=/usr/share/keyrings/julians-package-repo.gpg ] https://jul
 sudo apt update && sudo apt install -y adw-gtk3
 
 # ---------------------------------------------------------------------------------
-
 echo ""
 echo "✅ Bootstrap complete."
 echo ""
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 9d3ce61..37b0005 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -27,15 +27,14 @@ vim.o.autocomplete = true
 vim.opt.clipboard = "unnamedplus"
 vim.o.completeopt = 'menuone,noselect'
 vim.o.undodir = os.getenv("HOME") .. "/.cache/nvim/undodir"
-vim.lsp.enable({ "gopls", "gdscript" })
 
+map("t", "<ESC><ESC>", "<C-\\><C-n>")
 map({"t", "n"}, "<C-h>", "<C-\\><C-n><C-w><C-h>")
 map({"t", "n"}, "<C-j>", "<C-\\><C-n><C-w><C-j>")
 map({"t", "n"}, "<C-k>", "<C-\\><C-n><C-w><C-k>")
 map({"t", "n"}, "<C-l>", "<C-\\><C-n><C-w><C-l>")
 map({"i", "n"}, "<C- >", "<C-x><C-o>")
 map("n", '<Esc>', '<Cmd>noh<CR><Esc>')
-map("t", "<ESC><ESC>", "<C-\\><C-n>")
 map("v", "J", ":m '>+1<CR>gv=gv")
 map("v", "K", ":m '<-2<CR>gv=gv")
 map("v", "<S-Tab>", "<gv")
@@ -43,10 +42,6 @@ map("v", "<Tab>"  , ">gv")
 map("n", "<leader>p", ":b#<CR>")
 map("n", "<leader>e", ":Ex<CR>")
 map("n", "<leader>x", ":bd<CR>")
-map("n", "L", ":lua vim.diagnostic.open_float()<CR>")
-map("n", "gd", ":lua vim.lsp.buf.definition()<CR>")
-map("n", "<leader>r", ":lua vim.lsp.buf.rename()<CR>")
-map({"v","n"}, "<leader>F", ":lua vim.lsp.buf.format()<CR>")
 
 require("autocmds")
 require("plugins")
diff --git a/config/nvim/lua/autocmds/init.lua b/config/nvim/lua/autocmds/init.lua
index 2284af4..20b3417 100644
--- a/config/nvim/lua/autocmds/init.lua
+++ b/config/nvim/lua/autocmds/init.lua
@@ -1,5 +1,6 @@
 -- Terminals should open with insert mode
 vim.api.nvim_create_autocmd("BufEnter", { pattern = "term://*", callback = function() vim.cmd("startinsert") end })
+
 -- Start treesitter
 vim.api.nvim_create_autocmd('FileType', {
     pattern = '*',
@@ -8,6 +9,7 @@ vim.api.nvim_create_autocmd('FileType', {
         vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
     end,
 })
+
 -- highlights yanked text
 vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function()
@@ -17,6 +19,7 @@ vim.api.nvim_create_autocmd("TextYankPost", {
         })
     end,
 })
+
 -- Set absolute numbers when in insert mode otherwise relativenumbers
 local nums = vim.api.nvim_create_augroup('smart_numbers', {})
 vim.api.nvim_create_autocmd('InsertEnter', {
@@ -31,6 +34,7 @@ vim.api.nvim_create_autocmd('InsertLeave', {
         vim.opt.relativenumber = true
     end,
 })
+
 -- removes trailing whitespace on save
 vim.api.nvim_create_autocmd("BufWritePre", {
     callback = function()
@@ -39,6 +43,7 @@ vim.api.nvim_create_autocmd("BufWritePre", {
         vim.fn.setpos(".", save_cursor)
     end,
 })
+
 -- Lsp autocomplete
 vim.api.nvim_create_autocmd('LspAttach', {
     group = vim.api.nvim_create_augroup('my.lsp', {}),
@@ -93,6 +98,4 @@ local function smart_format()
     end
   end
 end
-
--- :FF (Format Function) works in normal and visual mode
 vim.api.nvim_create_user_command("FF", smart_format, { range = true })
diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
index 32a814a..ca8ffd9 100644
--- a/config/nvim/lua/plugins/init.lua
+++ b/config/nvim/lua/plugins/init.lua
@@ -1,9 +1,9 @@
 vim.pack.add({
     { src = "https://github.com/ibhagwan/fzf-lua" },
-    { src = "https://github.com/catppuccin/nvim", name = "catppuccin" },
-    { src = "https://github.com/tribela/transparent.nvim" },
     { src = "https://github.com/neovim/nvim-lspconfig" },
-    { src = "https://github.com/romus204/tree-sitter-manager.nvim" }
+    { src = "https://github.com/romus204/tree-sitter-manager.nvim" },
+    { src = "https://github.com/catppuccin/nvim", name = "catppuccin" },
+    { src = "https://github.com/tribela/transparent.nvim" }
 })
 vim.cmd(":colorscheme catppuccin-nvim")
 
@@ -19,3 +19,8 @@ map("n", "<leader>ss", ":lua FzfLua.grep_project()<CR>")
 map("n", "<leader>sf", ":lua FzfLua.grep_curbuf()<CR>")
 map("n", "<leader>sw", ":lua FzfLua.grep_cword()<CR>")
 
+-- Lsp specific, uses nvim-lspconfigs with the below
+vim.lsp.enable({ "gopls" })
+map("n", "L", ":lua vim.diagnostic.open_float()<CR>")
+map("n", "gd", ":lua vim.lsp.buf.definition()<CR>")
+map("n", "<leader>r", ":lua vim.lsp.buf.rename()<CR>")