refactor: small fixes

2026-08-29 13:03:23 +02:00
parent 1bb7c08186
commit 9f74d7a7a1
8 changed files with 206 additions and 143 deletions
@@ -1,23 +1,24 @@
 -- General =====================================================================
-vim.g.mapleader       = ' '  -- Use `<Space>` as <Leader> key
-vim.o.undofile        = true -- Enable persistent undo
+vim.g.mapleader      = ' '  -- Use `<Space>` as <Leader> key
+vim.o.undofile       = true -- Enable persistent undo

 -- UI ==========================================================================
-vim.o.breakindent     = true       -- Indent wrapped lines to match line start
-vim.o.breakindentopt  = 'list:-1'  -- Add padding for lists (if 'wrap' is set)
-vim.o.cursorline      = true       -- Enable current line highlighting
-vim.o.linebreak       = true       -- Wrap lines at 'breakat' (if 'wrap' is set)
-vim.o.list            = true       -- Show helpful text indicators
-vim.o.number          = true       -- Show line numbers
-vim.o.pumheight       = 10         -- Make popup menu smaller
-vim.o.pummaxwidth     = 100        -- Make popup menu not too wide
-vim.o.shortmess       = 'CFOSWaco' -- Disable some built-in completion messages
-vim.o.signcolumn      = 'yes'      -- Always show signcolumn (less flicker)
-vim.o.splitbelow      = true       -- Horizontal splits will be below
-vim.o.splitkeep       = 'screen'   -- Reduce scroll during window split
-vim.o.splitright      = true       -- Vertical splits will be to the right
-vim.o.wrap            = false      -- Don't visually wrap lines (toggle with \w)
-vim.o.cmdheight       = 0          -- Hide the command line when not in use.
+vim.o.breakindent    = true       -- Indent wrapped lines to match line start
+vim.o.breakindentopt = 'list:-1'  -- Add padding for lists (if 'wrap' is set)
+vim.o.cursorline     = true       -- Enable current line highlighting
+vim.o.linebreak      = true       -- Wrap lines at 'breakat' (if 'wrap' is set)
+vim.o.list           = true       -- Show helpful text indicators
+vim.o.number         = true       -- Show line numbers
+vim.o.pumheight      = 10         -- Make popup menu smaller
+vim.o.pummaxwidth    = 100        -- Make popup menu not too wide
+vim.o.shortmess      = 'CFOSWaco' -- Disable some built-in completion messages
+vim.o.signcolumn     = 'yes'      -- Always show signcolumn (less flicker)
+vim.o.splitbelow     = true       -- Horizontal splits will be below
+vim.o.splitkeep      = 'screen'   -- Reduce scroll during window split
+vim.o.splitright     = true       -- Vertical splits will be to the right
+vim.o.wrap           = false      -- Don't visually wrap lines (toggle with \w)
+vim.o.cmdheight      = 0          -- Hide the command line when not in use
+vim.cmd('syntax off')             -- Disable legacy syntax highlighting

 -- Editing =====================================================================
 vim.o.expandtab       = true     -- Convert tabs to spaces
