neovim: restarted config

28 files changed, 111 insertions, 382 deletions

diff --git a/pkgs/custom-neovim/config/lua/plugins/actions-preview.lua b/pkgs/custom-neovim/config/lua/plugins/actions-preview.lua
deleted file mode 100644
index 0e3cc02..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/actions-preview.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require("actions-preview").setup {
-  backend = {"snacks"}
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/auto-session.lua b/pkgs/custom-neovim/config/lua/plugins/auto-session.lua
deleted file mode 100644
index 99df59b..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/auto-session.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("auto-session").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/colorschemes.lua b/pkgs/custom-neovim/config/lua/plugins/colorschemes.lua
new file mode 100644
index 0000000..1ca3c7e
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/colorschemes.lua
@@ -0,0 +1,19 @@
+return {
+  {
+    "nightfox.nvim",
+    -- lazy = false,
+    event = "VimEnter",
+    after = function ()
+      require("nightfox").setup {
+        options = {
+          module_default = false,
+          modules = {
+            "mini",
+            "treesitter",
+          },
+        },
+      }
+      vim.cmd.colorscheme("carbonfox")
+    end
+  },
+}
diff --git a/pkgs/custom-neovim/config/lua/plugins/comment.lua b/pkgs/custom-neovim/config/lua/plugins/comment.lua
deleted file mode 100644
index bd47faf..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/comment.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("Comment").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/dropbar.lua b/pkgs/custom-neovim/config/lua/plugins/dropbar.lua
deleted file mode 100644
index 5d4bb43..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/dropbar.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-local dropbar = require('dropbar')
-local sources = require('dropbar.sources')
-local utils = require('dropbar.utils')
-
-Utils.link_highlight("DropBarFileName", "MiniFilesTitleFocused")
-
-local custom_path = {
-  get_symbols = function(buff, win, cursor)
-    local symbols = sources.path.get_symbols(buff, win, cursor)
-    symbols[#symbols].name_hl = 'DropBarFileName'
-    if vim.bo[buff].modified then
-      symbols[#symbols].name = symbols[#symbols].name .. ' [+]'
-      symbols[#symbols].name_hl = 'DropBarFileName'
-      symbols[#symbols].truncate = false
-    end
-    return symbols
-  end,
-}
-
-dropbar.setup({
-  bar = {
-    sources = function(buf, _)
-      if vim.bo[buf].ft == 'markdown' then
-        return {
-          custom_path,
-          sources.markdown,
-        }
-      end
-      -- if vim.bo[buf].buftype == 'terminal' then
-      --   return {
-      --     sources.terminal,
-      --   }
-      -- end
-      return {
-        custom_path,
-        utils.source.fallback {
-          sources.lsp,
-          sources.treesitter,
-        },
-      }
-    end,
-  },
-})
diff --git a/pkgs/custom-neovim/config/lua/plugins/fidget.lua b/pkgs/custom-neovim/config/lua/plugins/fidget.lua
deleted file mode 100644
index 4f1ab35..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/fidget.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("fidget").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/focus.lua b/pkgs/custom-neovim/config/lua/plugins/focus.lua
deleted file mode 100644
index 560f3ce..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/focus.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-require("focus").setup {
-  enable = true,
-  split = {
-    -- bufnew = true,
-  },
-  ui = {
-    winhighlight = true, -- Highlight focused and unfocused windows
-    signcolumn = false, -- Signcolumn on all windows
-    -- cursorline = false,
-  },
-}
-
-vim.api.nvim_create_autocmd("WinEnter", {
-  pattern = "picker",
-  callback = function(args)
-    vim.b[args.buf].cursorline = false
-  end,
-})
diff --git a/pkgs/custom-neovim/config/lua/plugins/gitsigns.lua b/pkgs/custom-neovim/config/lua/plugins/gitsigns.lua
deleted file mode 100644
index d16d238..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/gitsigns.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("gitsigns").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/incline.lua b/pkgs/custom-neovim/config/lua/plugins/incline.lua
deleted file mode 100644
index 92ced03..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/incline.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local icons = require 'mini.icons'
-require('incline').setup {
-  hide = {
-    only_win = true,
-  },
-  window = {
-    padding = 0,
-    margin = { horizontal = 0 },
-  },
-  render = function(props)
-    local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
-    if filename == '' then
-      filename = '[No Name]'
-    end
-    local ft_icon, ft_hl = icons.get("file", filename)
-    local modified = vim.bo[props.buf].modified
-    return {
-      ft_icon and { ' ', ft_icon, ' ', gui = ft_hl } or '',
-      ' ',
-      { filename, gui = 'bold' },
-      ' ',
-      modified and '[+] ' or '',
-    }
-  end,
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-clue.lua b/pkgs/custom-neovim/config/lua/plugins/mini-clue.lua
new file mode 100644
index 0000000..752b001
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/mini-clue.lua
@@ -0,0 +1,57 @@
+return {
+  "mini.clue",
+  event = "VimEnter", -- Load after everything else to capture all keybinds.
+  after = function()
+    local miniclue = require('mini.clue')
+    miniclue.setup({
+      triggers = {
+        -- Leader triggers
+        { mode = 'n', keys = '<Leader>' },
+        { mode = 'x', keys = '<Leader>' },
+
+        -- Built-in completion
+        { mode = 'i', keys = '<C-x>' },
+
+        -- `g` key
+        { mode = 'n', keys = 'g' },
+        { mode = 'x', keys = 'g' },
+
+        -- Marks
+        { mode = 'n', keys = "'" },
+        { mode = 'n', keys = '`' },
+        { mode = 'x', keys = "'" },
+        { mode = 'x', keys = '`' },
+
+        -- Registers
+        { mode = 'n', keys = '"' },
+        { mode = 'x', keys = '"' },
+        { mode = 'i', keys = '<C-r>' },
+        { mode = 'c', keys = '<C-r>' },
+
+        -- Window commands
+        { mode = 'n', keys = '<C-w>' },
+
+        -- `z` key
+        { mode = 'n', keys = 'z' },
+        { mode = 'x', keys = 'z' },
+      },
+
+      clues = {
+        { mode = {'n', 'v'}, keys = '<Leader>' },
+        miniclue.gen_clues.builtin_completion(),
+        miniclue.gen_clues.g(),
+        miniclue.gen_clues.marks(),
+        miniclue.gen_clues.registers(),
+        miniclue.gen_clues.windows(),
+        miniclue.gen_clues.z(),
+      },
+
+      window = {
+        delay = 0,
+
+        scroll_down = "<C-d>",
+        scroll_up = "<C-u>",
+      },
+    })
+  end
+}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-files.lua b/pkgs/custom-neovim/config/lua/plugins/mini-files.lua
new file mode 100644
index 0000000..d979221
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/mini-files.lua
@@ -0,0 +1,6 @@
+return {
+  "mini.files",
+  after = function()
+    require("mini.files").setup()
+  end
+}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua b/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua
new file mode 100644
index 0000000..c08c1de
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua
@@ -0,0 +1,22 @@
+return {
+  "mini.pick",
+  cmd = "Pick",
+  after = function()
+    local win_config = function()
+      local height = math.floor(0.618 * vim.o.lines)
+      local width = math.floor(0.618 * vim.o.columns)
+      return {
+        anchor = 'NW', height = height, width = width,
+        row = math.floor(0.5 * (vim.o.lines - height)),
+        col = math.floor(0.5 * (vim.o.columns - width)),
+      }
+    end
+    require("mini.pick").setup {
+      window = {
+        config = win_config,
+      },
+    }
+    vim.cmd.packadd("mini.extra")
+    require("mini.extra").setup()
+  end
+}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua b/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua
new file mode 100644
index 0000000..f3bf10b
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua
@@ -0,0 +1,7 @@
+return {
+  "mini.statusline",
+  lazy = false,
+  after = function()
+    require("mini.statusline").setup()
+  end
+}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
deleted file mode 100644
index 3dcac1b..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-local miniclue = require('mini.clue')
-miniclue.setup({
-  triggers = {
-    -- Leader triggers
-    { mode = 'n', keys = '<Leader>' },
-    { mode = 'v', keys = '<Leader>' },
-
-    -- Built-in completion
-    { mode = 'i', keys = '<C-x>' },
-
-    -- `g` key
-    { mode = 'n', keys = 'g' },
-    { mode = 'v', keys = 'g' },
-
-    -- Marks
-    { mode = 'n', keys = "'" },
-    { mode = 'v', keys = "'" },
-    { mode = 'n', keys = '`' },
-    { mode = 'v', keys = '`' },
-
-    -- Registers
-    { mode = 'n', keys = '"' },
-    { mode = 'v', keys = '"' },
-    { mode = 'i', keys = '<C-r>' },
-    { mode = 'c', keys = '<C-r>' },
-
-    -- Window commands
-    { mode = 'n', keys = '<C-w>' },
-    -- { mode = 'n', keys = '<leader>w' },
-
-    -- `z` key
-    { mode = 'v', keys = 'z' },
-    { mode = 'n', keys = 'z' },
-  },
-
-  clues = {
-    { mode = {'n', 'v'}, keys = '<Leader>' },
-    miniclue.gen_clues.builtin_completion(),
-    miniclue.gen_clues.g(),
-    miniclue.gen_clues.marks(),
-    miniclue.gen_clues.registers(),
-    miniclue.gen_clues.windows(),
-    Utils.replaceInTable(miniclue.gen_clues.windows(), "<C%-w>", "<leader>w"),
-    miniclue.gen_clues.z(),
-  },
-
-  window = {
-    delay = 0,
-
-    scroll_down = "<C-d>",
-    scroll_up = "<C-u>",
-  },
-})
-
-vim.api.nvim_create_autocmd("TermOpen", {
-  callback = function()
-    vim.cmd.lua("MiniClue.ensure_buf_triggers()")
-  end,
-})
-
-vim.api.nvim_create_autocmd("User", {
-  pattern = "MiniFilesWindowOpen",
-  callback = function()
-    vim.cmd.lua("MiniClue.ensure_buf_triggers()")
-  end,
-})
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/cursorword.lua b/pkgs/custom-neovim/config/lua/plugins/mini/cursorword.lua
deleted file mode 100644
index 530b88b..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/cursorword.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("mini.cursorword").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/files.lua b/pkgs/custom-neovim/config/lua/plugins/mini/files.lua
deleted file mode 100644
index 1dc1c3e..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/files.lua
+++ /dev/null
@@ -1,91 +0,0 @@
-require("mini.files").setup {
-  mappings = {
-    close       = '<esc>',
-    go_in       = 'L',
-    go_in_plus  = "<cr>",
-    go_out      = 'H',
-    go_out_plus = '<c-h>',
-    mark_goto   = "'",
-    mark_set    = 'm',
-    reset       = '<bs>',
-    reveal_cwd  = '@',
-    show_help   = 'g?',
-    synchronize = '=',
-    trim_left   = '<',
-    trim_right  = '>',
-  },
-  windows = {
-    preview = true,
-  },
-}
-
--- Set focused directory as current working directory
-local set_cwd = function()
-  local path = (MiniFiles.get_fs_entry() or {}).path
-  if path == nil then return vim.notify('Cursor is not on valid entry') end
-  vim.fn.chdir(vim.fs.dirname(path))
-end
-
--- Yank in register full path of entry under cursor
-local yank_path = function()
-  local path = (MiniFiles.get_fs_entry() or {}).path
-  if path == nil then return vim.notify('Cursor is not on valid entry') end
-  vim.fn.setreg(vim.v.register, path)
-end
-
--- Open path with system default handler (useful for non-text files)
-local ui_open = function() vim.ui.open(MiniFiles.get_fs_entry().path) end
-
-vim.api.nvim_create_autocmd('User', {
-  pattern = 'MiniFilesBufferCreate',
-  callback = function(args)
-    local b = args.data.buf_id
-    vim.keymap.set('n', 'g~', set_cwd,   { buffer = b, desc = 'Set cwd' })
-    vim.keymap.set('n', 'gX', ui_open,   { buffer = b, desc = 'OS open' })
-    vim.keymap.set('n', 'gy', yank_path, { buffer = b, desc = 'Yank path' })
-  end,
-})
-
--- Add custom bookmarks.
-local set_mark = function(id, path, desc)
-  MiniFiles.set_bookmark(id, path, { desc = desc })
-end
-
-vim.api.nvim_create_autocmd('User', {
-  pattern = 'MiniFilesExplorerOpen',
-  callback = function()
-    set_mark('w', vim.fn.getcwd, 'Working directory') -- callable
-    set_mark('~', '~', 'Home directory')
-  end,
-})
-
--- Add split keys
-local map_split = function(buf_id, lhs, direction)
-  local rhs = function()
-    -- Make new window and set it as target
-    local cur_target = MiniFiles.get_explorer_state().target_window
-    local new_target = vim.api.nvim_win_call(cur_target, function()
-      vim.cmd(direction .. ' split')
-      return vim.api.nvim_get_current_win()
-    end)
-
-    MiniFiles.set_target_window(new_target)
-
-    MiniFiles.go_in()
-  end
-
-  -- Adding `desc` will result into `show_help` entries
-  local desc = 'Split ' .. direction
-  vim.keymap.set('n', lhs, rhs, { buffer = buf_id, desc = desc })
-end
-
-vim.api.nvim_create_autocmd('User', {
-  pattern = 'MiniFilesBufferCreate',
-  callback = function(args)
-    local buf_id = args.data.buf_id
-    -- Tweak keys to your liking
-    map_split(buf_id, '<C-s>', 'belowright horizontal')
-    map_split(buf_id, '<C-v>', 'belowright vertical')
-    map_split(buf_id, '<C-t>', 'tab')
-  end,
-})
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/git.lua b/pkgs/custom-neovim/config/lua/plugins/mini/git.lua
deleted file mode 100644
index 943f91d..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/git.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("mini.git").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/icons.lua b/pkgs/custom-neovim/config/lua/plugins/mini/icons.lua
deleted file mode 100644
index fd2c5f9..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/icons.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require("mini.icons").setup()
-
-MiniIcons.mock_nvim_web_devicons()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/indentscope.lua b/pkgs/custom-neovim/config/lua/plugins/mini/indentscope.lua
deleted file mode 100644
index 2543c40..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/indentscope.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-require("mini.indentscope").setup()
-
--- Don't work in terminal or help windows.
-local f = function(args) vim.b[args.buf].miniindentscope_disable = true end
-vim.api.nvim_create_autocmd('Filetype', { pattern = 'help', callback = f })
-vim.api.nvim_create_autocmd('TermOpen', {callback = f})
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/pairs.lua b/pkgs/custom-neovim/config/lua/plugins/mini/pairs.lua
deleted file mode 100644
index 493c4d0..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/pairs.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("mini.pairs").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/tabline.lua b/pkgs/custom-neovim/config/lua/plugins/mini/tabline.lua
deleted file mode 100644
index 1ec6e7f..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/tabline.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-require("mini.tabline").setup {
-  format = function(buf_id, label)
-    local suffix = vim.bo[buf_id].modified and '[+] ' or ''
-    return MiniTabline.default_format(buf_id, label) .. suffix
-  end
-}
-
-local link_hl = Utils.link_highlight
-
-vim.api.nvim_create_autocmd({"Colorscheme", "VimEnter"}, {
-
-  callback = function()
-    -- Change colors.
-
-    -- Make modified buffers the same color.
-    link_hl("MiniTablineModifiedHidden", "MiniTablineHidden")
-    link_hl("MiniTablineModifiedVisible", "MiniTablineVisible")
-    link_hl("MiniTablineModifiedCurrent", "MiniTablineCurrent")
-  end,
-})
diff --git a/pkgs/custom-neovim/config/lua/plugins/namu.lua b/pkgs/custom-neovim/config/lua/plugins/namu.lua
deleted file mode 100644
index 82275b9..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/namu.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("namu").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/presence.lua b/pkgs/custom-neovim/config/lua/plugins/presence.lua
deleted file mode 100644
index 7ffb57f..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/presence.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require('presence').setup({
-  neovim_image_text = "Neovim Text Editor",
-})
diff --git a/pkgs/custom-neovim/config/lua/plugins/render-markdown.lua b/pkgs/custom-neovim/config/lua/plugins/render-markdown.lua
deleted file mode 100644
index 45bdcf2..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/render-markdown.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("render-markdown").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/snacks.lua b/pkgs/custom-neovim/config/lua/plugins/snacks.lua
deleted file mode 100644
index c2cf737..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/snacks.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-require("snacks").setup {
-  bigfile = { enabled = true },
-  picker = {
-    enabled = true,
-    win = {
-      input = {
-        keys = {
-          ["<Esc>"] = { "close", mode = { "n", "i" } },
-        },
-      },
-    },
-  },
-  lazygit = {
-    enabled = true,
-    config = {
-      quitOnTopLevelReturn = true,
-    },
-    win = {
-      height = 0.8,
-    },
-  },
-  input = {
-    enabled = true,
-  },
-  terminal = {
-    -- interactive = false,
-    start_insert = true,
-    auto_insert = true,
-    win = {
-      height = 0.2,
-    },
-    keys = {},
-  },
-}
-
--- Utils.mapkey("t", "<c-w>", "Manage windows", "<c-\\><c-o><c-w>")
diff --git a/pkgs/custom-neovim/config/lua/plugins/tabby.lua b/pkgs/custom-neovim/config/lua/plugins/tabby.lua
deleted file mode 100644
index c00dad7..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/tabby.lua
+++ /dev/null
@@ -1,53 +0,0 @@
-local general_theme = Utils.generate_theme_from_highlight_groups()
-local colors = {
-  current = { fg = general_theme.modes.normal, bg = general_theme.background, style = 'bold'},
-  not_current = { fg = general_theme.text.light, bg = general_theme.background };
-  fill = { bg = general_theme.background };
-};
-local theme = {
-  fill = colors.fill,
-  head = colors.fill,
-  current_tab = colors.current,
-  tab = colors.not_current,
-  win = colors.fill,
-  tail = colors.fill,
-}
-require('tabby').setup({
-  line = function(line)
-    return {
-      {
-        -- { '  ', hl = theme.head },
-        -- line.sep('', theme.head, theme.fill),
-      },
-      line.tabs().foreach(function(tab)
-        local hl = tab.is_current() and theme.current_tab or theme.tab
-        return {
-          line.sep('', hl, theme.fill),
-          -- tab.is_current() and '' or '󰆣',
-          -- tab.number(),
-          tab.name(),
-          line.sep('', hl, theme.fill),
-          hl = hl,
-          margin = ' ',
-        }
-      end),
-      line.spacer(),
-      line.wins_in_tab(line.api.get_current_tab()).foreach(function(win)
-        return {
-          line.sep('', theme.win, theme.fill),
-          -- win.is_current() and '' or '',
-          win.buf_name(),
-          line.sep('', theme.win, theme.fill),
-          hl = theme.win,
-          margin = ' ',
-        }
-      end),
-      {
-        line.sep('', theme.tail, theme.fill),
-        -- { '  ', hl = theme.tail },
-      },
-      hl = theme.fill,
-    }
-  end,
-  -- option = {}, -- setup modules' option,
-})
diff --git a/pkgs/custom-neovim/config/lua/plugins/treesitter.lua b/pkgs/custom-neovim/config/lua/plugins/treesitter.lua
deleted file mode 100644
index 3ad4c9f..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/treesitter.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-require("nvim-treesitter.configs").setup {
-  highlight = {
-    enable = true,
-  },
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/ts-autotag.lua b/pkgs/custom-neovim/config/lua/plugins/ts-autotag.lua
deleted file mode 100644
index 67b9f06..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/ts-autotag.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("nvim-ts-autotag").setup()