From 65815ff11f6bc297c5b5d0ce4ab034b9310cf54a Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Tue, 3 Jun 2025 08:37:27 +0800 Subject: [PATCH] chore(nvf): slight revamp n cleanup --- modules/home/cli/editor/nvf/autocomplete.nix | 5 ----- modules/home/cli/editor/nvf/binds.nix | 20 ++++---------------- modules/home/cli/editor/nvf/clipboard.nix | 4 ---- modules/home/cli/editor/nvf/diagnostics.nix | 4 ---- modules/home/cli/editor/nvf/options.nix | 1 + modules/home/cli/editor/nvf/treesitter.nix | 1 - modules/home/cli/editor/nvf/ui.nix | 12 ++---------- modules/home/cli/editor/nvf/utility.nix | 1 - modules/home/cli/editor/nvf/visuals.nix | 2 +- 9 files changed, 8 insertions(+), 42 deletions(-) diff --git a/modules/home/cli/editor/nvf/autocomplete.nix b/modules/home/cli/editor/nvf/autocomplete.nix index 65193a3..6b8fd11 100644 --- a/modules/home/cli/editor/nvf/autocomplete.nix +++ b/modules/home/cli/editor/nvf/autocomplete.nix @@ -3,12 +3,7 @@ blink-cmp = { enable = true; friendly-snippets.enable = true; - mappings = { - next = ""; # FIXME: results in the menu appearing when navigating - previous = ""; - }; sourcePlugins = { - emoji.enable = true; ripgrep.enable = true; spell.enable = true; }; diff --git a/modules/home/cli/editor/nvf/binds.nix b/modules/home/cli/editor/nvf/binds.nix index 9c83180..821c181 100644 --- a/modules/home/cli/editor/nvf/binds.nix +++ b/modules/home/cli/editor/nvf/binds.nix @@ -4,22 +4,10 @@ setupOpts = { max_count = 1; disabled_keys = { - "" = [ - "n" - "x" - ]; - "" = [ - "n" - "x" - ]; - "" = [ - "n" - "x" - ]; - "" = [ - "n" - "x" - ]; + "" = [ ]; + "" = [ ]; + "" = [ ]; + "" = [ ]; }; }; }; diff --git a/modules/home/cli/editor/nvf/clipboard.nix b/modules/home/cli/editor/nvf/clipboard.nix index a6eaa9a..2c63c08 100644 --- a/modules/home/cli/editor/nvf/clipboard.nix +++ b/modules/home/cli/editor/nvf/clipboard.nix @@ -1,6 +1,2 @@ { - enable = true; - #FIXME: List doenst work for some reason - registers = "unnamedplus"; - providers.wl-copy.enable = true; } diff --git a/modules/home/cli/editor/nvf/diagnostics.nix b/modules/home/cli/editor/nvf/diagnostics.nix index 6b1d100..2c63c08 100644 --- a/modules/home/cli/editor/nvf/diagnostics.nix +++ b/modules/home/cli/editor/nvf/diagnostics.nix @@ -1,6 +1,2 @@ { - nvim-lint = { - enable = true; - lint_after_save = true; - }; } diff --git a/modules/home/cli/editor/nvf/options.nix b/modules/home/cli/editor/nvf/options.nix index 50d92d3..810172a 100644 --- a/modules/home/cli/editor/nvf/options.nix +++ b/modules/home/cli/editor/nvf/options.nix @@ -1,4 +1,5 @@ { + scroll = 1; autoindent = true; backspace = "indent,eol,start"; cursorline = true; diff --git a/modules/home/cli/editor/nvf/treesitter.nix b/modules/home/cli/editor/nvf/treesitter.nix index 4c0c3ed..eca9ae9 100644 --- a/modules/home/cli/editor/nvf/treesitter.nix +++ b/modules/home/cli/editor/nvf/treesitter.nix @@ -1,7 +1,6 @@ { autotagHtml = true; fold = true; - context.enable = true; indent.disable = [ "markdown" ]; textobjects.enable = true; } diff --git a/modules/home/cli/editor/nvf/ui.nix b/modules/home/cli/editor/nvf/ui.nix index f85d55b..8ef0255 100644 --- a/modules/home/cli/editor/nvf/ui.nix +++ b/modules/home/cli/editor/nvf/ui.nix @@ -3,18 +3,10 @@ enable = true; globalStyle = "rounded"; }; - breadcrumbs = { - enable = true; - navbuddy.enable = true; - }; + breadcrumbs.enable = true; colorizer.enable = true; illuminate.enable = true; - noice = { - enable = true; - setupOpts = { - notify.enabled = true; - }; - }; + noice.enable = true; nvim-ufo.enable = true; smartcolumn.enable = true; } diff --git a/modules/home/cli/editor/nvf/utility.nix b/modules/home/cli/editor/nvf/utility.nix index eb99823..0ebda59 100644 --- a/modules/home/cli/editor/nvf/utility.nix +++ b/modules/home/cli/editor/nvf/utility.nix @@ -2,7 +2,6 @@ ccc.enable = true; leetcode-nvim.enable = true; mkdir.enable = true; - motion.leap.enable = true; motion.hop.enable = true; vim-wakatime.enable = true; yazi-nvim = { diff --git a/modules/home/cli/editor/nvf/visuals.nix b/modules/home/cli/editor/nvf/visuals.nix index 82b7575..65a8d5c 100644 --- a/modules/home/cli/editor/nvf/visuals.nix +++ b/modules/home/cli/editor/nvf/visuals.nix @@ -1,7 +1,7 @@ { indent-blankline.enable = true; fidget-nvim.enable = true; - # fidget-nvim.setupOpts.notification.override_vim_notify = true; + fidget-nvim.setupOpts.notification.override_vim_notify = true; nvim-cursorline.enable = true; nvim-web-devicons.enable = true; rainbow-delimiters.enable = true;