Merge branch 'main' of github.com:NotAShelf/neovim-flake into dev/extend-filetree

modules/languages/ts.nix

@@ -20,6 +20,17 @@ with builtins; let
         }
       '';
     };
+    denols = {
+      package = pkgs.deno;
+      lspConfig = ''
+        vim.g.markdown_fenced_languages = { "ts=typescript" }
+        lspconfig.denols.setup {
+          capabilities = capabilities;
+          on_attach = attach_keymaps,
+          cmd = { "${cfg.lsp.package}/bin/deno", "lsp" }
+        }
+      '';
+    };
   };
 
   # TODO: specify packages

modules/languages/zig.nix

@@ -9,7 +9,7 @@ with builtins; let
   cfg = config.vim.languages.zig;
 in {
   options.vim.languages.zig = {
-    enable = mkEnableOption "SQL language support";
+    enable = mkEnableOption "Zig language support";
 
     treesitter = {
       enable = mkEnableOption "Enable Zig treesitter" // {default = config.vim.languages.enableTreesitter;};

modules/lsp/nvim-code-action-menu/config.nix

@@ -16,5 +16,15 @@ in {
     vim.startPlugins = ["nvim-code-action-menu"];
 
     vim.maps.normal = mkSetBinding mappings.open ":CodeActionMenu<CR>";
+
+    vim.luaConfigRC.code-action-menu = nvim.dag.entryAnywhere ''
+      -- border configuration
+      vim.g.code_action_menu_window_border = '${config.vim.ui.borders.plugins.code-action-menu.style}'
+
+      -- show individual sections of the code action menu
+      ${lib.optionalString (cfg.nvimCodeActionMenu.show.details) "vim.g.code_action_menu_show_details = true"}
+      ${lib.optionalString (cfg.nvimCodeActionMenu.show.diff) "vim.g.code_action_menu_show_diff = true"}
+      ${lib.optionalString (cfg.nvimCodeActionMenu.show.actionKind) "vim.g.code_action_menu_show_action_kind = true"}
+    '';
   };
 }

modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix

@@ -4,6 +4,12 @@ with lib; {
     nvimCodeActionMenu = {
       enable = mkEnableOption "Enable nvim code action menu";
 
+      show = {
+        details = mkEnableOption "Show details" // {default = true;};
+        diff = mkEnableOption "Show diff" // {default = true;};
+        actionKind = mkEnableOption "Show action kind" // {default = true;};
+      };
+
       mappings = {
         open = mkMappingOption "Open code action menu [nvim-code-action-menu]" "<leader>ca";
       };

modules/theme/supported_themes.nix

@@ -60,7 +60,11 @@
           markdown = true,
           noice = true,
           notify = true, -- nvim-notify
-          which_key = true
+          which_key = true,
+          navic = {
+            enabled = false,
+            custom_bg = "NONE", -- "lualine" will set background to mantle
+          },
         },
       }
       -- setup must be called before loading

modules/ui/borders/borders.nix

@@ -38,6 +38,7 @@ in {
       lspsaga = mkPluginStyleOption "lspsaga";
       nvim-cmp = mkPluginStyleOption "nvim-cmp";
       lsp-signature = mkPluginStyleOption "lsp-signature";
+      code-action-menu = mkPluginStyleOption "code-actions-menu";
     };
   };
 }

modules/ui/breadcrumbs/config.nix

@@ -31,6 +31,10 @@ in {
       local navic = require("nvim-navic")
       local actions = require("nvim-navbuddy.actions")
 
+      require("nvim-navic").setup {
+        highlight = true
+      }
+
       -- TODO: wrap this in an optional string with navbuddy as the enable condition
       navbuddy.setup {
           window = {