@@ -1,6 +1,5 @@
 -- Clues =======================================================================
 Config.leader_group_clues = {
-  { mode = "n", keys = "<Leader>a", desc = "+AI" },
  { mode = "n", keys = "<Leader>b", desc = "+Buffer" },
  { mode = "n", keys = "<Leader>d", desc = "+Debug" },
  { mode = "n", keys = "<Leader>e", desc = "+Explore" },
@@ -16,46 +15,63 @@ Config.leader_group_clues = {
 }

 -- Helpers =====================================================================
-local nmap = function(lhs, rhs, desc) vim.keymap.set("n", lhs, rhs, { desc = desc }) end
-local nmap_leader = function(suffix, rhs, desc) vim.keymap.set("n", "<Leader>" .. suffix, rhs, { desc = desc }) end
-local xmap_leader = function(suffix, rhs, desc) vim.keymap.set("x", "<Leader>" .. suffix, rhs, { desc = desc }) end
-
-local function lazy_setup(name, action)
+local function lazy_wrap(name, action)
  return function()
-    if Config and type(Config["setup_" .. name]) == "function" then
-      Config["setup_" .. name]()
-    end
+    if Config["setup_" .. name] then Config["setup_" .. name]() end
    action()
  end
 end

-- Buffers =====================================================================
-nmap_leader("bd", function() vim.cmd("bd") end, "Delete")
-nmap_leader("bD", function() vim.cmd("bd!") end, "Delete!")
-nmap_leader("bw", function() vim.cmd("bw") end, "Wipeout")
-nmap_leader("bW", function() vim.cmd("bw!") end, "Wipeout!")
-nmap_leader("bo", function() vim.cmd("%bd|e#") end, "Close all but current")
+local nmap = function(lhs, rhs, desc, plugin)
+  local final_rhs = plugin and lazy_wrap(plugin, rhs) or rhs
+  vim.keymap.set("n", lhs, final_rhs, { desc = desc })
+end

-- Debug =====================================================================
-nmap_leader("db", lazy_setup("dap", function() require("dap").toggle_breakpoint() end), "Toggle Breakpoint")
-nmap_leader("dc", lazy_setup("dap", function() require("dap").continue() end), "Run/Continue")
-nmap_leader("dC", lazy_setup("dap", function() require("dap").run_to_cursor() end), "Run to Cursor")
-nmap_leader("de", lazy_setup("dap", function() require("dap.ui.widgets").hover() end), "Inspect")
-nmap_leader("dt", lazy_setup("dap", function() require("dap").terminate() end), "Terminate")
+local nmap_leader = function(suffix, rhs, desc, plugin)
+  local final_rhs = plugin and lazy_wrap(plugin, rhs) or rhs
+  vim.keymap.set("n", "<Leader>" .. suffix, final_rhs, { desc = desc })
+end
+
+local xmap_leader = function(suffix, rhs, desc, plugin)
+  local final_rhs = plugin and lazy_wrap(plugin, rhs) or rhs
+  vim.keymap.set("x", "<Leader>" .. suffix, final_rhs, { desc = desc })
+end
+
+-- Buffers =====================================================================
+nmap_leader("bd", function() pcall(vim.cmd, "bdelete") end, "Delete")
+nmap_leader("bD", function() pcall(vim.cmd, "bdelete!") end, "Delete!")
+nmap_leader("bw", function() pcall(vim.cmd, "bwipeout") end, "Wipeout")
+nmap_leader("bW", function() pcall(vim.cmd, "bwipeout!") end, "Wipeout!")
+nmap_leader("bo", function()
+  local current = vim.api.nvim_get_current_buf()
+  for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+    if buf ~= current and vim.api.nvim_buf_is_loaded(buf) and vim.bo[buf].buflisted then
+      pcall(vim.api.nvim_buf_delete, buf, { force = false })
+    end
+  end
+end, "Close all but current")
+
+-- Debug =======================================================================
+nmap_leader("db", function() require("dap").toggle_breakpoint() end, "Toggle Breakpoint", "dap")
+nmap_leader("dc", function() require("dap").continue() end, "Run/Continue", "dap")
+nmap_leader("dC", function() require("dap").run_to_cursor() end, "Run to Cursor", "dap")
+nmap_leader("de", function() require("dap.ui.widgets").hover() end, "Inspect", "dap")
+nmap_leader("dt", function() require("dap").terminate() end, "Terminate", "dap")

 -- Explore =====================================================================
 nmap_leader("ed", function() MiniFiles.open() end, "Directory")
-nmap_leader("ef", function() MiniFiles.open(vim.api.nvim_buf_get_name(0)) end, "File directory")
+nmap_leader("ef",
+  function() MiniFiles.open(vim.uv.fs_stat(vim.api.nvim_buf_get_name(0)) and vim.api.nvim_buf_get_name(0) or nil) end,
+  "File directory")
 nmap_leader("en", function() MiniNotify.show_history() end, "Notifications")

-- Find =====================================================================
-nmap_leader("f/", function() MiniPick.builtin.history({ scope = "/" }) end, '"/" history')
-nmap_leader("f:", function() MiniPick.builtin.history({ scope = ":" }) end, '":" history')
+-- Find ========================================================================
+nmap_leader("f:", function() MiniExtra.pickers.history({ scope = ":" }) end, '":" history')
 nmap_leader("fb", function() MiniPick.builtin.buffers() end, "Buffers")
-nmap_leader("fc", function() MiniPick.builtin.git_commits() end, "Commits (all)")
-nmap_leader("fC", function() MiniPick.builtin.git_commits({ path = "%" }) end, "Commits (buf)")
-nmap_leader("fd", function() MiniPick.builtin.diagnostic({ scope = "all" }) end, "Diagnostic workspace")
-nmap_leader("fD", function() MiniPick.builtin.diagnostic({ scope = "current" }) end, "Diagnostic buffer")
+nmap_leader("fc", function() MiniExtra.pickers.git_commits() end, "Commits (all)")
+nmap_leader("fC", function() MiniExtra.pickers.git_commits({ path = "%" }) end, "Commits (buf)")
+nmap_leader("fd", function() MiniExtra.pickers.diagnostic({ scope = "all" }) end, "Diagnostic workspace")
+nmap_leader("fD", function() MiniExtra.pickers.diagnostic({ scope = "current" }) end, "Diagnostic buffer")
 nmap_leader("ff", function() MiniPick.builtin.files() end, "Files")
 nmap_leader("fg", function() MiniPick.builtin.grep_live() end, "Grep live")
 nmap_leader("fG", function() MiniPick.builtin.grep({ pattern = vim.fn.expand("<cword>") }) end, "Grep current word")
@@ -63,29 +79,33 @@ nmap_leader("fh", function() MiniPick.builtin.help() end, "Help tags")
 nmap_leader("fl", function() MiniPick.builtin.buf_lines({ scope = "all" }) end, "Lines (all)")
 nmap_leader("fL", function() MiniPick.builtin.buf_lines({ scope = "current" }) end, "Lines (buf)")
 nmap_leader("fr", function() MiniPick.builtin.resume() end, "Resume")
-nmap_leader("fs", function() MiniPick.builtin.lsp({ scope = "workspace_symbol_live" }) end, "Symbols workspace (live)")
-nmap_leader("fS", function() MiniPick.builtin.lsp({ scope = "document_symbol" }) end, "Symbols document")
+nmap_leader("fs", function() MiniExtra.pickers.lsp({ scope = "workspace_symbol_live" }) end, "Symbols workspace (live)")
+nmap_leader("fS", function() MiniExtra.pickers.lsp({ scope = "document_symbol" }) end, "Symbols document")
+nmap_leader("f:", function() MiniExtra.pickers.history({ scope = ":" }) end, '":" history')
+nmap_leader("f;", function() MiniExtra.pickers.history({ scope = ":" }) end, "Command history")

-- Git =====================================================================
+-- Git =========================================================================
 nmap_leader("go", function() MiniDiff.toggle_overlay() end, "Toggle overlay")
+nmap_leader("gs", function() MiniGit.show_at_cursor() end, "Show at cursor")
+xmap_leader("gs", function() MiniGit.show_at_cursor() end, "Show at selection")

-- HTTP =====================================================================
-nmap_leader("hr", lazy_setup("kulala", function() require("kulala").run() end), "Send HTTP request")
+-- HTTP ========================================================================
+nmap_leader("hr", function() require("kulala").run() end, "Send HTTP request", "kulala")

-- Language =====================================================================
-nmap_leader("la", vim.lsp.buf.code_action, "Actions")
-nmap_leader("ld", vim.diagnostic.open_float, "Diagnostic popup")
-nmap_leader("lf", function() require("conform").format() end, "Format")
-nmap_leader("li", vim.lsp.buf.implementation, "Implementation")
-nmap_leader("lh", vim.lsp.buf.hover, "Hover")
-nmap_leader("ll", vim.lsp.codelens.run, "Lens")
-nmap_leader("lr", vim.lsp.buf.rename, "Rename")
-nmap_leader("lR", vim.lsp.buf.references, "References")
-nmap_leader("ls", vim.lsp.buf.definition, "Source definition")
-nmap_leader("lt", vim.lsp.buf.type_definition, "Type definition")
-xmap_leader("lf", function() require("conform").format() end, "Format selection")
+-- Language ====================================================================
+nmap_leader("la", function() vim.lsp.buf.code_action() end, "Actions")
+nmap_leader("ld", function() vim.diagnostic.open_float() end, "Diagnostic popup")
+nmap_leader("lf", function() require("conform").format({ async = true }) end, "Format")
+nmap_leader("li", function() vim.lsp.buf.implementation() end, "Implementation")
+nmap_leader("lh", function() vim.lsp.buf.hover() end, "Hover")
+nmap_leader("ll", function() vim.lsp.codelens.run() end, "Lens")
+nmap_leader("lr", function() vim.lsp.buf.rename() end, "Rename")
+nmap_leader("lR", function() vim.lsp.buf.references() end, "References")
+nmap_leader("ls", function() vim.lsp.buf.definition() end, "Source definition")
+nmap_leader("lt", function() vim.lsp.buf.type_definition() end, "Type definition")
+xmap_leader("lf", function() require("conform").format({ async = true }) end, "Format selection")

-- Run =====================================================================
+-- Run =========================================================================
 nmap_leader("r", function() require("just").pick_just_task() end, "Run Just Task")

 -- Session =====================================================================
@@ -95,11 +115,11 @@ nmap_leader("sr", function() MiniSessions.select("read") end, "Read")
 nmap_leader("sR", function() MiniSessions.restart() end, "Restart")
 nmap_leader("sw", function() MiniSessions.write() end, "Write current")

-- Terminal =====================================================================
+-- Terminal ====================================================================
 nmap_leader("tT", function() vim.cmd("horizontal term") end, "Terminal (horizontal)")
 nmap_leader("tt", function() vim.cmd("vertical term") end, "Terminal (vertical)")
 nmap_leader("tg", function() require("terminal").open_terminal_app("lazygit") end, "LazyGit")
 nmap_leader("ts", function() require("terminal").open_terminal_app("lazysql") end, "LazySQL")

-- Overwrites =====================================================================
+-- Overwrites ==================================================================
 nmap("<Esc>", function() vim.cmd("nohlsearch") end, "Clear search highlights")
@@ -12,11 +12,15 @@ Config.now(function()

  -- Statusline.
  require('mini.statusline').setup()
+
+  -- Session management.
+  require('mini.sessions').setup()
 end)

 Config.later(function()
  -- Git diff indicators.
  require('mini.diff').setup()
+  require('mini.git').setup()

  -- Keymap hints.
  local miniclue = require('mini.clue')
@@ -67,6 +71,7 @@ Config.now_if_args(function()
  require('mini.files').setup()
  local add_marks = function()
    MiniFiles.set_bookmark('c', vim.fn.stdpath('config'), { desc = 'Config' })
+    MiniFiles.set_bookmark('d', vim.fn.expand('~/Documents'), { desc = 'Documents' })
    MiniFiles.set_bookmark('w', vim.fn.getcwd, { desc = 'Working directory' })
  end
  Config.autocmd('User', 'MiniFilesExplorerOpen', add_marks, 'Add default marks')
@@ -103,12 +108,7 @@ Config.now_if_args(function()
  vim.lsp.config('*', { capabilities = MiniCompletion.get_lsp_capabilities() })
 end)

-- Workspace & Utilities =======================================================
-Config.now(function()
-  -- Session management.
-  require('mini.sessions').setup()
-end)
-
+-- Utilities ===================================================================
 Config.now_if_args(function()
  -- Miscellaneous utility functions.
  require('mini.misc').setup()
@@ -1,14 +1,13 @@
 -- Colortheme ==================================================================
 Config.now(function()
-  vim.pack.add({ "https://github.com/rebelot/kanagawa.nvim" })
-  require("kanagawa").setup({ compile = true })
-  vim.cmd("colo kanagawa")
-end)
-
-- Mason ====================================================================
-Config.now_if_args(function()
-  vim.pack.add({ "https://github.com/mason-org/mason.nvim" })
-  require("mason").setup()
+  vim.pack.add({ "https://github.com/rose-pine/neovim" })
+  require("rose-pine").setup({
+    enable = {
+      legacy_highlights = false,
+      migrations = false,
+    },
+  })
+  vim.cmd("colorscheme rose-pine")
 end)

 -- Treesitter ==================================================================
@@ -18,25 +17,34 @@ Config.now_if_args(function()
    'https://github.com/nvim-treesitter/nvim-treesitter-textobjects',
  })

-  local languages = {
-    'lua',
-    'go',
-    'php',
-    'sql',
-    'javascript',
-    'typescript',
-    'tsx',
-    'dockerfile',
-    'yaml',
-    'markdown',
-  }
-  local isnt_installed = function(lang)
-    return #vim.api.nvim_get_runtime_file('parser/' .. lang .. '.*', false) == 0
-  end
-  local to_install = vim.tbl_filter(isnt_installed, languages)
-  if #to_install > 0 then require('nvim-treesitter').install(to_install) end
+  vim.treesitter.language.register('tsx', { 'typescriptreact' })

-  Config.autocmd('FileType', languages, function(ev) vim.treesitter.start(ev.buf) end, 'Start tree-sitter')
+  local filetypes = {
+    'html', 'css', 'lua', 'go', 'php', 'blade', 'sql', 'javascript',
+    'typescript', 'typescriptreact', 'dockerfile', 'yaml', 'markdown', 'dart',
+    'json', 'xml', 'toml', 'bash', 'gitcommit', 'diff', 'regex', 'zsh'
+  }
+
+  Config.autocmd('FileType', filetypes, function(ev)
+    if pcall(vim.treesitter.start, ev.buf) then
+      if vim.bo[ev.buf].filetype == 'php' then
+        -- fixes broken indentation on `o` in php buffers
+        vim.bo[ev.buf].indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+      end
+    end
+  end, 'Start tree-sitter')
+
+  Config.later(function()
+    require('nvim-treesitter').install(vim.tbl_map(function(ft)
+      return vim.treesitter.language.get_lang(ft) or ft
+    end, filetypes))
+  end)
+end)
+
+-- Mason =======================================================================
+Config.now_if_args(function()
+  vim.pack.add({ "https://github.com/mason-org/mason.nvim" })
+  require("mason").setup()
 end)

 -- LSP =========================================================================
@@ -49,11 +57,12 @@ Config.now_if_args(function()
    "intelephense",
    "lua_ls",
    "tailwindcss",
-    "vtsls",
+    "tsc",
+    "dartls"
  })
 end)

