From cacde55d482616ed0a17b07f5b5f87d443592646 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 13 Sep 2025 14:39:30 -0400 Subject: [PATCH] removing luaConfigPost, turning it into options property, added properties to diagnostics, among others --- home/neovim.nix | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/home/neovim.nix b/home/neovim.nix index f6d7ac3..8b360df 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -18,24 +18,23 @@ viAlias = true; vimAlias = true; - # setting some nvim settings that are not in nvf - luaConfigPost = '' - vim.opt.tabstop = 4 - vim.opt.shiftwidth = 4 - vim.opt.expandtab = true - vim.opt.autoindent = true - vim.opt.smartindent = true - vim.opt.smarttab = true - vim.opt.scrolloff = 12 - vim.opt.sidescrolloff = 8 - vim.opt.wrap = false - vim.opt.linebreak = false - vim.opt.number = true - vim.opt.relativgnumber = true - vim.opt.cursorline = true - vim.opt.signcolumn = "yes" - vim.opt.tabline = 2 - ''; + options = { + tabstop = 4; + shiftwidth = 4; + expandtab = true; + autoindent = true; + smartindent = true; + smarttab = true; + scrolloff = 12; + sidescrolloff = 8; + wrap = false; + linebreak = false; + number = true; + relativenumber = true; + cursorline = true; + signcolumn = "yes"; + tabline = "2"; + }; # clipboard configuration clipboard = { @@ -71,11 +70,13 @@ # disable spellcheck spellcheck.enable = false; - # enable diagnostics + # enable diagnostics (inline) diagnostics = { enable = true; config = { underline = true; + signs = true; + update_in_insert = false; virtual_lines = true; }; }; @@ -124,6 +125,10 @@ enable = true; package = pkgs.prettierd; }; + lsp = { + enable = true; + server = "ts_ls"; + }; }; lua.enable = false; python.enable = true; @@ -199,7 +204,7 @@ tabline = { nvimBufferline = { enable = true; - options = { + setupOpts.options = { numbers = "none"; }; mappings = {