2e9441f367
- Drop modules/dotfiles-rebuild.nix and its imports in clan.nix; sunken-ship + phantom-ship no longer ship the legacy 15-min rebuild-from-git timer. - Add dm-pull-deploy-push systemd timer on sunken-ship: every 15min runs dm-send-deploy to announce origin/main rev via data-mesher gossip (sunken is the dm-pull-deploy push node). - Fix mulbo-pull service path: add openssh so 'git fetch' over an SSH remote stops failing with 'cannot run ssh'. - vps-relay authorized_keys: rename Mac key comment to mac-admin, add sunken-ship's actual ed25519 key for ZT mesh debugging. - home.nix: add cinny-desktop (Matrix client). - neovim: enable cursorline.
78 lines
2.4 KiB
Nix
78 lines
2.4 KiB
Nix
{ pkgs, ... }:
|
|
|
|
{
|
|
programs.neovim = {
|
|
enable = true;
|
|
defaultEditor = true;
|
|
withRuby = false;
|
|
withPython3 = false;
|
|
|
|
# VimScript settings (options that have no Lua equivalent or are simpler in vim)
|
|
extraConfig = ''
|
|
set title
|
|
set nohlsearch
|
|
set number
|
|
let mapleader=","
|
|
|
|
colorscheme catppuccin
|
|
|
|
" netrw (dir listing) settings
|
|
let g:netrw_liststyle = 3
|
|
let g:netrw_banner = 0
|
|
let g:netrw_browse_split = 3
|
|
let g:netrw_winsize = 25
|
|
'';
|
|
|
|
initLua = ''
|
|
-- Auto-detect system theme (dark/light) from marker file
|
|
local config_file = os.getenv("HOME") .. "/.local/share/nvim_color_scheme"
|
|
local f = io.open(config_file, "r")
|
|
if f then
|
|
local theme = f:read("*l")
|
|
f:close()
|
|
if theme then
|
|
theme = theme:gsub("^%s+", ""):gsub("%s+$", "")
|
|
end
|
|
if theme == "dark" or theme == "light" then
|
|
vim.opt.background = theme
|
|
else
|
|
vim.notify("nvim_color_scheme: expected 'light' or 'dark', got: " .. tostring(theme), vim.log.levels.WARN)
|
|
end
|
|
end
|
|
|
|
-- General options
|
|
vim.opt.cursorline = true
|
|
vim.opt.mouse = "a"
|
|
vim.opt.listchars = { tab = "→ ", space = "·", nbsp = "␣", trail = "•", eol = "¶", precedes = "«", extends = "»" }
|
|
vim.opt.clipboard:append("unnamedplus")
|
|
vim.opt.spell = true
|
|
vim.opt.spelllang = "en_us"
|
|
|
|
-- Markdown: fold by heading/section using Treesitter
|
|
vim.api.nvim_create_autocmd("FileType", {
|
|
pattern = "markdown",
|
|
callback = function()
|
|
vim.opt_local.foldmethod = "expr"
|
|
vim.opt_local.foldexpr = "v:lua.vim.treesitter.foldexpr()"
|
|
vim.opt_local.foldenable = true
|
|
end,
|
|
})
|
|
|
|
-- Keymaps
|
|
vim.keymap.set("n", "S", ":%s//g<Left><Left>", { desc = "Replace all" })
|
|
vim.keymap.set("n", "<leader>w", ":w<CR>", { desc = "Save file" })
|
|
'';
|
|
|
|
plugins = with pkgs.vimPlugins; [
|
|
vim-surround # shortcuts for setting () {} etc.
|
|
vim-gitgutter # git diff in sign column
|
|
vim-nix # nix highlight
|
|
fzf-lua # fuzzy finder through lua
|
|
nerdtree # file structure inside nvim
|
|
rainbow # color parenthesis
|
|
catppuccin-nvim # theme
|
|
goyo-vim # write prose
|
|
limelight-vim # prose paragraph highlighter
|
|
];
|
|
};
|
|
}
|