chore: clean up tree-wide

homes/x86_64-linux/rafiq/cli/editor/_nvf/autocomplete.nix

@@ -3,28 +3,23 @@
   blink-cmp = {
     enable = true;
     friendly-snippets.enable = true;
-    sourcePlugins = {
-      ripgrep.enable = true;
-    };
+    sourcePlugins.ripgrep.enable = true;
     setupOpts = {
-      completion.documentation.auto_show_delay_ms = 0;
-      signature.enabled = true;
+      # Disable completion in markdown files
+      # TODO: Disable completion when in comments
       enabled =
         lib.generators.mkLuaInline
           # lua
           ''
-            --- Disable completion for markdown
             function()
               return not vim.tbl_contains({"markdown"}, vim.bo.filetype)
                 and vim.bo.buftype ~= "prompt"
                 and vim.b.completion ~= false
             end
           '';
-      cmdline = {
-        enabled = true;
-        sources = null;
-        completion.menu.auto_show = false;
-      };
+      completion.documentation.auto_show_delay_ms = 0;
+      # Show e.g. function parameters
+      signature.enabled = true;
     };
   };
 }

homes/x86_64-linux/rafiq/cli/editor/_nvf/binds.nix

@@ -1,15 +1,6 @@
 {
-  hardtime-nvim = {
-    enable = true;
-    setupOpts = {
-      max_count = 1;
-      disabled_keys = {
-        "<Up>" = [ ];
-        "<Down>" = [ ];
-        "<Right>" = [ ];
-        "<Left>" = [ ];
-      };
-    };
-  };
+  hardtime-nvim.enable = true;
+  # Hint when movements are inefficient but don't block
+  hardtime-nvim.setupOpts.restriction_mode = "hint";
   whichKey.enable = true;
 }

homes/x86_64-linux/rafiq/cli/editor/_nvf/keymaps.nix

@@ -1,23 +0,0 @@
-[
-  {
-    desc = "Open the file path under the cursor, making the file if it doesn't exist.";
-    key = "gf";
-    mode = "n";
-    action = ":cd %:p:h<CR>:e <cfile><CR>";
-    silent = true;
-  }
-  {
-    desc = "";
-    key = "<C-u>";
-    mode = "n";
-    action = "<C-u>zz";
-    silent = true;
-  }
-  {
-    desc = "";
-    key = "<C-d>";
-    mode = "n";
-    action = "<C-d>zz";
-    silent = true;
-  }
-]

homes/x86_64-linux/rafiq/cli/editor/_nvf/lsp.nix

@@ -1,7 +1,9 @@
 {
   enable = true;
+  # Show virtual text hints
   inlayHints.enable = true;
   lightbulb.enable = true;
+  # Show icons for lsp actions
   lspkind.enable = true;
   null-ls.enable = true;
   otter-nvim = {

homes/x86_64-linux/rafiq/cli/editor/_nvf/notes.nix

@@ -1,3 +0,0 @@
-{
-  todo-comments.enable = true;
-}

homes/x86_64-linux/rafiq/cli/editor/_nvf/options.nix

@@ -1,9 +0,0 @@
-{
-  autoindent = true;
-  backspace = "indent,eol,start";
-  cursorline = true;
-  expandtab = true;
-  shiftwidth = 2;
-  smartindent = true;
-  tabstop = 2;
-}

homes/x86_64-linux/rafiq/cli/editor/_nvf/treesitter.nix

@@ -1,6 +0,0 @@
-{
-  autotagHtml = true;
-  fold = true;
-  indent.disable = [ "markdown" ];
-  textobjects.enable = true;
-}

homes/x86_64-linux/rafiq/cli/editor/_nvf/ui.nix

@@ -4,10 +4,13 @@
     globalStyle = "rounded";
   };
   breadcrumbs.enable = true;
+  # Show color values e.g. #ffffff
   colorizer.enable = true;
+  # Highlight matching symbols
   illuminate.enable = true;
   noice.enable = true;
   noice.setupOpts.notify.enabled = false;
+  # Make folds look nicer
   nvim-ufo.enable = true;
   smartcolumn.enable = true;
 }

homes/x86_64-linux/rafiq/cli/editor/_nvf/utility.nix

@@ -1,6 +1,4 @@
 {
-  ccc.enable = true;
-  mkdir.enable = true;
   motion.hop.enable = true;
   yazi-nvim = {
     enable = true;

homes/x86_64-linux/rafiq/cli/editor/_nvf/visuals.nix

@@ -2,7 +2,6 @@
   indent-blankline.enable = true;
   fidget-nvim.enable = true;
   fidget-nvim.setupOpts.notification.override_vim_notify = true;
-  nvim-cursorline.enable = true;
   nvim-web-devicons.enable = true;
   rainbow-delimiters.enable = true;
 }

homes/x86_64-linux/rafiq/cli/editor/default.nix

@@ -1,31 +1,45 @@
-{ lib, pkgs, ... }:
-let
-  inherit (lib) singleton;
-in
 {
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+{
+  imports = [ inputs.nvf.homeManagerModules.default ];
   home.sessionVariables.EDITOR = "nvim";
-  persistDirs = singleton ".local/share/nvf";
   programs.nvf.enable = true;
   programs.nvf.settings.vim = {
-    hideSearchHighlight = true;
     syntaxHighlighting = true;
-    telescope.enable = true;
+    hideSearchHighlight = true;
     searchCase = "ignore";
+    undoFile.enable = true;
+    telescope.enable = true;
     fzf-lua.enable = true;
     git.enable = true;
-    undoFile.enable = true;
     autopairs.nvim-autopairs.enable = true;
     autocomplete = import ./_nvf/autocomplete.nix { inherit lib; };
     binds = import ./_nvf/binds.nix;
-    keymaps = import ./_nvf/keymaps.nix;
     languages = import ./_nvf/languages.nix;
     lsp = import ./_nvf/lsp.nix;
     navigation = import ./_nvf/navigation.nix;
-    notes = import ./_nvf/notes.nix;
-    options = import ./_nvf/options.nix;
+    notes.todo-comments.enable = true;
+    options = {
+      autoindent = true;
+      backspace = "indent,eol,start";
+      cursorline = true;
+      expandtab = true;
+      shiftwidth = 2;
+      smartindent = true;
+      tabstop = 2;
+    };
     snippets = import ./_nvf/snippets.nix { inherit pkgs; };
     statusline = import ./_nvf/statusline.nix;
-    treesitter = import ./_nvf/treesitter.nix;
+    treesitter = {
+      autotagHtml = true;
+      fold = true;
+      indent.disable = [ "markdown" ];
+      textobjects.enable = true;
+    };
     ui = import ./_nvf/ui.nix;
     utility = import ./_nvf/utility.nix;
     visuals = import ./_nvf/visuals.nix;