Compare commits
2 Commits
70486dda84
...
65680cb255
| Author | SHA1 | Date | |
|---|---|---|---|
| 65680cb255 | |||
| f54bbc5676 |
15
docs/README.md
Normal file
15
docs/README.md
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# New Spec
|
||||||
|
|
||||||
|
For new LSP, add in `lua/modules/language-specs.lua` at `lsp = <name>`.
|
||||||
|
Name should match the mason registry one at: `https://github.com/mason-org/mason-registry/tree/main/packages`
|
||||||
|
|
||||||
|
1. Run `nvim --headless +InstallAll +qa` (it invalidates cache automatically)
|
||||||
|
2. Run ` nvim --headless +FetchLspConfigs +qa` -> It will download the nvim-lspconfig variant in `lsp/`
|
||||||
|
|
||||||
|
You may need to run: `pkill prettierd` (as it is running in background)
|
||||||
|
|
||||||
|
# Other commands
|
||||||
|
|
||||||
|
```
|
||||||
|
nvim --headless +Sync +qa # For packages/plugins
|
||||||
|
```
|
||||||
23
docs/docs.md
23
docs/docs.md
@@ -1,13 +1,3 @@
|
|||||||
TODO:
|
|
||||||
- wrap up invero theme in separate repo and proper colors?
|
|
||||||
- check plugins logins
|
|
||||||
- cache / create final result
|
|
||||||
- simplify coding: ts, lsp, lint, format (check other repos)
|
|
||||||
- how to download parsers and plugins alternative
|
|
||||||
- telescope alternative
|
|
||||||
- keymaps
|
|
||||||
- wrap up everything
|
|
||||||
|
|
||||||
```lua
|
```lua
|
||||||
--[[
|
--[[
|
||||||
Neovim Lua config: ways to set things
|
Neovim Lua config: ways to set things
|
||||||
@@ -31,6 +21,7 @@ TODO:
|
|||||||
## check macos fileS: https://github.com/dsully/dotfiles/blob/main/.data/macos-defaults/globals.yaml
|
## check macos fileS: https://github.com/dsully/dotfiles/blob/main/.data/macos-defaults/globals.yaml
|
||||||
|
|
||||||
# Used pacakges:
|
# Used pacakges:
|
||||||
|
|
||||||
- rockspaces Metadata files describing how to build and install a Lua package.
|
- rockspaces Metadata files describing how to build and install a Lua package.
|
||||||
- luarocks Package manager for Lua modules. (optional)
|
- luarocks Package manager for Lua modules. (optional)
|
||||||
- tree-sitter Parser generator. Not needed except for using CLI. (optional)
|
- tree-sitter Parser generator. Not needed except for using CLI. (optional)
|
||||||
@@ -66,8 +57,8 @@ TODO:
|
|||||||
- ncurses ncurses-dev ncurses-libs ncurses-terminfo \
|
- ncurses ncurses-dev ncurses-libs ncurses-terminfo \
|
||||||
- check: https://github.com/glepnir/nvim/blob/main/Dockerfile
|
- check: https://github.com/glepnir/nvim/blob/main/Dockerfile
|
||||||
|
|
||||||
|
|
||||||
# Currently installed
|
# Currently installed
|
||||||
|
|
||||||
- plenary.nvim
|
- plenary.nvim
|
||||||
- lazy.nvim
|
- lazy.nvim
|
||||||
|
|
||||||
@@ -93,11 +84,12 @@ TODO:
|
|||||||
- plenary.nvim
|
- plenary.nvim
|
||||||
- harpoon # tags
|
- harpoon # tags
|
||||||
|
|
||||||
|
|
||||||
# Notes:
|
# Notes:
|
||||||
|
|
||||||
- in lsp change tsserver to vtsls
|
- in lsp change tsserver to vtsls
|
||||||
|
|
||||||
# New package definition
|
# New package definition
|
||||||
|
|
||||||
- Plugin and Package managers
|
- Plugin and Package managers
|
||||||
- folke/lazy.nvim
|
- folke/lazy.nvim
|
||||||
- mason-org/mason.nvim
|
- mason-org/mason.nvim
|
||||||
@@ -106,7 +98,6 @@ TODO:
|
|||||||
- nvim-treesitter-textobjects
|
- nvim-treesitter-textobjects
|
||||||
- LSP
|
- LSP
|
||||||
- neovim/nvim-lspconfig
|
- neovim/nvim-lspconfig
|
||||||
|
|
||||||
- nvim-ts-autotag tag elements (`</>`)
|
- nvim-ts-autotag tag elements (`</>`)
|
||||||
- windwp/nvim-autopairs auto pairs
|
- windwp/nvim-autopairs auto pairs
|
||||||
- blink.cmp autocompletion
|
- blink.cmp autocompletion
|
||||||
@@ -123,11 +114,13 @@ TODO:
|
|||||||
- mini.indentscope
|
- mini.indentscope
|
||||||
|
|
||||||
## Deps:
|
## Deps:
|
||||||
|
|
||||||
- SchemaStore.nvim
|
- SchemaStore.nvim
|
||||||
- mason-lspconfig.nvim
|
- mason-lspconfig.nvim
|
||||||
- mason.nvim
|
- mason.nvim
|
||||||
|
|
||||||
## Maybe:
|
## Maybe:
|
||||||
|
|
||||||
- folke/ts-comments.nvim better comments
|
- folke/ts-comments.nvim better comments
|
||||||
- grug-far.nvim find and replace
|
- grug-far.nvim find and replace
|
||||||
- markdown-preview.nvim side by side md (disabled in folke)
|
- markdown-preview.nvim side by side md (disabled in folke)
|
||||||
@@ -146,6 +139,7 @@ TODO:
|
|||||||
- undo tree (find a plugin)
|
- undo tree (find a plugin)
|
||||||
|
|
||||||
## AI help
|
## AI help
|
||||||
|
|
||||||
- jackMort/ChatGPT.nvim
|
- jackMort/ChatGPT.nvim
|
||||||
- MunifTanjim/nui.nvim (dep)
|
- MunifTanjim/nui.nvim (dep)
|
||||||
- nvim-lua/plenary.nvim (dep)
|
- nvim-lua/plenary.nvim (dep)
|
||||||
@@ -155,6 +149,7 @@ TODO:
|
|||||||
- milanglacier/minuet-ai.nvim (folke)
|
- milanglacier/minuet-ai.nvim (folke)
|
||||||
|
|
||||||
## Options
|
## Options
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
opt.backup = true
|
opt.backup = true
|
||||||
@@ -178,6 +173,7 @@ vim.keymap.set("n", "<C-c>", "ciw")
|
|||||||
```
|
```
|
||||||
|
|
||||||
folke cmd
|
folke cmd
|
||||||
|
|
||||||
```lua
|
```lua
|
||||||
-- show cursor line only in active window
|
-- show cursor line only in active window
|
||||||
vim.api.nvim_create_autocmd({ "InsertLeave", "WinEnter" }, {
|
vim.api.nvim_create_autocmd({ "InsertLeave", "WinEnter" }, {
|
||||||
@@ -210,6 +206,7 @@ vim.api.nvim_create_autocmd("BufWritePre", {
|
|||||||
```
|
```
|
||||||
|
|
||||||
Enable folding with TS:
|
Enable folding with TS:
|
||||||
|
|
||||||
```
|
```
|
||||||
vim.opt.foldmethod = "expr"
|
vim.opt.foldmethod = "expr"
|
||||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||||
|
|||||||
@@ -2,6 +2,12 @@ local M = {}
|
|||||||
|
|
||||||
function M.get()
|
function M.get()
|
||||||
return {
|
return {
|
||||||
|
{
|
||||||
|
ft = 'yaml',
|
||||||
|
ts = 'yaml',
|
||||||
|
lsp = 'yaml-language-server',
|
||||||
|
format = { 'prettierd', 'prettier' },
|
||||||
|
},
|
||||||
{ ts = { 'yaml', 'toml', 'sql', 'diff', 'dockerfile', 'gitcommit', 'gitignore' } },
|
{ ts = { 'yaml', 'toml', 'sql', 'diff', 'dockerfile', 'gitcommit', 'gitignore' } },
|
||||||
{ ts = { 'c', 'cpp', 'go', 'rust', 'python' } },
|
{ ts = { 'c', 'cpp', 'go', 'rust', 'python' } },
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ M.config = {
|
|||||||
max_items = 5000, -- safety cap for massive outputs
|
max_items = 5000, -- safety cap for massive outputs
|
||||||
debug = false,
|
debug = false,
|
||||||
follow_symlinks = true, -- pass -L to fd
|
follow_symlinks = true, -- pass -L to fd
|
||||||
|
grep_path_width = 30,
|
||||||
|
|
||||||
-- Exclusion patterns (used by fd/rg in addition to their gitignore handling)
|
-- Exclusion patterns (used by fd/rg in addition to their gitignore handling)
|
||||||
exclude_patterns = { 'node_modules', 'dist', 'build', '.git' },
|
exclude_patterns = { 'node_modules', 'dist', 'build', '.git' },
|
||||||
@@ -241,6 +242,60 @@ local function render()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- For grep mode, reformat lines with fixed-width path column
|
||||||
|
local offset_map = {} -- maps display line -> character offset for highlighting
|
||||||
|
if S.mode == 'grep' and total > 0 then
|
||||||
|
local path_width = M.config.grep_path_width or 40
|
||||||
|
|
||||||
|
for i = 1, #view do
|
||||||
|
local line = view[i]
|
||||||
|
if line then
|
||||||
|
-- Parse original vimgrep format: file:line:col:content
|
||||||
|
local file, lnum, col = line:match('^(.-):(%d+):(%d+):')
|
||||||
|
if file and lnum and col then
|
||||||
|
-- Pad line number to 3 chars with underscores
|
||||||
|
local padded_lnum = lnum
|
||||||
|
while #padded_lnum < 3 do
|
||||||
|
padded_lnum = ' ' .. padded_lnum
|
||||||
|
end
|
||||||
|
|
||||||
|
local lineinfo = ':' .. padded_lnum .. '|'
|
||||||
|
local content_start = #file + 1 + #lnum + 1 + #col + 2 -- file + :lnum: + col:
|
||||||
|
local content_part = line:sub(content_start)
|
||||||
|
|
||||||
|
-- Calculate how much space we need for file + lineinfo
|
||||||
|
local prefix_len = #file + #lineinfo
|
||||||
|
local formatted_line
|
||||||
|
|
||||||
|
if prefix_len > path_width then
|
||||||
|
-- Need to truncate the filepath part only
|
||||||
|
local available_for_file = path_width - #lineinfo
|
||||||
|
if available_for_file > 1 then
|
||||||
|
local truncated_file = '…' .. file:sub(-(available_for_file - 1))
|
||||||
|
formatted_line = truncated_file .. lineinfo .. content_part
|
||||||
|
-- Offset is: original_file_length - truncated_file_length
|
||||||
|
offset_map[i] = #file - #truncated_file
|
||||||
|
else
|
||||||
|
-- Extreme case: line info itself is too long, just show what we can
|
||||||
|
formatted_line = ('…' .. file):sub(1, path_width) .. lineinfo .. content_part
|
||||||
|
offset_map[i] = #file - (path_width - #lineinfo)
|
||||||
|
end
|
||||||
|
elseif prefix_len < path_width then
|
||||||
|
-- Right-align by padding before the filepath
|
||||||
|
local padding = string.rep(' ', path_width - prefix_len)
|
||||||
|
formatted_line = padding .. file .. lineinfo .. content_part
|
||||||
|
offset_map[i] = -(path_width - prefix_len) -- negative for padding added
|
||||||
|
else
|
||||||
|
formatted_line = file .. lineinfo .. content_part
|
||||||
|
offset_map[i] = 0
|
||||||
|
end
|
||||||
|
|
||||||
|
view[i] = formatted_line
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
vim.bo[S.buf_res].modifiable = true
|
vim.bo[S.buf_res].modifiable = true
|
||||||
vim.api.nvim_buf_set_lines(S.buf_res, 0, -1, false, view)
|
vim.api.nvim_buf_set_lines(S.buf_res, 0, -1, false, view)
|
||||||
vim.api.nvim_buf_clear_namespace(S.buf_res, S.ns, 0, -1)
|
vim.api.nvim_buf_clear_namespace(S.buf_res, S.ns, 0, -1)
|
||||||
@@ -253,26 +308,31 @@ local function render()
|
|||||||
local idx = S.scroll + i
|
local idx = S.scroll + i
|
||||||
local line = view[i]
|
local line = view[i]
|
||||||
|
|
||||||
-- In grep mode, highlight the "file:line:col:" prefix in gray
|
-- In grep mode, highlight the entire "file:line|" prefix in gray
|
||||||
if S.mode == 'grep' and line then
|
if S.mode == 'grep' and line then
|
||||||
local prefix_end = line:find('^.-:%d+:%d+:')
|
-- Find the end of the full prefix including the pipe
|
||||||
|
local _, prefix_end = line:find(':[ 0-9]+|')
|
||||||
if prefix_end then
|
if prefix_end then
|
||||||
local _, epos = line:find('^.-:%d+:%d+:')
|
|
||||||
if epos then
|
|
||||||
pcall(vim.api.nvim_buf_set_extmark, S.buf_res, S.ns, i - 1, 0, {
|
pcall(vim.api.nvim_buf_set_extmark, S.buf_res, S.ns, i - 1, 0, {
|
||||||
end_col = epos,
|
end_col = prefix_end,
|
||||||
hl_group = 'FinderPath',
|
hl_group = 'FinderPath',
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
-- match highlights (query matches in orange)
|
-- match highlights (query matches in orange)
|
||||||
local spans = S.positions[idx]
|
local spans = S.positions[idx]
|
||||||
if spans then
|
if spans then
|
||||||
for _, se in ipairs(spans) do
|
for _, se in ipairs(spans) do
|
||||||
local scol, ecol = se[1], se[2]
|
local scol, ecol = se[1], se[2]
|
||||||
if ecol > scol then
|
|
||||||
|
-- Adjust positions for grep mode formatting
|
||||||
|
if S.mode == 'grep' and offset_map[i] then
|
||||||
|
scol = scol - offset_map[i]
|
||||||
|
ecol = ecol - offset_map[i]
|
||||||
|
end
|
||||||
|
|
||||||
|
if ecol > scol and scol >= 0 then
|
||||||
pcall(vim.api.nvim_buf_set_extmark, S.buf_res, S.ns, i - 1, scol, {
|
pcall(vim.api.nvim_buf_set_extmark, S.buf_res, S.ns, i - 1, scol, {
|
||||||
end_col = ecol,
|
end_col = ecol,
|
||||||
hl_group = 'FinderMatch',
|
hl_group = 'FinderMatch',
|
||||||
|
|||||||
@@ -73,7 +73,8 @@ vim.api.nvim_create_user_command('Sync', function()
|
|||||||
end, {})
|
end, {})
|
||||||
|
|
||||||
vim.api.nvim_create_user_command('FetchLspConfigs', function()
|
vim.api.nvim_create_user_command('FetchLspConfigs', function()
|
||||||
local base_url = 'https://raw.githubusercontent.com/neovim/nvim-lspconfig/master/lsp/'
|
-- local base_url = 'https://raw.githubusercontent.com/neovim/nvim-lspconfig/master/lsp/'
|
||||||
|
local base_url = 'https://raw.githubusercontent.com/neovim/nvim-lspconfig/refs/heads/master/lsp/'
|
||||||
|
|
||||||
local lm = require('plugins.language-manager')
|
local lm = require('plugins.language-manager')
|
||||||
lm.invalidate_cache()
|
lm.invalidate_cache()
|
||||||
|
|||||||
Reference in New Issue
Block a user