From a0d7062a2f50352e3389d17e712163e650c4f758 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@proton.me>
Date: Sat, 25 Feb 2023 22:57:46 +0200
Subject: [PATCH] Changed keybinds

---
 lua/user/autocommands.lua | 21 +++------------------
 lua/user/whichkey.lua     | 14 ++++++--------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua
index 84341df..1696920 100644
--- a/lua/user/autocommands.lua
+++ b/lua/user/autocommands.lua
@@ -3,9 +3,8 @@
 vim.api.nvim_create_autocmd({ "FileType" }, {
 	pattern = { "qf", "help", "man", "lspinfo", "spectre_panel", "lir" },
 	callback = function()
-		vim.cmd([[
-            nnoremap <silent> <buffer> q :close<cr> 
-            set nobuflisted 
+		vim.cmd([[ nnoremap <silent> <buffer> q :close<cr>
+            set nobuflisted
         ]])
 	end,
 })
@@ -62,7 +61,7 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, {
 })
 
 vim.api.nvim_create_autocmd({ "FileType" }, {
-	pattern = { "vimwiki" },
+	pattern = { "vimwiki", "java" },
 	callback = function()
 		vim.opt_local.ts = 2
 		vim.opt_local.sw = 2
@@ -76,20 +75,6 @@ vim.cmd([[
     highlight CursorColumn ctermbg=White cterm=bold guibg=#222222
 ]])
 
--- Run file
-vim.cmd([[
-    augroup run_file
-        autocmd FileType python imap <buffer> <C-b> <esc><cmd>w<cr><cmd>exec "!python3 %"<cr>
-        autocmd FileType python map <buffer> <C-b> <cmd>w<cr><cmd>exec "!python3 %"<cr>
-        autocmd FileType rust imap <buffer> <C-b> <esc><cmd>w<cr><cmd>exec "!cargo run"<cr>
-        autocmd FileType rust map <buffer> <C-b> <cmd>w<cr><cmd>exec "!cargo run"<cr>
-        autocmd FileType tex imap <buffer> <C-b> <esc><cmd>w<cr><cmd>exec "silent !lualatex %"<cr>
-        autocmd FileType tex map <buffer> <C-b> <esc><cmd>w<cr><cmd>exec "silent !lualatex %"<cr>
-        autocmd FileType cpp imap <buffer> <C-b> <esc><cmd>w<cr><cmd>exec "!g++ % -o %:r && %:r"<cr>
-        autocmd FileType cpp map <buffer> <C-b> <cmd>w<cr><cmd>exec "!g++ % -o %:r && %:r"<cr>
-    augroup end
-]])
-
 -- Autocommand that reloads waybar whenever you save the ~/.config/waybar/config file
 vim.cmd([[
     augroup waybar_user_config
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index 97d2b56..2f43c4b 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -103,8 +103,7 @@ local mappings = {
 	["e"] = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
 	["F"] = { "<cmd>Telescope live_grep theme=ivy<cr>", "Find Text" },
 	["P"] = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" },
-
-	b = {
+	B = {
 		name = "Buffers",
 		j = { "<cmd>BufferLinePick<cr>", "Jump" },
 		f = { "<cmd>Telescope buffers<cr>", "Find" },
@@ -129,7 +128,6 @@ local mappings = {
 			"Sort by language",
 		},
 	},
-
 	p = {
 		name = "Packer",
 		c = { "<cmd>PackerCompile<cr>", "Compile" },
@@ -138,7 +136,6 @@ local mappings = {
 		S = { "<cmd>PackerStatus<cr>", "Status" },
 		u = { "<cmd>PackerUpdate<cr>", "Update" },
 	},
-
 	g = {
 		name = "Git",
 		g = { "<cmd>lua _LAZYGIT_TOGGLE()<cr>", "Lazygit" },
@@ -161,7 +158,6 @@ local mappings = {
 			"Git Diff",
 		},
 	},
-
 	l = {
 		name = "LSP",
 		a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
@@ -192,7 +188,6 @@ local mappings = {
 		},
 		e = { "<cmd>Telescope quickfix<cr>", "Telescope Quickfix" },
 	},
-
 	s = {
 		name = "Search",
 		b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
@@ -211,7 +206,6 @@ local mappings = {
 			"Colorscheme with Preview",
 		},
 	},
-
 	t = {
 		name = "Terminal",
 		n = { "<cmd>lua _NODE_TOGGLE()<cr>", "Node" },
@@ -223,7 +217,6 @@ local mappings = {
 		h = { "<cmd>ToggleTerm size=10 direction=horizontal<cr>", "Horizontal" },
 		v = { "<cmd>ToggleTerm size=80 direction=vertical<cr>", "Vertical" },
 	},
-
 	w = {
 		name = "Vimwiki",
 		w = { "<Plug>VimwikiIndex", "Open index file" },
@@ -255,6 +248,11 @@ local mappings = {
 		i = { "<cmd>lua require('dap').step_into()<cr>", "Step into code" },
 		r = { "<cmd>lua require('dap).repl.open()<cr>", "Inspect state" },
 	},
+	b = {
+		name = "Build/compile/run",
+		b = { "<cmd>w!<cr><cmd>!compiler '%:p'<cr>", "Run/compile file" },
+		o = { "<cmd>!opout '%:p'<cr>", "Open file" },
+	},
 }
 
 which_key.setup(setup)