stuffmain

8 files changed, 127 insertions, 35 deletions

diff --git a/config/nvim/lua/core/keymaps.lua b/config/nvim/lua/core/keymaps.lua
index 3d6cc2a..40db6c2 100644
--- a/config/nvim/lua/core/keymaps.lua
+++ b/config/nvim/lua/core/keymaps.lua
@@ -30,9 +30,12 @@ keymap.set("n", "E", ":e ")
 
 -- Get rid of this shit
 vim.api.nvim_set_keymap('n', 'q:', '<Nop>', { noremap = true, silent = true })
+vim.api.nvim_command('cabbrev E e')
+vim.api.nvim_command('cabbrev Q q')
+vim.api.nvim_command('cabbrev W w')
 
 -- Clear search highlight
-vim.api.nvim_set_keymap('n', '<Leader>cs', ':nohlsearch<CR><C-l>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<Leader>C', ':nohlsearch<CR><C-l>', { noremap = true, silent = true })
 
 
 --[[-- Tabs --]]
diff --git a/config/nvim/lua/plugins/colors.lua b/config/nvim/lua/plugins/colors.lua
index b27f10e..962b5d6 100644
--- a/config/nvim/lua/plugins/colors.lua
+++ b/config/nvim/lua/plugins/colors.lua
@@ -1,6 +1,38 @@
 return {
-	--[[-- PaperColor --]]
+	--[[-- gruber-darker --]]
+	--[[ {
+		lazy = false,
+		priority = 1000,
+		"blazkowolf/gruber-darker.nvim",
+		opts = {
+			bold = false,
+			italic = {
+				strings = false,
+			},
+		},
+		config = function()
+			vim.opt.background = "dark"
+			vim.cmd.colorscheme "gruber-darker"
+			vim.api.nvim_set_hl(0, "Normal", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "NormalNC", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "NormalFloat", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "SignColumn", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "LineNr", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "Folded", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "NonText", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "SpecialKey", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "VertSplit", { bg = "NONE", ctermbg = "NONE" })
+			vim.api.nvim_set_hl(0, "Comment", { fg = "#ADD8E6", italic = true })
+			vim.api.nvim_set_hl(0, "TabChar", { fg = "#1A1A1A", ctermfg = "darkgray"})
+	 		vim.api.nvim_set_hl(0, "String", { fg = "#b58c4a" })
+	 		vim.api.nvim_set_hl(0, "cType", { fg = "NONE" })
+
+		end,
+	}, ]]
+
 
+
+	--[[-- PaperColor --]]
 	{
 		"NLKNguyen/papercolor-theme",
 		lazy = false,
@@ -31,6 +63,7 @@ return {
 		end,
 	},
 
+
 	--[[-- Ice Cave --]]
 
 	--[[ {
diff --git a/config/nvim/lua/plugins/harpoon.lua b/config/nvim/lua/plugins/harpoon.lua
new file mode 100644
index 0000000..f13d18e
--- /dev/null
+++ b/config/nvim/lua/plugins/harpoon.lua
@@ -0,0 +1,19 @@
+return {
+	{
+		"ThePrimeagen/harpoon",
+		lazy = false,
+		dependencies = { 'nvim-lua/plenary.nvim' },
+
+		config = function()
+			local mark = require("harpoon.mark")
+			local ui = require("harpoon.ui")
+
+			vim.keymap.set("n", "<leader>a", mark.add_file)
+			vim.keymap.set("n", "<leader>l", ui.toggle_quick_menu)
+			vim.keymap.set("n", "<C-j>", function() ui.nav_file(1) end)
+			vim.keymap.set("n", "<C-k>", function() ui.nav_file(2) end)
+			vim.keymap.set("n", "<C-l>", function() ui.nav_file(3) end)
+			vim.keymap.set("n", "<C-;>", function() ui.nav_file(4) end)
+		end
+	},
+}
diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
index ffd4623..1903806 100644
--- a/config/nvim/lua/plugins/init.lua
+++ b/config/nvim/lua/plugins/init.lua
@@ -8,4 +8,7 @@ return {
 	require("plugins.gitsigns"),
 	require("plugins.comment"),
 	require("plugins.markdown-preview"),
+	--require("plugins.toggleterm"),
+	--require("plugins.nvim-terminal"),
+	require("plugins.harpoon"),
 }
diff --git a/config/nvim/lua/plugins/nvim-terminal.lua b/config/nvim/lua/plugins/nvim-terminal.lua
new file mode 100644
index 0000000..50e6918
--- /dev/null
+++ b/config/nvim/lua/plugins/nvim-terminal.lua
@@ -0,0 +1,11 @@
+return {
+  {
+    's1n7ax/nvim-terminal',
+    lazy = false,
+    config = function()
+		vim.o.hidden = true
+		require("toggleterm").setup{}
+		--vim.keymap.set("n", "<leader>t", "<cmd>ToggleTerm<CR>", { desc = "Toggle terminal" })
+    end,
+  }
+}
diff --git a/config/nvim/lua/plugins/telescope-undo.lua b/config/nvim/lua/plugins/telescope-undo.lua
new file mode 100644
index 0000000..8156bcd
--- /dev/null
+++ b/config/nvim/lua/plugins/telescope-undo.lua
@@ -0,0 +1,29 @@
+return {
+		{
+		"debugloop/telescope-undo.nvim",
+		dependencies = {
+			{
+				"nvim-telescope/telescope.nvim",
+				dependencies = { "nvim-lua/plenary.nvim" },
+			},
+		},
+		keys = {
+			{ -- lazy style key map
+				"<leader>u",
+				"<cmd>Telescope undo<cr>",
+				desc = "undo history",
+			},
+		},
+		opts = {
+			extensions = {
+				undo = {
+				},
+			},
+		},
+		config = function(_, opts)
+			require("telescope").setup(opts)
+			require("telescope").load_extension("undo")
+		end,
+	},
+
+}
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
index 2151a33..b55b46c 100644
--- a/config/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -17,37 +17,4 @@ return {
 			end, { silent = true})
 		end
 	},
-
-	{
-		"debugloop/telescope-undo.nvim",
-		dependencies = { -- note how they're inverted to above example
-			{
-				"nvim-telescope/telescope.nvim",
-				dependencies = { "nvim-lua/plenary.nvim" },
-			},
-		},
-		keys = {
-			{ -- lazy style key map
-				"<leader>u",
-				"<cmd>Telescope undo<cr>",
-				desc = "undo history",
-			},
-		},
-		opts = {
-			-- don't use `defaults = { }` here, do this in the main telescope spec
-			extensions = {
-				undo = {
-					-- telescope-undo.nvim config, see below
-				},
-				-- no other extensions here, they can have their own spec too
-			},
-		},
-		config = function(_, opts)
-			-- Calling telescope's setup from multiple specs does not hurt, it will happily merge the
-			-- configs for us. We won't use data, as everything is in it's own namespace (telescope
-			-- defaults, as well as each extension).
-			require("telescope").setup(opts)
-			require("telescope").load_extension("undo")
-		end,
-	},
 }
diff --git a/config/nvim/lua/plugins/toggleterm.lua b/config/nvim/lua/plugins/toggleterm.lua
new file mode 100644
index 0000000..3b4b2bf
--- /dev/null
+++ b/config/nvim/lua/plugins/toggleterm.lua
@@ -0,0 +1,27 @@
+-- return {
+--   {
+--     'akinsho/toggleterm.nvim',
+--     version = "*",
+--     lazy = false,
+--     config = function()
+--       require("toggleterm").setup{}
+--
+--       vim.keymap.set("n", "<leader>t", function()
+--         require("toggleterm").toggle()
+--       end, { desc = "Toggle terminal" })
+--     end,
+--   }
+-- }
+
+return {
+  {
+    'akinsho/toggleterm.nvim',
+    version = "*",
+    lazy = false,
+    config = function()
+      require("toggleterm").setup{}
+
+      vim.keymap.set("n", "<leader>t", "<cmd>ToggleTerm<CR>", { desc = "Toggle terminal" })
+    end,
+  }
+}