Squashed '.config/nvim/' changes from f685617..52469dc

52469dc Add quick find config for picom.conf
cc4f467 Add fugitive keybindings
d72c76a Add toggleterm plugin to startup
8d9e922 Fixed toggleterm keybinding
fb6c013 Add toggleterm config
d1aeee3 Add toggleterm keybinding
2deaacc Add lazygit keybinding
bb8d70f Add toggleterm.nvim
7bc9135 Add lazygit.nvim
be1dfc8 Added fugitive.vim
40a6080 Changed colorscheme to doom-one

git-subtree-dir: .config/nvim
git-subtree-split: 52469dc5ef35b0c3166b8de29132577fda1bb0f6

6 files changed, 135 insertions, 4 deletions

diff --git a/init.lua b/init.lua
index f74ec11..49397d4 100644
--- a/init.lua
+++ b/init.lua
@@ -83,8 +83,8 @@ local modules = {
   "plugins.zen-mode",
   "plugins.colorscheme",
   "plugins.heirline",
+  "plugins.toggleterm",
   --"plugins.dap",
-  --"plugins.toggleterm",
   --"plugins.floatterm",
 }
 
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index 1f76a40..6b4e6f9 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -1,6 +1,6 @@
 -- Colorscheme
 -- ayu gruvbox molokai onedark srcery everblush vscode edge nightfly doom-one
-local colorscheme = "onedark"
+local colorscheme = "doom-one"
 local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
 if not status_ok then
 	vim.notify("colorscheme " .. colorscheme .. " not found!")
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index abf4e5e..d4a54fa 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -296,6 +296,7 @@ function M.find_configs()
       "~/.config/alacritty",
       "~/.config/bspwm",
       "~/.config/sxhkd",
