modified: modules/completion/nvim-cmp/nvim-cmp.nix

extra.nix

@@ -93,7 +93,7 @@ inputs: let
       vim.autopairs.enable = true;
 
       vim.autocomplete = {
-        enable = false;
+        enable = true;
         type = "nvim-cmp";
       };
 

modules/completion/nvim-cmp/nvim-cmp.nix

@@ -49,10 +49,13 @@ with builtins; {
           '';
           type = types.str;
           default = "nvim_cmp_menu_map";
-          example = ''
+          example = nvim.nmd.literalAsciiDoc ''
+            [source,lua]
+            ---
             function(entry, vim_item)
               return vim_item
             end
+            ---
           '';
         };
       };

modules/lsp/config.nix

@@ -12,7 +12,7 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = optional usingNvimCmp "cmp-nvim-lsp";
 
-    vim.autocomplete.sources = ["nvim_lsp"];
+    vim.autocomplete.sources = {"nvim_lsp" = "[LSP]";};
 
     vim.luaConfigRC.lsp-setup = ''
       vim.g.formatsave = ${boolToString cfg.formatOnSave};

modules/statusline/lualine/lualine.nix

@@ -42,11 +42,12 @@ in {
       default = true;
     };
 
-    theme = mkOption {
+    theme = let
+      themeSupported = elem config.vim.theme.name supported_themes;
+    in
+      mkOption {
         description = "Theme for lualine";
-      default = "auto";
-      type = types.enum (
-        [
+        type = types.enum ([
             "auto"
             "16color"
             "gruvbox"
@@ -79,8 +80,11 @@ in {
             "tomorrow"
             "wombat"
           ]
-        ++ optional (elem config.vim.theme.name supported_themes) config.vim.theme.name
-      );
+          ++ optional themeSupported config.vim.theme.name);
+        default = "auto";
+        # TODO: xml generation error if the closing '' is on a new line.
+        # issue: https://gitlab.com/rycee/nmd/-/issues/10
+        defaultText = nvim.nmd.literalAsciiDoc ''`config.vim.theme.name` if theme supports lualine else "auto"'';
       };
 
     sectionSeparator = {

modules/visuals/visuals.nix

@@ -4,7 +4,9 @@
   ...
 }:
 with lib;
-with builtins; {
+with builtins; let
+  cfg = config.vim.visuals;
+in {
   options.vim.visuals = {
     enable = mkEnableOption "Visual enhancements.";