From 5f8170ec0acb6b055398103799d18a3697584eb7 Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Tue, 13 Jan 2026 15:27:20 -0500 Subject: modules/neovim: sync --- modules/neovim/default.nix | 17 +++++--- modules/neovim/nvim/lua/config/blink.lua | 2 +- modules/neovim/nvim/lua/config/colorscheme.lua | 55 ++++++++++++++++++++------ modules/neovim/nvim/lua/config/keybinds.lua | 7 ++++ modules/neovim/nvim/lua/config/lsp/conform.lua | 19 ++++----- modules/neovim/nvim/lua/config/lsp/init.lua | 1 + modules/neovim/nvim/lua/config/settings.lua | 14 ++++--- modules/neovim/nvim/lua/config/treesitter.lua | 6 +++ 8 files changed, 88 insertions(+), 33 deletions(-) diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index c3dfae2..5e3234f 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -78,6 +78,7 @@ in nixd lua-language-server cmake-language-server + starpls verible kdePackages.qtdeclarative ]; @@ -111,6 +112,9 @@ in nvim-treesitter-parsers.systemverilog nvim-treesitter-parsers.prolog nvim-treesitter-parsers.mlir + nvim-treesitter-parsers.starlark + + nvim-treesitter-textobjects nvim-lspconfig @@ -129,6 +133,7 @@ in # colorschemes. TODO: delete # base16-nvim tinted-nvim + kanagawa-nvim { plugin = nvim-highlight-colors; @@ -171,12 +176,12 @@ in config = # lua '' - require('ibl').setup({ - indent = { - char = '▏', - }, - scope = { enabled = false }, - }) + -- require('ibl').setup({ + -- indent = { + -- char = '▏', + -- }, + -- scope = { enabled = false }, + -- }) ''; } diff --git a/modules/neovim/nvim/lua/config/blink.lua b/modules/neovim/nvim/lua/config/blink.lua index 00491ad..ac49dc8 100644 --- a/modules/neovim/nvim/lua/config/blink.lua +++ b/modules/neovim/nvim/lua/config/blink.lua @@ -11,7 +11,7 @@ require("blink.cmp").setup({ list = { max_items = 6, }, - documentation = { auto_show = true, auto_show_delay_ms = 500 }, + documentation = { auto_show = false, auto_show_delay_ms = 500 }, ghost_text = { enabled = true }, }, signature = { enabled = true }, diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua index 0350cc3..ee7ed5b 100644 --- a/modules/neovim/nvim/lua/config/colorscheme.lua +++ b/modules/neovim/nvim/lua/config/colorscheme.lua @@ -1,20 +1,53 @@ vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args) -- local colors = require('base16-colorscheme').colors local colors = require('tinted-colorscheme').colors + -- i dislike syntax highlighting + -- vim.api.nvim_set_hl(0, 'Comment', {}) + vim.api.nvim_set_hl(0, 'Constant', {}) + -- vim.api.nvim_set_hl(0, 'String', {}) + vim.api.nvim_set_hl(0, 'Character', { link = "String" }) + vim.api.nvim_set_hl(0, 'Number', {}) + vim.api.nvim_set_hl(0, 'Boolean', {}) + vim.api.nvim_set_hl(0, 'Float', {}) + vim.api.nvim_set_hl(0, 'Identifier', {}) + vim.api.nvim_set_hl(0, 'Function', {}) + vim.api.nvim_set_hl(0, 'Statement', {}) + vim.api.nvim_set_hl(0, 'Conditional', {}) + vim.api.nvim_set_hl(0, 'Repeat', {}) + vim.api.nvim_set_hl(0, 'Label', {}) + vim.api.nvim_set_hl(0, 'Operator', {}) + vim.api.nvim_set_hl(0, 'Keyword', {}) + vim.api.nvim_set_hl(0, 'Exception', {}) + vim.api.nvim_set_hl(0, 'PreProc', {}) + vim.api.nvim_set_hl(0, 'Include', {}) + vim.api.nvim_set_hl(0, 'Define', {}) + vim.api.nvim_set_hl(0, 'Macro', {}) + vim.api.nvim_set_hl(0, 'PreCondit', {}) + vim.api.nvim_set_hl(0, 'Type', {}) + vim.api.nvim_set_hl(0, 'StorageClass', {}) + vim.api.nvim_set_hl(0, 'Structure', {}) + vim.api.nvim_set_hl(0, 'Typedef', {}) + vim.api.nvim_set_hl(0, 'Special', {}) + vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' }) + vim.api.nvim_set_hl(0, 'Tag', {}) + vim.api.nvim_set_hl(0, 'Delimiter', {}) + -- vim.api.nvim_set_hl(0, 'SpecialComment', {}) + vim.api.nvim_set_hl(0, 'Debug', {}) + -- vim.api.nvim_set_hl(0, 'Underlined', {}) vim.api.nvim_set_hl(0, 'FloatBorder', { fg = colors.base01 }) vim.api.nvim_set_hl(0, 'WinSeparator', { fg = colors.base01 }) vim.api.nvim_set_hl(0, 'WinBar', { fg = colors.base03 }) vim.api.nvim_set_hl(0, 'LineNr', { fg = colors.base02 }) - vim.api.nvim_set_hl(0, 'LineNrAbove', { fg = colors.base02 }) - vim.api.nvim_set_hl(0, 'LineNrBelow', { fg = colors.base02 }) - vim.api.nvim_set_hl(0, 'TSVariable', { fg = colors.base05 }) - vim.api.nvim_set_hl(0, 'Identifier', { fg = colors.base05 }) - vim.api.nvim_set_hl(0, 'Operator', { fg = colors.base08 }) - vim.api.nvim_set_hl(0, 'TSOperator', { fg = colors.base08 }) - vim.api.nvim_set_hl(0, 'TSCharacter', { fg = colors.base0B }) - vim.api.nvim_set_hl(0, 'TSOperator', { fg = colors.base08 }) - vim.api.nvim_set_hl(0, 'TSLabel', { fg = colors.base0C }) - vim.api.nvim_set_hl(0, 'Label', { fg = colors.base0C }) + -- vim.api.nvim_set_hl(0, 'LineNrAbove', { fg = colors.base02 }) + -- vim.api.nvim_set_hl(0, 'LineNrBelow', { fg = colors.base02 }) + -- vim.api.nvim_set_hl(0, 'TSVariable', { fg = colors.base05 }) + -- vim.api.nvim_set_hl(0, 'Identifier', { fg = colors.base05 }) + -- vim.api.nvim_set_hl(0, 'Operator', { fg = colors.base08 }) + -- vim.api.nvim_set_hl(0, 'TSOperator', { fg = colors.base08 }) + -- vim.api.nvim_set_hl(0, 'TSCharacter', { fg = colors.base0B }) + -- vim.api.nvim_set_hl(0, 'TSOperator', { fg = colors.base08 }) + -- vim.api.nvim_set_hl(0, 'TSLabel', { fg = colors.base0C }) + -- vim.api.nvim_set_hl(0, 'Label', { fg = colors.base0C }) vim.api.nvim_set_hl(0, 'DapBreakpoint', { bg = colors.base00, fg = colors.base08 }) vim.api.nvim_set_hl(0, 'DapStopped', { bg = colors.base00, fg = colors.base0B }) @@ -26,7 +59,7 @@ vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args) hi TabLineSel guibg=bg guifg=fg hi TabLine guibg=bg hi NormalFloat guibg=bg - hi StatusLine guibg=fg guifg=bg + hi StatusLine guibg=bg guifg=fg hi StatusLineNC guibg=bg ]] vim.api.nvim_set_hl(0, 'FzfLuaBorder', { fg = colors.base01 }) diff --git a/modules/neovim/nvim/lua/config/keybinds.lua b/modules/neovim/nvim/lua/config/keybinds.lua index 69c5ce3..a2b6fef 100644 --- a/modules/neovim/nvim/lua/config/keybinds.lua +++ b/modules/neovim/nvim/lua/config/keybinds.lua @@ -14,6 +14,10 @@ local function swapnv(bind1, bind2) swap({'n', 'v'}, bind1, bind2) end +function mapobject(bind, action, opts) + vim.keymap.set({"x", "o"}, bind, action, opts) +end + -- swapnv('m', 'h') -- swapnv('n', 'j') -- swapnv('e', 'k') @@ -51,6 +55,9 @@ nmap('?', 'Telescope live_grep', { silent = true }) nmap('to', 'te', { silent = true; desc = "Open a terminal buffer in the current window." }) +-- mapobject("]f", require("nvim-treesitter-textobjects.move").goto_next_start("@function.outer", "textobjects"), { desc = "jump to the start of the next function"}) +-- mapobject("[f", require("nvim-treesitter-textobjects.move").goto_prev_start("@function.outer", "textobjects"), { desc = "jump to the start of the previous function"}) + vim.api.nvim_create_autocmd({ 'FileType' }, { pattern = '*', callback = function() diff --git a/modules/neovim/nvim/lua/config/lsp/conform.lua b/modules/neovim/nvim/lua/config/lsp/conform.lua index 26e4e6c..879b8ce 100644 --- a/modules/neovim/nvim/lua/config/lsp/conform.lua +++ b/modules/neovim/nvim/lua/config/lsp/conform.lua @@ -1,14 +1,15 @@ -- unused for now require("conform").setup({ - formatters_by_ft = { - lua = { "stylua" }, - python = { "black", "isort" }, - zig = { "zigfmt" }, - nix = { "nixfmt" }, - c = { "clang-formt" }, - cpp = { "clang-format" }, - scala = { "scalafmt"} - }, + formatters_by_ft = { + lua = { "stylua" }, + python = { "black", "isort" }, + zig = { "zigfmt" }, + nix = { "nixfmt" }, + c = { "clang-formt" }, + cpp = { "clang-format" }, + scala = { "scalafmt" }, + bzl = { "buildifier" }, + }, }) vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" diff --git a/modules/neovim/nvim/lua/config/lsp/init.lua b/modules/neovim/nvim/lua/config/lsp/init.lua index ac3c204..29158e3 100644 --- a/modules/neovim/nvim/lua/config/lsp/init.lua +++ b/modules/neovim/nvim/lua/config/lsp/init.lua @@ -33,6 +33,7 @@ local servers = { qmlls = { cmd = {"qmlls", "-E"} }, + starpls = {} -- rust_analyzer = {} } diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua index 72c40b3..3bc1b0c 100644 --- a/modules/neovim/nvim/lua/config/settings.lua +++ b/modules/neovim/nvim/lua/config/settings.lua @@ -1,10 +1,11 @@ vim.g.mapleader = ' ' vim.loader.enable({enable = true}) -vim.o.relativenumber = true -vim.o.number = true +-- vim.o.relativenumber = true +-- vim.o.number = true +vim.o.number = false +vim.o.relativenumber = false vim.o.tabstop = 2 vim.o.shiftwidth = 2 -vim.o.relativenumber = true vim.o.splitright = true vim.o.splitbelow = true vim.o.scrolloff = 999 @@ -13,8 +14,9 @@ vim.o.linebreak = true vim.o.shortmess = "tToOFIsWcCi" vim.o.termguicolors = true vim.opt.fillchars = {eob = " "} -vim.o.smd = false -vim.opt.laststatus=3 +-- vim.o.smd = false +vim.o.smd = true +vim.opt.laststatus=0 vim.opt.cmdheight=1 vim.opt.pumheight = 6 -- vim.opt.pumborder = "rounded" @@ -28,4 +30,4 @@ vim.opt.foldlevelstart = 99 vim.opt.foldenable=true vim.cmd[[set wildchar=]] vim.cmd[[cnoreabbrev ts lua vim.treesitter.start()]] -require('vim._extui').enable({}) +-- require('vim._extui').enable({}) diff --git a/modules/neovim/nvim/lua/config/treesitter.lua b/modules/neovim/nvim/lua/config/treesitter.lua index 69588e1..b30781d 100644 --- a/modules/neovim/nvim/lua/config/treesitter.lua +++ b/modules/neovim/nvim/lua/config/treesitter.lua @@ -20,3 +20,9 @@ require("nvim-treesitter.configs").setup { -- end, -- }, } + +-- require("nvim-treesitter-textobjects").setup({ +-- select = { +-- lookahead = true, +-- }, +-- }) -- cgit v1.2.3