up

3 files changed, 34 insertions, 81 deletions

diff --git a/.config/nvim/after/plugin/floaterm.lua b/.config/nvim/after/plugin/floaterm.lua
index f8fb002..f6defbe 100644
--- a/.config/nvim/after/plugin/floaterm.lua
+++ b/.config/nvim/after/plugin/floaterm.lua
@@ -1,9 +1,9 @@
-vim.g.floaterm_autoinsert = 1
-vim.g.floaterm_width = 0.8
-vim.g.floaterm_height = 0.37
-vim.g.floaterm_wintitle = 0
-vim.g.floaterm_autoclose = 1
-vim.g.floaterm_position = 'bottom'
-vim.g.floaterm_gitcommit = 'split'
-vim.g.floaterm_wintype = 'split'
-vim.g.floaterm_rootmarkers = { '.project', '.git', '.hg', '.svn', '.root', '.gitignore', '.fslckout', '.fossil-settings' }
+-- vim.g.floaterm_autoinsert = 1
+-- vim.g.floaterm_width = 0.8
+-- vim.g.floaterm_height = 0.37
+-- vim.g.floaterm_wintitle = 0
+-- vim.g.floaterm_autoclose = 1
+-- vim.g.floaterm_position = 'bottom'
+-- vim.g.floaterm_gitcommit = 'split'
+-- vim.g.floaterm_wintype = 'split'
+-- vim.g.floaterm_rootmarkers = { '.project', '.git', '.hg', '.svn', '.root', '.gitignore', '.fslckout', '.fossil-settings' }
diff --git a/.config/nvim/after/plugin/toggleterm.lua b/.config/nvim/after/plugin/toggleterm.lua
index 3b6f3fe..961db87 100644
--- a/.config/nvim/after/plugin/toggleterm.lua
+++ b/.config/nvim/after/plugin/toggleterm.lua
@@ -1,65 +1,22 @@
--- local tog = require("toggleterm").setup{
---   -- size can be a number or function which is passed the current terminal
---   size = 20 | function(term)
---     if term.direction == "horizontal" then
---       return 15
---     elseif term.direction == "vertical" then
---       return vim.o.columns * 0.4
---     end
---   end,
---   open_mapping = [[<c-\>]],
---   on_create = fun(t: Terminal), -- function to run when the terminal is first created
---   on_open = fun(t: Terminal), -- function to run when the terminal opens
---   on_close = fun(t: Terminal), -- function to run when the terminal closes
---   on_stdout = fun(t: Terminal, job: number, data: string[], name: string) -- callback for processing output on stdout
---   on_stderr = fun(t: Terminal, job: number, data: string[], name: string) -- callback for processing output on stderr
---   on_exit = fun(t: Terminal, job: number, exit_code: number, name: string) -- function to run when terminal process exits
---   hide_numbers = true, -- hide the number column in toggleterm buffers
---   shade_filetypes = {},
---   autochdir = false, -- when neovim changes it current directory the terminal will change it's own when next it's opened
---   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 = {
---       guibg = "none",
---     },
---     NormalFloat = {
---       link = 'Normal'
---     },
---     FloatBorder = {
---       guifg = "none",
---       guibg = "none",
---     },
---   },
---   shade_terminals = true, -- NOTE: this option takes priority over highlights specified so if you specify Normal highlights you should set this to false
---   shading_factor = '<number>', -- the percentage by which to lighten terminal background, default: -30 (gets multiplied by -3 if background is light)
---   start_in_insert = true,
---   insert_mappings = true, -- whether or not the open mapping applies in insert mode
---   terminal_mappings = true, -- whether or not the open mapping applies in the opened terminals
---   persist_size = true,
---   persist_mode = true, -- if set to true (default) the previous terminal mode will be remembered
---   direction = 'vertical' | 'horizontal' | 'tab' | 'float',
---   close_on_exit = true, -- close the terminal window when the process exits
---    -- Change the default shell. Can be a string or a function returning a string
---   shell = vim.o.shell,
---   auto_scroll = true, -- automatically scroll to the bottom on terminal output
---   -- This field is only relevant if direction is set to 'float'
---   float_opts = {
---     -- The border key is *almost* the same as 'nvim_open_win'
---     -- see :h nvim_open_win for details on borders however
---     -- the 'curved' border is a custom border type
---     -- not natively supported but implemented in this plugin.
---     border = 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
---     -- like `size`, width and height can be a number or function which is passed the current terminal
---     width = <value>,
---     height = <value>,
---     winblend = 3,
---     zindex = <value>,
---   },
---   winbar = {
---     enabled = false,
---     name_formatter = function(term) --  term: Terminal
---       return term.name
---     end
---   },
--- }
+require("toggleterm").setup({
+	size = 22,
+	open_mapping = [[<f1>]],
+	hide_numbers = true,
+	shade_filetypes = {},
+	shade_terminals = true,
+	shading_factor = 2,
+	start_in_insert = true,
+	insert_mappings = true,
+	persist_size = true,
+	direction = "float",
+	close_on_exit = true,
+	shell = vim.o.shell,
+	float_opts = {
+		border = "curved",
+		winblend = 0,
+		highlights = {
+			border = "Normal",
+			background = "Normal",
+		},
+	},
+})
diff --git a/.config/nvim/lua/pack.lua b/.config/nvim/lua/pack.lua
index 14f03b0..a69f95c 100644
--- a/.config/nvim/lua/pack.lua
+++ b/.config/nvim/lua/pack.lua
@@ -14,11 +14,7 @@ return require('packer').startup({function(use)
 	}
 	use 'jiangmiao/auto-pairs'
 	use 'folke/which-key.nvim'
-	use {'lewis6991/gitsigns.nvim',
-		config = function()
-			require("gitsigns").setup()
-		end
-	}
+	use 'lewis6991/gitsigns.nvim'
 	use 'mhinz/vim-startify'
 	use 'mg979/vim-visual-multi'
 	use 'preservim/tagbar'
@@ -55,8 +51,8 @@ return require('packer').startup({function(use)
 	})
 	-- use 'tpope/vim-surround'
 	use 'nvim-lualine/lualine.nvim'
-	use 'voldikss/vim-floaterm'
-	-- use 'akinsho/toggleterm.nvim'
+	-- use 'voldikss/vim-floaterm'
+	use 'akinsho/toggleterm.nvim'
 	use 'chrisbra/csv.vim'
 	use {
 		'ThePrimeagen/harpoon',