-- Conform =====================================================================
+-- Formatting ==================================================================
 Config.now_if_args(function()
  vim.pack.add({ "https://github.com/stevearc/conform.nvim" })

@@ -61,7 +70,7 @@ Config.now_if_args(function()
    default_format_opts = { lsp_format = "fallback" },
    format_on_save = {
      lsp_format = "fallback",
-      timeout_ms = 500,
+      timeout_ms = 1000,
    },
    formatters_by_ft = {
      go = { "gofumpt", "goimports" },
@@ -72,20 +81,15 @@ end)

 -- DAP =========================================================================
 function Config.setup_dap()
-  if package.loaded["dap"] then
-    return
-  end
-
+  Config.setup_dap = nil
  vim.pack.add({ "https://github.com/mfussenegger/nvim-dap" })

  local dap = require("dap")
-
  dap.adapters.php = {
    type = "executable",
    command = "node",
    args = { vim.fn.stdpath("data") .. "/mason/packages/php-debug-adapter/extension/out/phpDebug.js" },
  }
-
  dap.adapters.go = {
    type = "server",
    host = "127.0.0.1",
@@ -95,16 +99,14 @@ end

 -- Kulala ======================================================================
 function Config.setup_kulala()
-  if package.loaded["kulala"] then
-    return
-  end
-
+  Config.setup_kulala = nil
  vim.pack.add({ "https://github.com/mistweaverco/kulala.nvim" })
  require("kulala").setup({ default_env = "dev" })
 end

 -- Laravel =====================================================================
-Config.now_if_args(function()
+function Config.setup_laravel()
+  Config.setup_laravel = nil
  vim.pack.add({
    "https://github.com/MunifTanjim/nui.nvim",
    "https://github.com/nvim-lua/plenary.nvim",
@@ -113,4 +115,18 @@ Config.now_if_args(function()
  })

  require("laravel").setup({})
-end)
+end
+
+-- Flutter =====================================================================
+function Config.setup_flutter()
+  Config.setup_flutter = nil
+  vim.pack.add({
+    "https://github.com/nvim-lua/plenary.nvim",
+    "https://github.com/nvim-flutter/flutter-tools.nvim",
+  })
+
+  require("flutter-tools").setup({ lsp = { color_capabilities = true } })
+end
+
+Config.autocmd('FileType', 'php', Config.setup_laravel, "Setup laravel", true)
+Config.autocmd('FileType', 'dart', Config.setup_flutter, "Setup flutter", true)