more improvemments on the config, better separation, better keybinding config

3 files changed, 67 insertions, 79 deletions

diff --git a/plugin/git.vim b/plugin/git.vim
index fc65e3f..f347972 100644
--- a/plugin/git.vim
+++ b/plugin/git.vim
@@ -1,10 +1,3 @@
-" nmap ]h <Plug>(GitGutterNextHunk)
-" nmap [h <Plug>(GitGutterPrevHunk)
-
-" nmap ghs <Plug>(GitGutterStageHunk)
-" nmap ghu <Plug>(GitGutterUndoHunk)
-
-" nmap <Leader>gs :G<CR>
 nmap <Leader>gdh :diffget //2<CR>
 nmap <Leader>gdl :diffget //3<CR>
 
diff --git a/plugin/keymaps.vim b/plugin/keymaps.vim
index 10f9bdb..b6e94b8 100644
--- a/plugin/keymaps.vim
+++ b/plugin/keymaps.vim
@@ -21,11 +21,11 @@ inoremap > ><c-g>u
 vnoremap < <gv
 vnoremap > >gv
 
-nnoremap <leader>h :wincmd h<CR>
-nnoremap <leader>j :wincmd j<CR>
-nnoremap <leader>k :wincmd k<CR>
-nnoremap <leader>l :wincmd l<CR>
-nnoremap <leader>q :wincmd q<CR>
+nnoremap <c-h> :wincmd h<CR>
+nnoremap <c-j> :wincmd j<CR>
+nnoremap <c-k> :wincmd k<CR>
+nnoremap <c-l> :wincmd l<CR>
+nnoremap <c-q> :wincmd q<CR>
 " Make windows to be basically the same size
 nnoremap <leader>= <C-w>=
 
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
index f643f76..9a0a135 100644
--- a/plugin/packer_compiled.lua
+++ b/plugin/packer_compiled.lua
@@ -44,8 +44,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/home/adalessa/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/adalessa/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/adalessa/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/adalessa/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/adalessa/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/home/alpha/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/alpha/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/alpha/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/alpha/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/alpha/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
   package.path = package.path .. ';' .. package_path_str
 end
