From f5f0d7bc38095aebe74ebf2a97ba823a8a57b8b8 Mon Sep 17 00:00:00 2001 From: triethyl Date: Tue, 26 Aug 2025 18:35:14 -0400 Subject: neovim: misc changes --- pkgs/custom-neovim/config/lua/options.lua | 6 ++++++ pkgs/custom-neovim/config/lua/statusline.lua | 5 ++++- pkgs/custom-neovim/default.nix | 1 + pkgs/custom-neovim/todo.md | 4 +++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/custom-neovim/config/lua/options.lua b/pkgs/custom-neovim/config/lua/options.lua index 67c4469..2fdb796 100644 --- a/pkgs/custom-neovim/config/lua/options.lua +++ b/pkgs/custom-neovim/config/lua/options.lua @@ -51,3 +51,9 @@ vim.o.shiftround = true -- use multiple of shiftwidth when indenting with "<" an vim.o.backup = false -- create a backup file vim.o.swapfile = false -- creates a swapfile vim.o.writebackup = false -- if a file is being edited by another program, it is not allowed to be edited + +-- Autocommands + +-- Prevent Comments on Newlines +-- c: wrap text to textwidth, r: add comment when pressing enter in insert mode, o: add comment when pressing o +vim.api.nvim_create_autocmd("BufEnter", { callback = function() vim.opt.formatoptions = vim.opt.formatoptions - { "c","r","o" } end, }) diff --git a/pkgs/custom-neovim/config/lua/statusline.lua b/pkgs/custom-neovim/config/lua/statusline.lua index e4b336b..fa16cd8 100644 --- a/pkgs/custom-neovim/config/lua/statusline.lua +++ b/pkgs/custom-neovim/config/lua/statusline.lua @@ -114,6 +114,9 @@ components.progress = function (args) local before = args.before or "" local after = args.after or "" + -- Neovide breaks this component. + if vim.g.neovide then return "" end + local sbar = { '🭶', '🭷', '🭸', '🭹', '🭺', '🭻' } local curr_line = vim.api.nvim_win_get_cursor(0)[1] or 0 local lines = vim.api.nvim_buf_line_count(0) or 0 @@ -237,7 +240,7 @@ local statusline = function () "%=", components.diagnostics(), - components.location({after = ""}), + components.location({after = vim.g.neovide and " " or ""}), components.progress({after = ""}), } end diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index bbbc040..ae92ae1 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -54,6 +54,7 @@ inputs.mnw.lib.wrap pkgs { extraBinPath = with pkgs; [ # LSP Servers lua-language-server + marksman # Extra Utils ripgrep diff --git a/pkgs/custom-neovim/todo.md b/pkgs/custom-neovim/todo.md index f501044..fc84b99 100644 --- a/pkgs/custom-neovim/todo.md +++ b/pkgs/custom-neovim/todo.md @@ -5,4 +5,6 @@ - add git commands (add all and status) - add winbar - add tab bar -- add noice +- add zoxide plugin +- add markdown renderer +- add markdown lsp -- cgit v1.2.3