Compare commits

23 Commits
Author SHA1 Message Date
romanzy313 b0679fa52f easier norm complience 2026-10-01 22:15:45 +02:00
romanzy313 d9f92eb203 remove noisy suggestions 2026-09-30 23:50:20 +02:00
romanzy313 bddad61696 update keymaps 2026-09-29 21:36:43 +02:00
romanzy313 a23783c324 oil is king 2026-09-29 21:35:52 +02:00
romanzy313 f8ba62a6bb Revert "disable oil, enable mini.files"
This reverts commit 75eae3f174.
2026-09-29 21:32:45 +02:00
romanzy313 598f684c22 support other clipboards 2026-09-29 21:28:35 +02:00
Roman Volovoy 972289799c fix codam header 2026-09-28 16:26:02 +02:00
Roman Volovoy f362f0b9b1 lazygit installed 2026-09-28 12:48:00 +02:00
Roman Volovoy b8304c06af install scripts 2026-09-28 12:45:07 +02:00
romanzy313 a0341ca1c7 stop diagnostics spam 2026-09-27 00:03:13 +02:00
romanzy313 ebf5a0e8eb cunstom diagnositcs 2026-09-26 23:08:55 +02:00
romanzy313 b1714279ff disable lsp progress
Very annoying in slow dart lsp
2026-09-21 16:43:32 +02:00
romanzy313 94972506c2 improve mini_files 2026-09-18 19:01:58 +02:00
romanzy313 0ac228d0c3 change mini.files open location 2026-09-18 18:53:36 +02:00
romanzy313 e8027c8c7f primitive spell checking 2026-09-18 17:45:45 +02:00
romanzy313 a0e45a6dec config mini.input 2026-09-18 17:01:20 +02:00
romanzy313 18931930a2 added mini.input 2026-09-18 16:29:48 +02:00
romanzy313 dda48dc457 buffers close toast 2026-09-18 16:03:22 +02:00
romanzy313 cbe9447671 cleanup structure 2026-09-18 16:00:05 +02:00
romanzy313 c67352a14d refactor 2026-09-18 15:56:14 +02:00
romanzy313 0e8f4bc7a5 open files from mini.files 2026-09-18 15:50:54 +02:00
romanzy313 292961ae93 refreshing the shortcuts 2026-09-18 15:39:36 +02:00
romanzy313 9a01804f2f improve highlight 2026-09-18 15:30:19 +02:00
17 changed files with 448 additions and 498 deletions
+7
View File
@@ -18,3 +18,10 @@ cc-run(){
rm "${file}.out" rm "${file}.out"
} }
# https://pypi.org/project/c-formatter-42/
# install via
# pip3 install --user c-formatter-42
norm(){
c_formatter_42 *.c *.h
}
+15
View File
@@ -0,0 +1,15 @@
#!/bin/bash
fonts_dir="$HOME/.local/share/fonts"
mkdir -p "$fonts_dir"
# List of fonts to install
declare -a fonts=(FiraCode JetBrainsMono Hack)
for font in "${fonts[@]}"; do
echo "Installing $font..."
wget "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${font}.zip" -P "/tmp/"
unzip -o "/tmp/${font}.zip" -d "$fonts_dir"
rm "/tmp/${font}.zip"
done
fc-cache -fv
+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/env bash
set -euo pipefail
LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": *"v\K[^"]*')
LAZYGIT_ARCH=$(uname -m | sed 's/aarch64/arm64/')
echo "Installing lazygit v${LAZYGIT_VERSION} (${LAZYGIT_ARCH})"
WORKDIR=$(mktemp -d /tmp/lazygit.XXXXXX)
trap 'rm -rf "$WORKDIR"' EXIT
curl -sLo "${WORKDIR}/lazygit.tar.gz" \
"https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_${LAZYGIT_ARCH}.tar.gz"
tar -xOf "${WORKDIR}/lazygit.tar.gz" lazygit > "${WORKDIR}/lazygit"
mkdir -p ~/.local/bin
install -m 755 "${WORKDIR}/lazygit" ~/.local/bin/lazygit
echo "Done: $(~/.local/bin/lazygit --version)"
+25
View File
@@ -0,0 +1,25 @@
#!/bin/bash
STOW_VERSION="${STOW_VERSION:-2.4.1}"
# Create temp build directory
BUILD_DIR=$(mktemp -d)
trap 'rm -rf "$BUILD_DIR"' EXIT
# 1. Download and extract
cd "$BUILD_DIR"
curl -O "http://ftp.gnu.org/gnu/stow/stow-${STOW_VERSION}.tar.gz"
tar xf "stow-${STOW_VERSION}.tar.gz"
cd "stow-${STOW_VERSION}"
# 2. Configure installation to user directory
./configure --prefix="$HOME/.local"
# 3. Compile and install (no sudo needed)
make
make install
# 4. Add to PATH (add this line to ~/.bashrc or ~/.zshrc)
export PATH="$HOME/.local/bin:$PATH"
# 5. Verify installation
stow --version
+15 -9
View File
@@ -14,6 +14,12 @@ To remove a plugin run `:lua vim.pack.del({ "<plugin name>" })`.
See custom keymaps with short descriptions with `<leader><leader>h`. See custom keymaps with short descriptions with `<leader><leader>h`.
General shortcuts:
- `<leader>e` opens the file browser
- `gx` opens an external viewer
- `gR`, `<F5>` refresh
Windowing shortcuts: Windowing shortcuts:
- `<leader>sv` open a vertical split - `<leader>sv` open a vertical split
@@ -48,19 +54,15 @@ Git shortcuts:
- `[h`, `]h`, `[H`, `]H` jump to hunks - `[h`, `]h`, `[H`, `]H` jump to hunks
- `<leader>th` — toggle the expanded hunk view - `<leader>th` — toggle the expanded hunk view
Refresh shortcuts (oil and buffers): Oil usage:
- `gR` refresh the current buffer - `-`, `<BS>` goes to the parent directory
- `<F5>` refresh the current buffer - `<C-p>` previews the selected entry
Files usage:
- `<leader>e` opens the file browser
- `gx` opens the file in external viewer
Toggle shortcuts: Toggle shortcuts:
- `<leader>tw` toggle soft wrap - `<leader>tw` toggle soft wrap
- `<leader>ts` toggle spell checking
- `<leader>ti` toggle inline diagnostics - `<leader>ti` toggle inline diagnostics
- `<leader>tv` toggle virtual diagnostics - `<leader>tv` toggle virtual diagnostics
- `<leader>th` — toggle the expanded hunk view - `<leader>th` — toggle the expanded hunk view
@@ -95,6 +97,7 @@ Useful LSP commands:
- `<leader>ca` show code actions - `<leader>ca` show code actions
- `<leader>cf` apply quick fixes - `<leader>cf` apply quick fixes
- `<leader>cs` show source actions - `<leader>cs` show source actions
- `<C-x><C-n>` manually word completion
Diagnostics: Diagnostics:
@@ -104,7 +107,10 @@ Diagnostics:
- `]g`, `[g` jump to warning or error - `]g`, `[g` jump to warning or error
- `<leader>ti` toggle inline diagnostics - `<leader>ti` toggle inline diagnostics
- `<leader>tv` toggle virtual diagnostics - `<leader>tv` toggle virtual diagnostics
- `<leader>xx` toggle project warnings and errors - `<leader>xx`, `:ProjectDiagnostics` check the current Dart or TypeScript
package and show warnings and errors in Trouble. Save modified package files
first. Other languages show available LSP diagnostics; project coverage
depends on the language server.
## Tree-sitter ## Tree-sitter
+1
View File
@@ -2,3 +2,4 @@ local o = vim.opt_local
o.textwidth = 80 o.textwidth = 80
o.expandtab = false o.expandtab = false
o.commentstring = "/*%s*/"
@@ -3,6 +3,8 @@ local ac = vim.api.nvim_create_autocmd
local aug = vim.api.nvim_create_augroup local aug = vim.api.nvim_create_augroup
uc("W", "w|e", { desc = "write file then refresh buffer" }) uc("W", "w|e", { desc = "write file then refresh buffer" })
uc("ProjectDiagnostics", require("romanzy.custom.project_diagnostics").run,
{ desc = "check project warnings and errors" })
ac("TextYankPost", { ac("TextYankPost", {
desc = "Highlight when yanking text", desc = "Highlight when yanking text",
@@ -12,6 +14,8 @@ ac("TextYankPost", {
end, end,
}) })
uc("NormFormat", "!c_formatter_42 *.c *.h", { desc = "comply with the norm in C" })
-- ac("LspAttach", { -- ac("LspAttach", {
-- desc = "Notify user about attached LSP clients", -- desc = "Notify user about attached LSP clients",
-- group = aug("LSPOnAttach", { clear = true }), -- group = aug("LSPOnAttach", { clear = true }),
@@ -2,6 +2,7 @@ local M = {}
function M.close_hidden() function M.close_hidden()
local visible_buffers = {} local visible_buffers = {}
local closed_count = 0
for _, tabpage in ipairs(vim.api.nvim_list_tabpages()) do for _, tabpage in ipairs(vim.api.nvim_list_tabpages()) do
for _, window in ipairs(vim.api.nvim_tabpage_list_wins(tabpage)) do for _, window in ipairs(vim.api.nvim_tabpage_list_wins(tabpage)) do
@@ -12,8 +13,17 @@ function M.close_hidden()
for _, buffer in ipairs(vim.api.nvim_list_bufs()) do for _, buffer in ipairs(vim.api.nvim_list_bufs()) do
if vim.bo[buffer].buflisted and not visible_buffers[buffer] then if vim.bo[buffer].buflisted and not visible_buffers[buffer] then
vim.api.nvim_buf_delete(buffer, { force = true }) vim.api.nvim_buf_delete(buffer, { force = true })
closed_count = closed_count + 1
end end
end end
if closed_count == 0 then
vim.notify("No hidden buffers to close", vim.log.levels.INFO)
return
end
local buffer_label = closed_count == 1 and "buffer" or "buffers"
vim.notify(string.format("Closed %d hidden %s", closed_count, buffer_label), vim.log.levels.INFO)
end end
return M return M
@@ -1,363 +0,0 @@
-- git highlighting for the mini.files
-- unfortunately this is a mountain of code...
local M = {}
local uv = vim.uv or vim.loop
local cache_ttl_ms = 1000
local status_cache = {}
local git_root_cache = {}
local known_git_roots = {}
local function is_path_inside(path, root)
return path == root or vim.startswith(path, root .. "/")
end
local function new_status_node()
return {
children = {},
status = nil,
priority = 0,
is_dir_ignored = false,
is_dir_untracked = false,
}
end
local function is_conflict(status)
if #status < 2 then
return false
end
local index_status = status:sub(1, 1)
local worktree_status = status:sub(2, 2)
return index_status == "U"
or worktree_status == "U"
or status == "AA"
or status == "DD"
end
local function status_priority(status)
if #status < 2 then
return 0
end
if is_conflict(status) then
return 8
end
if status == "!!" then
return 1
end
if status == "??" then
return 2
end
local index_status = status:sub(1, 1)
local worktree_status = status:sub(2, 2)
if index_status == "M" then
return 7
end
if index_status == "D" or worktree_status == "D" then
return 5
end
if index_status == "A" then
return 4
end
if index_status == "R" or index_status == "C" then
return 3
end
if worktree_status == "M" then
return 6
end
return 0
end
local function status_highlight(status)
if not status then
return nil
end
if status == "!!" then
return "Comment"
end
if is_conflict(status) then
return "MiniDiffSignDelete"
end
if status == "??" or status:sub(1, 1) == "A" then
return "MiniDiffSignAdd"
end
if status:sub(1, 1) == "D" or status:sub(2, 2) == "D" then
return "MiniDiffSignDelete"
end
if status:sub(1, 1) == "M"
or status:sub(1, 1) == "R"
or status:sub(1, 1) == "C"
or status:sub(2, 2) == "M"
then
return "MiniDiffSignChange"
end
return nil
end
local function insert_status(root, relative_path, status, is_directory)
local priority = status_priority(status)
if priority == 0 then
return
end
local node = root
local segments = vim.split(relative_path, "/", { plain = true, trimempty = true })
for index, segment in ipairs(segments) do
node.children[segment] = node.children[segment] or new_status_node()
node = node.children[segment]
if index == #segments then
if priority > node.priority then
node.status = status
node.priority = priority
end
if is_directory and status == "!!" then
node.is_dir_ignored = true
end
if is_directory and status == "??" then
node.is_dir_untracked = true
end
end
end
end
local function subtree_status(node)
local best_status = node.status
local best_priority = node.priority
for _, child in pairs(node.children) do
local child_status, child_priority = subtree_status(child)
if child_priority > best_priority then
best_status = child_status
best_priority = child_priority
end
end
return best_status, best_priority
end
local function parse_status(output, root)
local data = {
root = root,
statuses = {},
trie = new_status_node(),
timestamp = uv.now(),
}
local records = vim.split(output, "\0", { plain = true, trimempty = true })
local record_index = 1
while record_index <= #records do
local record = records[record_index]
if #record >= 4 then
local status = record:sub(1, 2)
local relative_path = record:sub(4)
-- With -z, rename/copy output contains the new path followed by
-- the old path. Oil highlights the new path only.
if status:sub(1, 1) == "R" or status:sub(1, 1) == "C" then
record_index = record_index + 1
end
local is_directory = relative_path:sub(-1) == "/"
relative_path = relative_path:gsub("^%./", ""):gsub("/$", "")
if relative_path ~= "" then
local absolute_path = vim.fs.normalize(vim.fs.joinpath(root, relative_path))
data.statuses[absolute_path] = status
insert_status(data.trie, relative_path, status, is_directory)
end
end
record_index = record_index + 1
end
return data
end
local function find_cached_root(path)
local result
for root in pairs(known_git_roots) do
if is_path_inside(path, root) and (result == nil or #root > #result) then
result = root
end
end
return result
end
local function find_git_root(path)
local cached_root = find_cached_root(path)
if cached_root ~= nil then
return cached_root
end
local cached = git_root_cache[path]
if cached ~= nil then
return cached or nil
end
local result = vim.system({ "git", "-C", path, "rev-parse", "--show-toplevel" }, { text = true }):wait()
if result.code ~= 0 then
git_root_cache[path] = false
return nil
end
local root = vim.trim(result.stdout)
if root == "" then
git_root_cache[path] = false
return nil
end
root = vim.fs.normalize(root)
git_root_cache[path] = root
known_git_roots[root] = true
return root
end
local function get_status_data(fs_entry)
local path = fs_entry.path
if fs_entry.fs_type ~= "directory" then
path = vim.fs.dirname(path)
end
path = vim.fs.normalize(path)
local root = find_git_root(path)
if root == nil then
return nil
end
local cached = status_cache[root]
if cached ~= nil and uv.now() - cached.timestamp < cache_ttl_ms then
return cached
end
local result = vim.system({
"git",
"-C",
root,
"--no-optional-locks",
"status",
"--porcelain",
"--ignored",
"-z",
}, { text = true }):wait()
if result.code ~= 0 then
status_cache[root] = parse_status("", root)
return status_cache[root]
end
local data = parse_status(result.stdout, root)
status_cache[root] = data
return data
end
local function lookup_status(data, fs_entry)
local path = vim.fs.normalize(fs_entry.path)
local direct_status = data.statuses[path]
if fs_entry.fs_type ~= "directory" and direct_status ~= nil then
return direct_status
end
if not is_path_inside(path, data.root) then
return nil
end
local relative_path = path:sub(#data.root + 2)
local node = data.trie
for _, segment in ipairs(vim.split(relative_path, "/", { plain = true, trimempty = true })) do
if node.is_dir_ignored then
return "!!"
end
if node.is_dir_untracked then
return "??"
end
node = node.children[segment]
if node == nil then
return nil
end
end
if node.is_dir_ignored then
return "!!"
end
if node.is_dir_untracked then
return "??"
end
if next(node.children) == nil then
return node.status
end
local status = subtree_status(node)
-- Match the Oil configuration: an ignored descendant does not grey its
-- parent directory unless Git reported that directory as ignored.
if fs_entry.fs_type == "directory" and status == "!!" then
return nil
end
return status
end
function M.filter(fs_entry)
return fs_entry.name ~= ".git"
end
function M.highlight(fs_entry)
local data = get_status_data(fs_entry)
local status = data == nil and nil or lookup_status(data, fs_entry)
return status_highlight(status)
or (fs_entry.fs_type == "directory" and "MiniFilesDirectory" or "MiniFilesFile")
end
function M.invalidate()
status_cache = {}
git_root_cache = {}
known_git_roots = {}
end
local function refresh()
M.invalidate()
if _G.MiniFiles == nil or MiniFiles.get_explorer_state() == nil then
return
end
vim.schedule(function()
if MiniFiles.get_explorer_state() ~= nil then
MiniFiles.refresh()
end
end)
end
function M.setup()
local group = vim.api.nvim_create_augroup("romanzy_mini_files_git", { clear = true })
vim.api.nvim_create_autocmd({ "BufWritePost", "FocusGained", "TermClose" }, {
group = group,
callback = refresh,
})
vim.api.nvim_create_autocmd("User", {
group = group,
pattern = {
"GitSignsUpdate",
"LazyGitClosed",
"MiniFilesActionCreate",
"MiniFilesActionDelete",
"MiniFilesActionRename",
"MiniFilesActionCopy",
"MiniFilesActionMove",
},
callback = refresh,
})
return {
content = {
filter = M.filter,
highlight = M.highlight,
},
}
end
return M
@@ -0,0 +1,184 @@
local M = {}
local run_id = 0
local severities = { error = "E", warning = "W" }
local extensions = {
dart = "dart",
ts = "typescript",
tsx = "typescript",
mts = "typescript",
cts = "typescript",
js = "typescript",
jsx = "typescript",
mjs = "typescript",
cjs = "typescript",
}
local function absolute_path(root, path)
if path:sub(1, 1) == "/" then
return vim.fs.normalize(path)
end
return vim.fs.normalize(vim.fs.joinpath(root, path))
end
local function parse_output(kind, output, root)
local items = {}
for line in output:gmatch("[^\r\n]+") do
local path, row, col, level, message, code
if kind == "dart" then
level, path, row, col, message, code = line:match("^%s*(%a+)%s+%-%s+(.+):(%d+):(%d+)%s+%-%s+(.+)%s+%-%s+([%w_]+)%s*$")
else
path, row, col, level, code, message = line:match("^(.+)%((%d+),(%d+)%)%:%s*(%a+)%s+TS(%d+):%s*(.+)$")
if not path then
level, code, message = line:match("^(%a+)%s+TS(%d+):%s*(.+)$")
if level then
path, row, col = "tsconfig.json", 1, 1
end
end
end
if path and severities[level] then
table.insert(items, {
filename = absolute_path(root, path),
lnum = tonumber(row),
col = tonumber(col),
text = message,
type = severities[level],
nr = code and tonumber(code) or nil,
})
end
end
return items
end
local function add_lsp_diagnostics(items, root)
local seen = {}
for _, item in ipairs(items) do
seen[table.concat({ item.filename, item.lnum, item.col, item.type, item.text }, "\0")] = true
end
local prefix = root .. "/"
for _, diagnostic in ipairs(vim.diagnostic.get()) do
local path = vim.api.nvim_buf_get_name(diagnostic.bufnr)
local kind = diagnostic.severity == vim.diagnostic.severity.ERROR and "E"
or diagnostic.severity == vim.diagnostic.severity.WARN and "W"
if kind and path:sub(1, #prefix) == prefix then
local item = {
filename = path,
lnum = diagnostic.lnum + 1,
col = diagnostic.col + 1,
text = diagnostic.message,
type = kind,
}
local key = table.concat({ item.filename, item.lnum, item.col, item.type, item.text }, "\0")
if not seen[key] then
table.insert(items, item)
seen[key] = true
end
end
end
end
local function show_lsp_diagnostics(bufnr)
local clients = vim.lsp.get_clients({ bufnr = bufnr })
local supported = false
for _, client in ipairs(clients) do
if client:supports_method("workspace/diagnostic") then
supported = true
break
end
end
if supported then
vim.lsp.buf.workspace_diagnostics()
elseif #clients == 0 then
vim.notify("Project diagnostics: no language server is attached; showing available diagnostics", vim.log.levels.WARN)
else
vim.notify("Project diagnostics: this language server may only report opened files", vim.log.levels.WARN)
end
require("trouble").close({ mode = "qflist" })
require("trouble").open({
mode = "diagnostics",
filter = { severity = { vim.diagnostic.severity.ERROR, vim.diagnostic.severity.WARN } },
})
end
local function has_modified_buffers(root)
local prefix = root .. "/"
for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
local path = vim.api.nvim_buf_get_name(bufnr)
if vim.bo[bufnr].modified and path:sub(1, #prefix) == prefix then
return true
end
end
return false
end
local function checker_for(path)
local extension = path:match("%.([^./]+)$")
local kind = extensions[extension]
if not kind then
return nil
end
local marker = kind == "dart" and "pubspec.yaml" or "tsconfig.json"
local found = vim.fs.find(marker, { path = vim.fs.dirname(path), upward = true })[1]
if not found then
return nil
end
local root = vim.fs.dirname(found)
if kind == "dart" then
local has_fvm = vim.fs.find({ ".fvmrc", ".fvm" }, { path = root, upward = true })[1]
local executable = has_fvm and "fvm" or "dart"
local command = has_fvm and { "fvm", "dart", "analyze" } or { "dart", "analyze" }
return kind, root, executable, command
end
local config = table.concat(vim.fn.readfile(found), "\n")
if config:find('"references"%s*:') then
return kind, root, "pnpm", { "pnpm", "exec", "tsc", "--build", "tsconfig.json", "--noEmit", "--pretty", "false" }
end
return kind, root, "pnpm", { "pnpm", "exec", "tsc", "--noEmit", "--pretty", "false", "--project", "tsconfig.json" }
end
function M.run()
run_id = run_id + 1
local current_run = run_id
local bufnr = vim.api.nvim_get_current_buf()
local path = vim.api.nvim_buf_get_name(bufnr)
local kind, root, executable, command = checker_for(path)
if not kind then
show_lsp_diagnostics(bufnr)
return
end
require("trouble").close({ mode = "qflist" })
if has_modified_buffers(root) then
vim.notify("Project diagnostics: save modified package files before checking", vim.log.levels.WARN)
return
end
if vim.fn.executable(executable) ~= 1 then
vim.notify("Project diagnostics: " .. executable .. " is unavailable", vim.log.levels.ERROR)
return
end
vim.notify("Checking " .. root .. "…", vim.log.levels.INFO)
vim.system(command, { cwd = root, text = true }, function(result)
vim.schedule(function()
if current_run ~= run_id then
return
end
local output = (result.stdout or "") .. "\n" .. (result.stderr or "")
local items = parse_output(kind, output, root)
if result.code ~= 0 and #items == 0 then
vim.notify("Project diagnostics failed:\n" .. vim.trim(output), vim.log.levels.ERROR)
return
end
add_lsp_diagnostics(items, root)
vim.fn.setqflist({}, "r", { title = "Project diagnostics: " .. root, items = items })
if #items == 0 then
require("trouble").close({ mode = "qflist" })
vim.notify("Project diagnostics: no warnings or errors", vim.log.levels.INFO)
else
require("trouble").close({ mode = "diagnostics" })
require("trouble").open({ mode = "qflist" })
end
end)
end)
end
return M
@@ -0,0 +1,35 @@
local M = {}
--- Toggle spell checking for the current window.
function M.toggle()
if vim.bo.buftype == "terminal" then
return
end
vim.opt_local.spell = not vim.wo.spell
vim.cmd("redrawstatus")
end
function M.setup()
vim.opt.spelllang = { "en_us" }
vim.opt.spell = true
local group = vim.api.nvim_create_augroup("RomanzySpell", { clear = true })
vim.api.nvim_create_autocmd("FileType", {
group = group,
pattern = "terminal",
callback = function()
vim.opt_local.spell = false
end,
})
vim.api.nvim_create_autocmd("TermOpen", {
group = group,
callback = function()
vim.cmd("setfiletype terminal")
end,
})
end
return M
+3 -14
View File
@@ -20,9 +20,7 @@ end
map("n", "<leader><leader>r", ":source ~/.config/nvim/init.lua<CR>", { desc = "reload init.lua" }) map("n", "<leader><leader>r", ":source ~/.config/nvim/init.lua<CR>", { desc = "reload init.lua" })
map("n", "<leader><leader>h", telescope_picker("keymaps"), { desc = "show keymaps" }) map("n", "<leader><leader>h", telescope_picker("keymaps"), { desc = "show keymaps" })
map("n", "<leader>e", function() map("n", "<leader>e", "<Cmd>Oil<CR>", { desc = "open oil" })
MiniFiles.open()
end, { desc = "open mini.files" })
map("n", "<leader>ff", telescope_picker("find_files"), { desc = "find files" }) map("n", "<leader>ff", telescope_picker("find_files"), { desc = "find files" })
map("n", "<leader>fg", telescope_picker("live_grep"), { desc = "live grep" }) map("n", "<leader>fg", telescope_picker("live_grep"), { desc = "live grep" })
map("n", "<leader>fb", telescope_picker("buffers"), { desc = "find buffers" }) map("n", "<leader>fb", telescope_picker("buffers"), { desc = "find buffers" })
@@ -31,6 +29,7 @@ map("n", "<leader>lg", "<Cmd>LazyGit<CR>", { desc = "open lazygit" })
map("n", "<leader>dv", "<Cmd>DiffviewOpen<CR>", { desc = "open diffview" }) map("n", "<leader>dv", "<Cmd>DiffviewOpen<CR>", { desc = "open diffview" })
map("n", "<leader>dc", "<Cmd>DiffviewClose<CR>", { desc = "close diffview" }) map("n", "<leader>dc", "<Cmd>DiffviewClose<CR>", { desc = "close diffview" })
map("n", "<leader>tw", require("romanzy.custom.wrap").toggle, { desc = "toggle soft wrap" }) map("n", "<leader>tw", require("romanzy.custom.wrap").toggle, { desc = "toggle soft wrap" })
map("n", "<leader>ts", require("romanzy.custom.spell").toggle, { desc = "toggle spell checking" })
map("n", "<leader>th", function() map("n", "<leader>th", function()
MiniDiff.toggle_overlay() MiniDiff.toggle_overlay()
end, { desc = "toggle hunk view" }) end, { desc = "toggle hunk view" })
@@ -130,17 +129,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
}) })
-- diagnostics -- diagnostics
map("n", "<leader>xx", function() map("n", "<leader>xx", require("romanzy.custom.project_diagnostics").run, { desc = "check project warnings and errors" })
require("trouble").toggle({
mode = "diagnostics",
filter = {
severity = {
vim.diagnostic.severity.ERROR,
vim.diagnostic.severity.WARN,
},
},
})
end, { desc = "toggle project warnings and errors" })
map("n", "g.", vim.diagnostic.open_float, { desc = "line diagnostics" }) map("n", "g.", vim.diagnostic.open_float, { desc = "line diagnostics" })
map("n", "gl", vim.diagnostic.setloclist, { desc = "diagnostic list" }) map("n", "gl", vim.diagnostic.setloclist, { desc = "diagnostic list" })
+1 -2
View File
@@ -2,7 +2,6 @@ local g = vim.g
local o = vim.opt local o = vim.opt
g.mapleader = " " -- Uses space as the global leader key. g.mapleader = " " -- Uses space as the global leader key.
g.maplocalleader = " " -- Uses space as the local leader key. g.maplocalleader = " " -- Uses space as the local leader key.
g.clipboard = "osc52" -- Routes the + and * registers through OSC52 in terminal Neovim.
o.number = true -- Shows absolute line numbers. o.number = true -- Shows absolute line numbers.
o.relativenumber = true -- Shows relative numbers for easier motion. o.relativenumber = true -- Shows relative numbers for easier motion.
@@ -32,8 +31,8 @@ o.incsearch = true -- Updates search m
o.completeopt = { "menuone", "noinsert", "fuzzy", "nosort" } -- Enables fuzzy completion matching. o.completeopt = { "menuone", "noinsert", "fuzzy", "nosort" } -- Enables fuzzy completion matching.
o.pumheight = 8 -- Limits the completion popup menu size. o.pumheight = 8 -- Limits the completion popup menu size.
o.updatetime = 50 -- Reduces idle delay for swap and CursorHold events. o.updatetime = 50 -- Reduces idle delay for swap and CursorHold events.
o.spelllang = { "en_us" } -- Uses US English for spell checking.
o.shell = "bash" -- Runs shell commands through bash. o.shell = "bash" -- Runs shell commands through bash.
g.c_syntax_for_h = true -- Unfuck header formatting
-- Only show the invisible characters inside the code editing buffers -- Only show the invisible characters inside the code editing buffers
vim.cmd([[autocmd BufWinEnter * if &buftype != '' | setlocal nolist | endif]]) vim.cmd([[autocmd BufWinEnter * if &buftype != '' | setlocal nolist | endif]])
+2 -1
View File
@@ -9,4 +9,5 @@ require("romanzy.plugins.nvim-treesitter")
require("romanzy.plugins.conform") require("romanzy.plugins.conform")
require("romanzy.plugins.lsp") require("romanzy.plugins.lsp")
require("romanzy.plugins.codamheader") require("romanzy.plugins.codamheader")
require("romanzy.plugins.romanzy") require("romanzy.custom.spell").setup()
require("romanzy.custom.tabline").setup()
+37 -19
View File
@@ -6,10 +6,10 @@ vim.pack.add({
}, },
}) })
local icons = require("mini.icons")
local input = require("mini.input")
local clue = require("mini.clue") local clue = require("mini.clue")
local completion = require("mini.completion") local completion = require("mini.completion")
local icons = require("mini.icons")
local files = require("mini.files")
local git = require("mini.git") local git = require("mini.git")
local diff = require("mini.diff") local diff = require("mini.diff")
local statusline = require("mini.statusline") local statusline = require("mini.statusline")
@@ -20,6 +20,20 @@ local ai = require("mini.ai")
local notify = require("mini.notify") local notify = require("mini.notify")
local surround = require("mini.surround") local surround = require("mini.surround")
icons.setup({})
local input_view = input.gen_view.floatwin({
-- other interesting symbols for the caret `▏` `⎕` `░` `▒` `▓`
to_chunks = function(state, max_width)
return input.state_to_chunks(state, max_width, {
include_prompt = false,
include_hint = false,
symbol_caret = "█",
})
end,
})
input.setup({ handlers = { view = input_view } })
clue.setup({ clue.setup({
triggers = { triggers = {
{ mode = "n", keys = "<leader>" }, { mode = "n", keys = "<leader>" },
@@ -43,8 +57,6 @@ clue.setup({
icons.setup({}) icons.setup({})
files.setup(require("romanzy.custom.mini_files_git").setup())
git.setup({}) git.setup({})
diff.setup({}) diff.setup({})
@@ -64,24 +76,29 @@ vim.api.nvim_create_autocmd("ColorScheme", {
callback = set_mini_diff_highlights, callback = set_mini_diff_highlights,
}) })
local function statusline_filetype()
local filetype = vim.bo.filetype
if filetype == "" then
return ""
end
local icon = MiniIcons.get("filetype", filetype)
return icon .. " " .. filetype
end
-- Custom de-cluttered status line output. The default was waaay to noisy -- Custom de-cluttered status line output. The default was waaay to noisy
local function statusline_active() local function statusline_active()
local function statusline_filetype()
local filetype = vim.bo.filetype
if filetype == "" then
return ""
end
local icon = MiniIcons.get("filetype", filetype)
return icon .. " " .. filetype
end
local function statusline_spell()
return vim.wo.spell and "spell" or ""
end
local mode, mode_hl = statusline.section_mode({ trunc_width = 120 }) local mode, mode_hl = statusline.section_mode({ trunc_width = 120 })
local git_info = statusline.section_git({ trunc_width = 40 }) local git_info = statusline.section_git({ trunc_width = 40 })
-- local diff_info = statusline.section_diff({ trunc_width = 75 }) -- local diff_info = statusline.section_diff({ trunc_width = 75 })
-- local diagnostics = statusline.section_diagnostics({ trunc_width = 75 }) -- local diagnostics = statusline.section_diagnostics({ trunc_width = 75 })
local lsp = statusline.section_lsp({ trunc_width = 75 }) local lsp = statusline.section_lsp({ trunc_width = 75 })
local filename = statusline.section_filename({ trunc_width = 140 }) local filename = statusline.section_filename({ trunc_width = 140 })
local spell = statusline_spell()
local fileinfo = statusline_filetype() local fileinfo = statusline_filetype()
local search = statusline.section_searchcount({ trunc_width = 75 }) local search = statusline.section_searchcount({ trunc_width = 75 })
@@ -91,7 +108,7 @@ local function statusline_active()
"%<", "%<",
{ hl = "MiniStatuslineFilename", strings = { filename } }, { hl = "MiniStatuslineFilename", strings = { filename } },
"%=", "%=",
{ hl = "MiniStatuslineFileinfo", strings = { fileinfo } }, { hl = "MiniStatuslineFileinfo", strings = { spell, fileinfo } },
{ hl = mode_hl, strings = { search } }, { hl = mode_hl, strings = { search } },
}) })
end end
@@ -117,7 +134,10 @@ pairs.setup({
modes = { insert = true, command = true, terminal = false }, modes = { insert = true, command = true, terminal = false },
}) })
completion.setup({}) completion.setup({
fallback_action = function() end,
mappings = { force_fallback = "" },
})
vim.keymap.set("i", "<CR>", function() vim.keymap.set("i", "<CR>", function()
if vim.fn.complete_info({ "selected" }).selected ~= -1 then if vim.fn.complete_info({ "selected" }).selected ~= -1 then
return "\25" return "\25"
@@ -130,9 +150,7 @@ ai.setup({})
notify.setup({ notify.setup({
lsp_progress = { lsp_progress = {
-- the message "lua_ls: processing completion..." and enable = false,
-- "lua_ls: Diagnosing" is very annoying
enable = true,
}, },
}) })
vim.notify = notify.make_notify() vim.notify = notify.make_notify()
+89 -89
View File
@@ -1,89 +1,89 @@
-- vim.pack.add({ vim.pack.add({
-- { {
-- src = "https://github.com/stevearc/oil.nvim", src = "https://github.com/stevearc/oil.nvim",
-- name = "oil.nvim", name = "oil.nvim",
-- }, },
-- { {
-- src = "https://github.com/malewicz1337/oil-git.nvim", src = "https://github.com/malewicz1337/oil-git.nvim",
-- name = "oil-git.nvim", name = "oil-git.nvim",
-- }, },
-- }) })
--
-- local function set_oil_git_highlights() local function set_oil_git_highlights()
-- vim.api.nvim_set_hl(0, "OilGitAdded", { link = "MiniDiffSignAdd" }) vim.api.nvim_set_hl(0, "OilGitAdded", { link = "MiniDiffSignAdd" })
-- vim.api.nvim_set_hl(0, "OilGitUntracked", { link = "MiniDiffSignAdd" }) vim.api.nvim_set_hl(0, "OilGitUntracked", { link = "MiniDiffSignAdd" })
-- vim.api.nvim_set_hl(0, "OilGitModifiedStaged", { link = "MiniDiffSignChange" }) vim.api.nvim_set_hl(0, "OilGitModifiedStaged", { link = "MiniDiffSignChange" })
-- vim.api.nvim_set_hl(0, "OilGitModifiedUnstaged", { link = "MiniDiffSignChange" }) vim.api.nvim_set_hl(0, "OilGitModifiedUnstaged", { link = "MiniDiffSignChange" })
-- vim.api.nvim_set_hl(0, "OilGitRenamed", { link = "MiniDiffSignChange" }) vim.api.nvim_set_hl(0, "OilGitRenamed", { link = "MiniDiffSignChange" })
-- vim.api.nvim_set_hl(0, "OilGitCopied", { link = "MiniDiffSignChange" }) vim.api.nvim_set_hl(0, "OilGitCopied", { link = "MiniDiffSignChange" })
-- vim.api.nvim_set_hl(0, "OilGitDeleted", { link = "MiniDiffSignDelete" }) vim.api.nvim_set_hl(0, "OilGitDeleted", { link = "MiniDiffSignDelete" })
-- vim.api.nvim_set_hl(0, "OilGitConflict", { link = "MiniDiffSignDelete" }) vim.api.nvim_set_hl(0, "OilGitConflict", { link = "MiniDiffSignDelete" })
-- vim.api.nvim_set_hl(0, "OilGitIgnored", { link = "Comment" }) vim.api.nvim_set_hl(0, "OilGitIgnored", { link = "Comment" })
-- end end
--
-- require("oil").setup({ require("oil").setup({
-- keymaps = { keymaps = {
-- ["<C-h>"] = false, ["<C-h>"] = false,
-- ["<C-j>"] = false, ["<C-j>"] = false,
-- ["<C-k>"] = false, ["<C-k>"] = false,
-- ["<C-l>"] = false, ["<C-l>"] = false,
-- ["gR"] = "actions.refresh", -- replaces default <C-l> behavior ["gR"] = "actions.refresh", -- replaces default <C-l> behavior
-- ["<F5>"] = "actions.refresh", ["<F5>"] = "actions.refresh",
-- ["<C-s>"] = false, ["<C-s>"] = false,
-- ["<C-p>"] = { "actions.preview", opts = { vertical = true, split = "belowright" } }, ["<C-p>"] = { "actions.preview", opts = { vertical = true, split = "belowright" } },
-- ["<BS>"] = { "actions.parent", mode = "n" }, ["<BS>"] = { "actions.parent", mode = "n" },
-- }, },
-- view_options = { view_options = {
-- show_hidden = true, show_hidden = true,
-- is_hidden_file = function(_, _) is_hidden_file = function(_, _)
-- return false return false
-- end, end,
-- is_always_hidden = function(name, _) is_always_hidden = function(name, _)
-- return name == ".git" return name == ".git"
-- end, end,
-- }, },
-- }) })
--
-- local oil_git_trie = require("oil-git.trie") local oil_git_trie = require("oil-git.trie")
-- local oil_git_lookup = oil_git_trie.lookup local oil_git_lookup = oil_git_trie.lookup
--
-- -- ugly internal monkey patch to not show partially git-ignored foldres as grey -- ugly internal monkey patch to not show partially git-ignored foldres as grey
-- rawset(oil_git_trie, "lookup", function(root, entry_path, git_root, exclude_ignored) rawset(oil_git_trie, "lookup", function(root, entry_path, git_root, exclude_ignored)
-- local status = oil_git_lookup(root, entry_path, git_root, exclude_ignored) local status = oil_git_lookup(root, entry_path, git_root, exclude_ignored)
-- if status ~= "!!" or exclude_ignored then if status ~= "!!" or exclude_ignored then
-- return status return status
-- end end
--
-- local relative_path = entry_path:sub(#git_root + 2) local relative_path = entry_path:sub(#git_root + 2)
-- local node = root local node = root
-- for segment in relative_path:gmatch("[^/\\]+") do for segment in relative_path:gmatch("[^/\\]+") do
-- node = node.children[segment] node = node.children[segment]
-- if not node then if not node then
-- return nil return nil
-- end end
-- end end
--
-- -- oil-git normally propagates an ignored child's status to every parent. -- oil-git normally propagates an ignored child's status to every parent.
-- -- Only grey a directory when Git reported that directory itself as ignored. -- Only grey a directory when Git reported that directory itself as ignored.
-- if not node.is_dir_ignored then if not node.is_dir_ignored then
-- return nil return nil
-- end end
--
-- return status return status
-- end) end)
--
-- require("oil-git").setup({ require("oil-git").setup({
-- show_file_highlights = true, show_file_highlights = true,
-- show_directory_highlights = true, show_directory_highlights = true,
-- show_ignored_files = true, show_ignored_files = true,
-- show_ignored_directories = true, show_ignored_directories = true,
-- show_file_symbols = true, show_file_symbols = true,
-- show_directory_symbols = true, show_directory_symbols = true,
-- symbol_position = "none", symbol_position = "none",
-- }) })
--
-- set_oil_git_highlights() set_oil_git_highlights()
-- vim.api.nvim_create_autocmd("ColorScheme", { vim.api.nvim_create_autocmd("ColorScheme", {
-- group = vim.api.nvim_create_augroup("romanzy_oil_git_highlights", { clear = true }), group = vim.api.nvim_create_augroup("romanzy_oil_git_highlights", { clear = true }),
-- callback = set_oil_git_highlights, callback = set_oil_git_highlights,
-- }) })
@@ -1 +0,0 @@
require("romanzy.custom.tabline").setup()