@@ -71,238 +71,237 @@ time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
   ["DAPInstall.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/DAPInstall.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/DAPInstall.nvim",
     url = "https://github.com/Pocco81/DAPInstall.nvim"
   },
   LuaSnip = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/LuaSnip",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/LuaSnip",
     url = "https://github.com/L3MON4D3/LuaSnip"
   },
   ["cmp-buffer"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/cmp-buffer",
     url = "https://github.com/hrsh7th/cmp-buffer"
   },
   ["cmp-nvim-lsp"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
     url = "https://github.com/hrsh7th/cmp-nvim-lsp"
   },
   ["cmp-nvim-lsp-signature-help"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
     url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help"
   },
   ["cmp-nvim-lua"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
     url = "https://github.com/hrsh7th/cmp-nvim-lua"
   },
   ["cmp-path"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/cmp-path",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/cmp-path",
     url = "https://github.com/hrsh7th/cmp-path"
   },
   cmp_luasnip = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
     url = "https://github.com/saadparwaiz1/cmp_luasnip"
   },
   ["colorbuddy.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/colorbuddy.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/colorbuddy.nvim",
     url = "https://github.com/tjdevries/colorbuddy.nvim"
   },
   delimitMate = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/delimitMate",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/delimitMate",
     url = "https://github.com/Raimondi/delimitMate"
   },
   ["gitsigns.nvim"] = {
-    config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0" },
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
     url = "https://github.com/lewis6991/gitsigns.nvim"
   },
   harpoon = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/harpoon",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/harpoon",
     url = "https://github.com/ThePrimeagen/harpoon"
   },
   ["impatient.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/impatient.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/impatient.nvim",
     url = "https://github.com/lewis6991/impatient.nvim"
   },
   ["lsp_signature.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/lsp_signature.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/lsp_signature.nvim",
     url = "https://github.com/ray-x/lsp_signature.nvim"
   },
   ["lspkind-nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
     url = "https://github.com/onsails/lspkind-nvim"
   },
   ["lualine.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/lualine.nvim",
     url = "https://github.com/nvim-lualine/lualine.nvim"
   },
   ["nvim-autopairs"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
     url = "https://github.com/windwp/nvim-autopairs"
   },
   ["nvim-cmp"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-cmp",
     url = "https://github.com/hrsh7th/nvim-cmp"
   },
   ["nvim-dap"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-dap",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-dap",
     url = "https://github.com/mfussenegger/nvim-dap"
   },
   ["nvim-dap-go"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-dap-go",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-dap-go",
     url = "https://github.com/leoluz/nvim-dap-go"
   },
   ["nvim-dap-ui"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-dap-ui",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-dap-ui",
     url = "https://github.com/rcarriga/nvim-dap-ui"
   },
   ["nvim-lsp-installer"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
     url = "https://github.com/williamboman/nvim-lsp-installer"
   },
   ["nvim-lspconfig"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
     url = "https://github.com/neovim/nvim-lspconfig"
   },
   ["nvim-treesitter"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
     url = "https://github.com/nvim-treesitter/nvim-treesitter"
   },
   ["nvim-treesitter-refactor"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-treesitter-refactor",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-treesitter-refactor",
     url = "https://github.com/nvim-treesitter/nvim-treesitter-refactor"
   },
   ["nvim-treesitter-textobjects"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textobjects",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textobjects",
     url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"
   },
   ["nvim-web-devicons"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
     url = "https://github.com/kyazdani42/nvim-web-devicons"
   },
   ["packer.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/packer.nvim",
     url = "https://github.com/wbthomason/packer.nvim"
   },
   playground = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/playground",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/playground",
     url = "https://github.com/nvim-treesitter/playground"
   },
   ["plenary.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/plenary.nvim",
     url = "https://github.com/nvim-lua/plenary.nvim"
   },
   ["popup.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/popup.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/popup.nvim",
     url = "https://github.com/nvim-lua/popup.nvim"
   },
   ["refactoring.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/refactoring.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/refactoring.nvim",
     url = "https://github.com/ThePrimeagen/refactoring.nvim"
   },
   ["telescope-file-browser.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/telescope-file-browser.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/telescope-file-browser.nvim",
     url = "https://github.com/nvim-telescope/telescope-file-browser.nvim"
   },
   ["telescope-fzy-native.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/telescope-fzy-native.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/telescope-fzy-native.nvim",
     url = "https://github.com/nvim-telescope/telescope-fzy-native.nvim"
   },
   ["telescope-projectionist.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/telescope-projectionist.nvim",
-    url = "/home/adalessa/code/neovim/telescope-projectionist.nvim"
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/telescope-projectionist.nvim",
+    url = "/home/alpha/code/neovim/telescope-projectionist.nvim"
   },
   ["telescope.nvim"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/telescope.nvim",
     url = "https://github.com/nvim-telescope/telescope.nvim"
   },
   vim = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim",
     url = "https://github.com/dracula/vim"
   },
   ["vim-blade"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-blade",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-blade",
     url = "https://github.com/jwalton512/vim-blade"
   },
   ["vim-commentary"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-commentary",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-commentary",
     url = "https://github.com/tpope/vim-commentary"
   },
   ["vim-composer"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-composer",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-composer",
     url = "https://github.com/noahfrederick/vim-composer"
   },
   ["vim-dadbod"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-dadbod",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-dadbod",
     url = "https://github.com/tpope/vim-dadbod"
   },
   ["vim-dadbod-ui"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-dadbod-ui",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-dadbod-ui",
     url = "https://github.com/kristijanhusak/vim-dadbod-ui"
   },
   ["vim-dispatch"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-dispatch",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-dispatch",
     url = "https://github.com/tpope/vim-dispatch"
   },
   ["vim-dotenv"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-dotenv",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-dotenv",
     url = "https://github.com/tpope/vim-dotenv"
   },
   ["vim-eunuch"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-eunuch",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-eunuch",
     url = "https://github.com/tpope/vim-eunuch"
   },
   ["vim-fugitive"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-fugitive",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-fugitive",
     url = "https://github.com/tpope/vim-fugitive"
   },
   ["vim-go"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-go",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-go",
     url = "https://github.com/fatih/vim-go"
   },
   ["vim-http"] = {
@@ -310,52 +309,52 @@ _G.packer_plugins = {
     loaded = false,
     needs_bufread = true,
     only_cond = false,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/opt/vim-http",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/opt/vim-http",
     url = "https://github.com/nicwest/vim-http"
   },
   ["vim-laravel"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-laravel",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-laravel",
     url = "https://github.com/noahfrederick/vim-laravel"
   },
   ["vim-maximizer"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-maximizer",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-maximizer",
     url = "https://github.com/szw/vim-maximizer"
   },
   ["vim-obsession"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-obsession",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-obsession",
     url = "https://github.com/tpope/vim-obsession"
   },
   ["vim-projectionist"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-projectionist",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-projectionist",
     url = "https://github.com/tpope/vim-projectionist"
   },
   ["vim-repeat"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-repeat",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-repeat",
     url = "https://github.com/tpope/vim-repeat"
   },
   ["vim-surround"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-surround",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-surround",
     url = "https://github.com/tpope/vim-surround"
   },
   ["vim-tbone"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-tbone",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-tbone",
     url = "https://github.com/tpope/vim-tbone"
   },
   ["vim-test"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-test",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-test",
     url = "https://github.com/vim-test/vim-test"
   },
   ["vim-vinegar"] = {
     loaded = true,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/vim-vinegar",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-vinegar",
     url = "https://github.com/tpope/vim-vinegar"
   },
   vimwiki = {
@@ -363,21 +362,17 @@ _G.packer_plugins = {
     loaded = false,
     needs_bufread = true,
     only_cond = false,
-    path = "/home/adalessa/.local/share/nvim/site/pack/packer/opt/vimwiki",
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/opt/vimwiki",
     url = "https://github.com/vimwiki/vimwiki"
   }
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: gitsigns.nvim
-time([[Config for gitsigns.nvim]], true)
-try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim")
-time([[Config for gitsigns.nvim]], false)
 
 -- Command lazy-loads
 time([[Defining lazy-load commands]], true)
-pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file VimwikiIndex lua require("packer.load")({'vimwiki'}, { cmd = "VimwikiIndex", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Http lua require("packer.load")({'vim-http'}, { cmd = "Http", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
+pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file VimwikiIndex lua require("packer.load")({'vimwiki'}, { cmd = "VimwikiIndex", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 time([[Defining lazy-load commands]], false)
 
 if should_profile then save_profiles() end