docs/release-notes/rl-0.8.md

@@ -106,7 +106,6 @@
 - Add [blink.cmp] support.
 - Add `LazyFile` user event.
 - Migrate language modules from none-ls to conform/nvim-lint
-- Add tsx support in conform and lint
 
 [diniamo](https://github.com/diniamo):
 
@@ -199,7 +198,6 @@
   Inspiration from `vim.languages.clang.dap` implementation.
 - Add [leetcode.nvim] plugin under `vim.utility.leetcode-nvim`.
 - Add [codecompanion.nvim] plugin under `vim.assistant.codecompanion-nvim`.
-- Fix [codecompanion-nvim] plugin: nvim-cmp error and setupOpts defaults.
 
 [nezia1](https://github.com/nezia1):
 
@@ -289,7 +287,6 @@
 [rice-cracker-dev](https://github.com/rice-cracker-dev):
 
 - `eslint_d` now checks for configuration files to load.
-- Fixed an error where `eslint_d` fails to load.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
@@ -303,9 +300,7 @@
 - Add neo-tree integration for Bufferline.
 - Add more applicable filetypes to illuminate denylist.
 - Disable mini.indentscope for applicable filetypes.
-- Fix fzf-lua having a hard dependency on fzf.
 - Enable inlay hints support - `config.vim.lsp.inlayHints`.
-- Add `neo-tree` extension to `lualine`.
 
 [tebuevd](https://github.com/tebuevd):
 
@@ -318,12 +313,9 @@
 [ckoehler](https://github.com/ckoehler):
 
 [flash.nvim]: https://github.com/folke/flash.nvim
-[gitlinker.nvim]: https://github.com/linrongbin16/gitlinker.nvim
 
 - Fix oil config referencing snacks
 - Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim`
-- Fix default telescope ignore list entry for '.git/' to properly match
-- Add [gitlinker.nvim] plugin to `vim.git.gitlinker-nvim`
 
 [rrvsh](https://github.com/rrvsh):
 

modules/plugins/assistant/codecompanion/codecompanion-nvim.nix

@@ -9,14 +9,7 @@ in {
 
       setupOpts = mkPluginSetupOption "codecompanion-nvim" {
         opts = {
-          send_code =
-            mkEnableOption ""
-            // {
-              default = true;
-              description = ''
-                Whether to enable code being sent to the LLM.
-              '';
-            };
+          send_code = mkEnableOption "code from being sent to the LLM.";
 
           log_level = mkOption {
             type = enum ["DEBUG" "INFO" "ERROR" "TRACE"];
@@ -37,10 +30,7 @@ in {
               mkEnableOption ""
               // {
                 default = true;
-                description = ''
-                  Whether to enable a diff view
-                  to see the changes made by the LLM.
-                '';
+                description = "a diff view to see the changes made by the LLM.";
               };
 
             close_chat_at = mkOption {
@@ -74,12 +64,7 @@ in {
           };
 
           chat = {
-            auto_scroll =
-              mkEnableOption ""
-              // {
-                default = true;
-                description = "Whether to enable automatic page scrolling.";
-              };
+            auto_scroll = mkEnableOption "automatic page scrolling.";
 
             show_settings = mkEnableOption ''
               LLM settings to appear at the top of the chat buffer.
@@ -100,18 +85,14 @@ in {
               mkEnableOption ""
               // {
                 default = true;
-                description = ''
-                  Whether to enable references in the chat buffer.
-                '';
+                description = "references in the chat buffer.";
               };
 
             show_token_count =
               mkEnableOption ""
               // {
                 default = true;
-                description = ''
-                  Whether to enable the token count for each response.
-                '';
+                description = "the token count for each response.";
               };
 
             intro_message = mkOption {
@@ -174,10 +155,7 @@ in {
                 mkEnableOption ""
                 // {
                   default = true;
-                  description = ''
-                    Whether to enable showing default
-                    actions in the action palette.
-                  '';
+                  description = "showing default actions in the action palette.";
                 };
 
               show_default_prompt_library =
@@ -185,8 +163,7 @@ in {
                 // {
                   default = true;
                   description = ''
-                    Whether to enable showing default
-                    prompt library in the action palette.
+                    showing default prompt library in the action palette.
                   '';
                 };
             };

modules/plugins/assistant/codecompanion/config.nix

@@ -22,11 +22,6 @@ in {
       };
 
       treesitter.enable = true;
-
-      autocomplete.nvim-cmp = {
-        sources = {codecompanion-nvim = "[codecompanion]";};
-        sourcePlugins = ["codecompanion-nvim"];
-      };
     };
   };
 }

modules/plugins/git/default.nix

@@ -5,7 +5,6 @@ in {
     ./gitsigns
     ./vim-fugitive
     ./git-conflict
-    ./gitlinker-nvim
   ];
 
   options.vim.git = {
@@ -16,7 +15,6 @@ in {
       * gitsigns
       * vim-fugitive
       * git-conflict
-      * gitlinker-nvim
     '';
   };
 }

modules/plugins/git/gitlinker-nvim/config.nix

@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-
-  cfg = config.vim.git.gitlinker-nvim;
-in {
-  config = mkIf cfg.enable {
-    vim = {
-      startPlugins = ["gitlinker-nvim"];
-      lazy.plugins = {
-        "gitlinker-nvim" = {
-          package = "gitlinker-nvim";
-          setupModule = "gitlinker";
-          inherit (cfg) setupOpts;
-          cmd = ["GitLink"];
-        };
-      };
-    };
-  };
-}

modules/plugins/git/gitlinker-nvim/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./gitlinker-nvim.nix
-  ];
-}

modules/plugins/git/gitlinker-nvim/gitlinker-nvim.nix

@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.git.gitlinker-nvim = {
-    enable = mkEnableOption "gitlinker-nvim" // {default = config.vim.git.enable;};
-    setupOpts = mkPluginSetupOption "gitlinker-nvim" {};
-  };
-}

modules/plugins/languages/astro.nix

@@ -62,7 +62,7 @@
             local markers = { "eslint.config.js", "eslint.config.mjs",
               ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
             for _, filename in ipairs(markers) do
-              local path = vim.fs.joinpath(cwd, filename)
+              local path = vim.fs.join(cwd, filename)
               if vim.loop.fs_stat(path) then
                 return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
               end

modules/plugins/languages/svelte.nix

@@ -61,7 +61,7 @@
             local markers = { "eslint.config.js", "eslint.config.mjs",
               ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
             for _, filename in ipairs(markers) do
-              local path = vim.fs.joinpath(cwd, filename)
+              local path = vim.fs.join(cwd, filename)
               if vim.loop.fs_stat(path) then
                 return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
               end

modules/plugins/languages/ts.nix

@@ -103,7 +103,7 @@
             local markers = { "eslint.config.js", "eslint.config.mjs",
               ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
             for _, filename in ipairs(markers) do
-              local path = vim.fs.joinpath(cwd, filename)
+              local path = vim.fs.join(cwd, filename)
               if vim.loop.fs_stat(path) then
                 return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
               end
@@ -204,13 +204,9 @@ in {
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.typescript = [cfg.format.type];
-          # .tsx files
-          formatters_by_ft.typescriptreact = [cfg.format.type];
-          formatters.${cfg.format.type} = {
-            command = getExe cfg.format.package;
-          };
+        setupOpts.formatters_by_ft.typescript = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
@@ -219,7 +215,6 @@ in {
       vim.diagnostics.nvim-lint = {
         enable = true;
         linters_by_ft.typescript = cfg.extraDiagnostics.types;
-        linters_by_ft.typescriptreact = cfg.extraDiagnostics.types;
 
         linters = mkMerge (map (name: {
             ${name}.cmd = getExe diagnosticsProviders.${name}.package;

modules/plugins/statusline/lualine/config.nix

@@ -14,18 +14,13 @@
   bCfg = config.vim.ui.breadcrumbs;
 in {
   config = mkMerge [
+    # TODO: move into nvim-tree file
     (mkIf config.vim.filetree.nvimTree.enable {
       vim.statusline.lualine.setupOpts = {
         extensions = ["nvim-tree"];
       };
     })
 
-    (mkIf config.vim.filetree.neo-tree.enable {
-      vim.statusline.lualine.setupOpts = {
-        extensions = ["neo-tree"];
-      };
-    })
-
     (mkIf (bCfg.enable && bCfg.lualine.winbar.enable && bCfg.source == "nvim-navic") {
       vim.statusline.lualine.setupOpts = {
         # TODO: rewrite in new syntax

modules/plugins/utility/fzf-lua/fzf-lua.nix

@@ -1,21 +1,15 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
-  inherit (lib.types) enum str;
+  inherit (lib.types) nullOr enum;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.nvim.types) mkPluginSetupOption borderType;
 in {
   options.vim.fzf-lua = {
     enable = mkEnableOption "fzf-lua";
     setupOpts = mkPluginSetupOption "fzf-lua" {
-      fzf_bin = mkOption {
-        type = str;
-        default = "${lib.getExe pkgs.fzf}";
-        description = "Path to fzf executable";
-      };
       winopts.border = mkOption {
         type = borderType;
         default = config.vim.ui.borders.globalStyle;

modules/plugins/utility/telescope/telescope.nix

@@ -117,7 +117,7 @@
       file_ignore_patterns = mkOption {
         description = "A table of lua regex that define the files that should be ignored.";
         type = listOf str;
-        default = ["node_modules" "%.git/" "dist/" "build/" "target/" "result/"];
+        default = ["node_modules" ".git/" "dist/" "build/" "target/" "result/"];
       };
       color_devicons = mkOption {
         description = "Boolean if devicons should be enabled or not.";

npins/sources.json

@@ -562,19 +562,6 @@
       "url": "https://github.com/projekt0n/github-nvim-theme/archive/c106c9472154d6b2c74b74565616b877ae8ed31d.tar.gz",
       "hash": "1w7lz4bgfm8hq1mir4hcr8ik585d4l4w7bjl8yl3g3zklj8223pw"
     },
-    "gitlinker-nvim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "linrongbin16",
-        "repo": "gitlinker.nvim"
-      },
-      "branch": "master",
-      "submodules": false,
-      "revision": "23982c86f50a9c3f4bc531d41b7a4a68ddd12355",
-      "url": "https://github.com/linrongbin16/gitlinker.nvim/archive/23982c86f50a9c3f4bc531d41b7a4a68ddd12355.tar.gz",
-      "hash": "1kz3gpdysxzpb27izhq0jgk59xw01mmnfvg5yrqvxnfhyjblxvqh"
-    },
     "gitsigns-nvim": {
       "type": "Git",
       "repository": {