From e27ee91adbfbf0ac547e47b4190cfb7437eb4432 Mon Sep 17 00:00:00 2001
From: Poby <87608318+smg1024@users.noreply.github.com>
Date: Thu, 26 Mar 2026 21:33:46 +0900
Subject: [PATCH] feat(editor): improve nvf navigation defaults

---
 modules/aspects/_editor/nvf/core/keymaps.nix | 42 ++++++++++++++++++++
 modules/aspects/_editor/nvf/core/options.nix | 11 +++++
 2 files changed, 53 insertions(+)

diff --git a/modules/aspects/_editor/nvf/core/keymaps.nix b/modules/aspects/_editor/nvf/core/keymaps.nix
index 9af6a8b..c3b497e 100755
--- a/modules/aspects/_editor/nvf/core/keymaps.nix
+++ b/modules/aspects/_editor/nvf/core/keymaps.nix
@@ -78,4 +78,46 @@
     action = "<Cmd>Oil --float<CR>";
     desc = "Open Current Directory";
   }
+  {
+    key = "n";
+    mode = "n";
+    action = "nzzzv";
+    desc = "Next search result (centered)";
+  }
+  {
+    key = "N";
+    mode = "n";
+    action = "Nzzzv";
+    desc = "Previous search result (centered)";
+  }
+  {
+    key = "<C-d>";
+    mode = "n";
+    action = "<C-d>zz";
+    desc = "Half page down (centered)";
+  }
+  {
+    key = "<C-u>";
+    mode = "n";
+    action = "<C-u>zz";
+    desc = "Half page up (centered)";
+  }
+  {
+    key = "<";
+    mode = "v";
+    action = "<gv";
+    desc = "Indent left and reselect";
+  }
+  {
+    key = ">";
+    mode = "v";
+    action = ">gv";
+    desc = "Indent right and reselect";
+  }
+  {
+    key = "J";
+    mode = "n";
+    action = "mzJ`z";
+    desc = "Join lines and keep cursor position";
+  }
 ]
diff --git a/modules/aspects/_editor/nvf/core/options.nix b/modules/aspects/_editor/nvf/core/options.nix
index 705da07..e2218e1 100755
--- a/modules/aspects/_editor/nvf/core/options.nix
+++ b/modules/aspects/_editor/nvf/core/options.nix
@@ -9,4 +9,15 @@
   termguicolors = true;
   splitbelow = true;
   splitright = true;
+
+  # NVF unofficial
+  scrolloff = 10;
+  sidescrolloff = 8;
+  softtabstop = 2;
+  smartindent = true;
+  ignorecase = true;
+  smartcase = true;
+  foldmethod = "expr";
+  foldexpr = "v:lua.vim.treesitter.foldexpr()";
+  foldlevel = 99;
 }