+      "~/.config/picom",
     },
     -- cwd = "~/.config/nvim/",
     file_ignore_patterns = {
diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua
new file mode 100644
index 0000000..912729a
--- /dev/null
+++ b/lua/plugins/toggleterm.lua
@@ -0,0 +1,90 @@
+local status_ok, toggleterm = pcall(require, "toggleterm")
+if not status_ok then
+	return
+end
+
+toggleterm.setup({
+	size = function(term)
+		if term.direction == "horizontal" then
+			return 12
+		elseif term.direction == "vertical" then
+			return vim.o.columns * 0.3
+		end
+	end,
+	--size = 20,
+	open_mapping = [[<leader>to]],
+	hide_numbers = true,
+	shade_filetypes = {},
+	shade_terminals = false,
+	shading_factor = 1,
+	start_in_insert = true,
+	insert_mappings = true,
+	persist_size = true,
+	direction = "float",
+	--direction = "vertical",
+	--direction = "horizontal",
+	close_on_exit = true,
+	shell = vim.o.shell,
+	highlights = {
+		-- highlights which map to a highlight group name and a table of it's values
+		-- NOTE: this is only a subset of values, any group placed here will be set for the terminal window split
+		Normal = {
+			background = "#000000",
+		},
+	},
+	float_opts = {
+		width = 70,
+		height = 15,
+		winblend = 3,
+		border = "curved",
+		--winblend = 0,
+		highlights = {
+			border = "Normal",
+			background = "Normal",
+		},
+	},
+})
+
+function _G.set_terminal_keymaps()
+	local opts = { noremap = true }
+	--local opts = {buffer = 0}
+	vim.api.nvim_buf_set_keymap(0, "t", "<esc>", [[<C-\><C-n>]], opts)
+	vim.api.nvim_buf_set_keymap(0, "t", "jj", [[<C-\><C-n>]], opts)
+	vim.api.nvim_buf_set_keymap(0, "t", "<C-h>", [[<C-\><C-n><C-W>h]], opts)
+	vim.api.nvim_buf_set_keymap(0, "t", "<C-j>", [[<C-\><C-n><C-W>j]], opts)
+	vim.api.nvim_buf_set_keymap(0, "t", "<C-k>", [[<C-\><C-n><C-W>k]], opts)
+	vim.api.nvim_buf_set_keymap(0, "t", "<C-l>", [[<C-\><C-n><C-W>l]], opts)
+end
+
+vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()")
+
+local Terminal = require("toggleterm.terminal").Terminal
+local lazygit = Terminal:new({ cmd = "lazygit", hidden = true })
+
+function _LAZYGIT_TOGGLE()
+	lazygit:toggle()
+end
+
+local node = Terminal:new({ cmd = "node", hidden = true })
+
+function _NODE_TOGGLE()
+	node:toggle()
+end
+
+local ncdu = Terminal:new({ cmd = "ncdu", hidden = true })
+
+function _NCDU_TOGGLE()
+	ncdu:toggle()
+end
+
+local htop = Terminal:new({ cmd = "htop", hidden = true })
+
+function _HTOP_TOGGLE()
+	htop:toggle()
+end
+
+local python = Terminal:new({ cmd = "python", hidden = true })
+
+function _PYTHON_TOGGLE()
+	python:toggle()
+end
diff --git a/lua/user/keys.lua b/lua/user/keys.lua
index 2c07a5a..1aa5124 100644
--- a/lua/user/keys.lua
+++ b/lua/user/keys.lua
@@ -89,6 +89,43 @@ map("n", "<Leader>tc", ":lua require('user.utils').toggle_completion()<CR>")
 
 --vim.api.nvim_set_keymap('n', '<Leader>qr',  '<cmd>:lua require("plugins.telescope").reload()<CR>', { noremap = true, silent = true })
 
+---- Terminal
+--if is_available "toggleterm.nvim" then
+--  local toggle_term_cmd = astronvim.toggle_term_cmd
+map("n", "<leader>gg", ":LazyGit<CR>")
+map("n", "<leader>tt", "<cmd>ToggleTerm<cr>")
+
+---- Fugitive git bindings
+map("n", "<leader>ga", ":Git add %:p<CR><CR>")
+--map("n", "<leader>gs", ":Gstatus<CR>")
+map("n", "<leader>gc", ":Gcommit -v -q<CR>")
+map("n", "<leader>gt", ":Gcommit -v -q %:p<CR>")
+--map("n", "<leader>gd", ":Gdiff<CR>")
+map("n", "<leader>ge", ":Gedit<CR>")
+--map("n", "<leader>gr", ":Gread<Cj>")
+map("n", "<leader>gw", ":Gwrite<CR><CR>")
+map("n", "<leader>gl", ":silent! Glog<CR>:bot copen<CR>")
+--map("n", "<leader>gp", ":Ggrep<Space>")
+--map("n", "<Leader>gp", ":Git push<CR>")
+--map("n", "<Leader>gb", ":Gblame<CR>")
+map("n", "<leader>gm", ":Gmove<Space>")
+--map("n", "<leader>gb", ":Git branch<Space>")
+--map("n", "<leader>go", ":Git checkout<Space>")
+--map("n", "<leader>gps", ":Dispatch! git push<CR>")
+--map("n", "<leader>gpl", ":Dispatch! git pull<CR>")
+
+--  maps.n["<C-\\>"] = { "<cmd>ToggleTerm<cr>", desc = "Toggle terminal" }
+--  maps.n["<leader>gg"] = { function() toggle_term_cmd "lazygit" end, desc = "ToggleTerm lazygit" }
+--  maps.n["<leader>tn"] = { function() toggle_term_cmd "node" end, desc = "ToggleTerm node" }
+--  maps.n["<leader>tu"] = { function() toggle_term_cmd "ncdu" end, desc = "ToggleTerm NCDU" }
+--  maps.n["<leader>tt"] = { function() toggle_term_cmd "htop" end, desc = "ToggleTerm htop" }
+--  maps.n["<leader>tp"] = { function() toggle_term_cmd "python" end, desc = "ToggleTerm python" }
+--  maps.n["<leader>tl"] = { function() toggle_term_cmd "lazygit" end, desc = "ToggleTerm lazygit" }
+--  maps.n["<leader>tf"] = { "<cmd>ToggleTerm direction=float<cr>", desc = "ToggleTerm float" }
+--  maps.n["<leader>th"] = { "<cmd>ToggleTerm size=10 direction=horizontal<cr>", desc = "ToggleTerm horizontal split" }
+--  maps.n["<leader>tv"] = { "<cmd>ToggleTerm size=80 direction=vertical<cr>", desc = "ToggleTerm vertical split" }
+--end
+--
 --Easier split navigations, just ctrl-j instead of ctrl-w then j
 map("n", "<C-J>", "<C-W><C-J>")
 map("n", "<C-K>", "<C-W><C-K>")
@@ -616,6 +653,8 @@ vim.cmd([[
 ---- Terminal
 --if is_available "toggleterm.nvim" then
 --  local toggle_term_cmd = astronvim.toggle_term_cmd
+--" setup mapping to call :LazyGit
+--map.<leader>gg :LazyGit<CR>
 --  maps.n["<C-\\>"] = { "<cmd>ToggleTerm<cr>", desc = "Toggle terminal" }
 --  maps.n["<leader>gg"] = { function() toggle_term_cmd "lazygit" end, desc = "ToggleTerm lazygit" }
 --  maps.n["<leader>tn"] = { function() toggle_term_cmd "node" end, desc = "ToggleTerm node" }
diff --git a/lua/user/pack.lua b/lua/user/pack.lua
index ba309e6..e2d1cb1 100644
--- a/lua/user/pack.lua
+++ b/lua/user/pack.lua
@@ -335,9 +335,10 @@ return packer.startup(function(use)
 	use("windwp/nvim-autopairs")
 	use("lewis6991/gitsigns.nvim")
 	use("dinhhuy258/git.nvim") -- For git blame & browse
+  use("kdheepak/lazygit.nvim")
 	use("kyazdani42/nvim-tree.lua")
 	use("numToStr/Comment.nvim")
-	--use("akinsho/toggleterm.nvim")
+	use("akinsho/toggleterm.nvim")
 	--use("godlygeek/tabular")
 	--use("Vonr/align.nvim")
 	--use("junegunn/vim-easy-align")
@@ -371,7 +372,7 @@ return packer.startup(function(use)
 	--use("tpope/vim-eunuch")
 	-- Handy unix command inside Vim (Rename, Move etc.)
 	use({ "tpope/vim-eunuch", cmd = { "Rename", "Delete" } })
-	--use("tpope/vim-fugitive")
+	use("tpope/vim-fugitive")
 	--use("tpope/vim-surround")
 	--use("tpope/vim-obsession")
 	--use("tpope/vim-unimpaired")