summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/lua/options.lua2
-rw-r--r--.config/nvim/lua/plugins/edgy.lua20
-rw-r--r--.config/nvim/lua/plugins/helpview.lua1
-rw-r--r--.config/nvim/lua/plugins/mini.lua16
-rw-r--r--.config/nvim/lua/plugins/neogit.lua7
-rw-r--r--.config/nvim/lua/plugins/nvim-treesitter.lua4
-rw-r--r--.config/nvim/lua/plugins/sqls.lua3
-rw-r--r--.config/nvim/lua/plugins/suda.lua4
8 files changed, 2 insertions, 55 deletions
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index d2bde10..b7da110 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -38,7 +38,7 @@ vim.opt.termguicolors = true
vim.opt.laststatus = 3 -- views can only be fully collapsed with the global statusline
vim.opt.splitkeep = 'screen' -- for edgy.nvim
vim.opt.inccommand = 'split' -- shows preview for commands like :%s/from/to
-vim.opt.sessionoptions = 'buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions'
+vim.opt.sessionoptions = 'blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions'
-- Disable warnings for missing language providers
vim.g.loaded_node_provider = 0
diff --git a/.config/nvim/lua/plugins/edgy.lua b/.config/nvim/lua/plugins/edgy.lua
deleted file mode 100644
index f84d0ba..0000000
--- a/.config/nvim/lua/plugins/edgy.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return {
- 'folke/edgy.nvim',
- event = 'VeryLazy',
- opts = function(_, opts)
- for _, pos in ipairs({ 'top', 'bottom', 'left', 'right' }) do
- opts[pos] = opts[pos] or {}
- table.insert(opts[pos], {
- ft = 'snacks_terminal',
- size = { height = 0.4 },
- title = '%{b:snacks_terminal.id}: %{b:term_title}',
- filter = function(_buf, win)
- return vim.w[win].snacks_win
- and vim.w[win].snacks_win.position == pos
- and vim.w[win].snacks_win.relative == 'editor'
- and not vim.w[win].trouble_preview
- end,
- })
- end
- end,
-}
diff --git a/.config/nvim/lua/plugins/helpview.lua b/.config/nvim/lua/plugins/helpview.lua
index 098548b..64038a2 100644
--- a/.config/nvim/lua/plugins/helpview.lua
+++ b/.config/nvim/lua/plugins/helpview.lua
@@ -1,5 +1,6 @@
return {
'OXY2DEV/helpview.nvim',
+ lazy = false,
ft = 'help',
dependencies = {
'nvim-treesitter/nvim-treesitter',
diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua
deleted file mode 100644
index 61d04b6..0000000
--- a/.config/nvim/lua/plugins/mini.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-return {
- 'echasnovski/mini.nvim',
- version = false,
- keys = {
- {
- 'Q',
- function()
- if vim.bo.modified then
- vim.cmd.write()
- end
- require('mini.bufremove').delete(0)
- end,
- desc = '[Q]uit Buffer',
- },
- },
-}
diff --git a/.config/nvim/lua/plugins/neogit.lua b/.config/nvim/lua/plugins/neogit.lua
index fafbc66..e2d4b2a 100644
--- a/.config/nvim/lua/plugins/neogit.lua
+++ b/.config/nvim/lua/plugins/neogit.lua
@@ -2,14 +2,7 @@ return {
'NeogitOrg/neogit',
cmd = 'Neogit',
keys = {
- { '<leader>gb', '<cmd>Neogit branch<cr>' },
{ '<leader>gs', '<cmd>Neogit<cr>' },
- { '<leader>gL', '<cmd>Neogit log<cr>' },
- -- { '<leader>gc', '<cmd>Neogit commit<cr>' },
- { '<leader>gp', '<cmd>Neogit push<cr>' },
- { '<leader>gP', '<cmd>Neogit pull<cr>' },
- { '<leader>gr', '<cmd>Neogit rebase<cr>' },
- { '<leader>gm', '<cmd>Neogit merge<cr>' },
},
opts = function()
return {
diff --git a/.config/nvim/lua/plugins/nvim-treesitter.lua b/.config/nvim/lua/plugins/nvim-treesitter.lua
index 0038d4e..7313054 100644
--- a/.config/nvim/lua/plugins/nvim-treesitter.lua
+++ b/.config/nvim/lua/plugins/nvim-treesitter.lua
@@ -81,8 +81,4 @@ return {
vim.keymap.set({ 'n', 'x', 'o' }, 'T', ts_repeat_move.builtin_T_expr, { expr = true })
end,
},
- -- NOTE: Might conflict with treeobj but it adds IQ and AQ for any quotes which is cool
- -- The rest can probably be disabled, but I will try it out and only disable if it annoys me
- -- Also it does (/{ etc ignore whitespace but )/} don't, which is interesting ig
- -- { 'echasnovski/mini.ai', version = false, opts = {}, lazy = false },
}
diff --git a/.config/nvim/lua/plugins/sqls.lua b/.config/nvim/lua/plugins/sqls.lua
deleted file mode 100644
index a060415..0000000
--- a/.config/nvim/lua/plugins/sqls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
- 'nanotee/sqls.nvim',
-}
diff --git a/.config/nvim/lua/plugins/suda.lua b/.config/nvim/lua/plugins/suda.lua
deleted file mode 100644
index 39866cd..0000000
--- a/.config/nvim/lua/plugins/suda.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
- 'lambdalisue/vim-suda',
- event = { 'BufReadPre', 'BufNewFile' },
-}