Merge 41e5633550 into b7bea89d9a

docs/release-notes/rl-0.8.md

@@ -13,9 +13,6 @@
 - Add [render-markdown.nvim] under
   `languages.markdown.extensions.render-markdown-nvim`
 
-- Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
-  in gitsigns configuration.
-
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
@@ -28,9 +25,3 @@
 
 - Disable the built-in format-on-save feature of zls. Use `vim.lsp.formatOnSave`
   instead.
-
-[horriblename](https://github.com/horriblename):
-
-[aerial.nvim](https://github.com/stevearc/aerial.nvim)
-
-- Add [aerial.nvim]

flake.lock

@@ -156,22 +156,6 @@
         "type": "sourcehut"
       }
     },
-    "plugin-aerial-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736064692,
-        "narHash": "sha256-7YQtkUTACTMfAGoqoFDPmRrqtw+ypxDbeLCTB3sy4Us=",
-        "owner": "stevearc",
-        "repo": "aerial.nvim",
-        "rev": "b3ec25ca8c347fafa976484a6cace162239112e1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "aerial.nvim",
-        "type": "github"
-      }
-    },
     "plugin-alpha-nvim": {
       "flake": false,
       "locked": {
@@ -2122,7 +2106,6 @@
         "nil": "nil",
         "nixpkgs": "nixpkgs",
         "nmd": "nmd",
-        "plugin-aerial-nvim": "plugin-aerial-nvim",
         "plugin-alpha-nvim": "plugin-alpha-nvim",
         "plugin-base16": "plugin-base16",
         "plugin-bufdelete-nvim": "plugin-bufdelete-nvim",

flake.nix

@@ -736,10 +736,5 @@
       url = "github:mrcjkb/haskell-tools.nvim";
       flake = false;
     };
-
-    plugin-aerial-nvim = {
-      url = "github:stevearc/aerial.nvim";
-      flake = false;
-    };
   };
 }

modules/plugins/filetree/nvimtree/config.nix

@@ -1,7 +1,7 @@
 {
-  options,
   config,
   lib,
+  pkgs,
   ...
 }: let
   inherit (lib.strings) optionalString;
@@ -11,7 +11,8 @@
   inherit (lib.nvim.binds) pushDownDefault;
 
   cfg = config.vim.filetree.nvimTree;
-  inherit (options.vim.filetree.nvimTree) mappings;
+  self = import ./nvimtree.nix {inherit pkgs lib;};
+  inherit (self.options.vim.filetree.nvimTree) mappings;
 in {
   config = mkIf cfg.enable {
     vim = {

modules/plugins/git/gitsigns/config.nix

@@ -7,7 +7,6 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.git.gitsigns;
 
@@ -71,7 +70,7 @@ in {
         };
 
         pluginRC.gitsigns = entryAnywhere ''
-          require('gitsigns').setup(${toLuaObject cfg.setupOpts})
+          require('gitsigns').setup{}
         '';
       };
     }

modules/plugins/git/gitsigns/gitsigns.nix

@@ -6,7 +6,6 @@
   inherit (lib.options) mkEnableOption;
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.nvim.binds) mkMappingOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   imports = [
     (mkRenamedOptionModule ["vim" "git" "gitsigns" "codeActions" "vim" "gitsigns" "codeActions"] ["vim" "git" "gitsigns" "codeActions" "enable"])
@@ -14,7 +13,6 @@ in {
 
   options.vim.git.gitsigns = {
     enable = mkEnableOption "gitsigns" // {default = config.vim.git.enable;};
-    setupOpts = mkPluginSetupOption "gitsigns" {};
 
     codeActions.enable = mkEnableOption "gitsigns codeactions through null-ls";
 

modules/plugins/utility/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
-    ./outline
     ./binds
     ./ccc
     ./gestures

modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix

@@ -1,14 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-  inherit (lib.nvim.binds) mkMappingOption;
-in {
-  options.vim.utility.outline.aerial-nvim = {
-    enable = mkEnableOption "Aerial.nvim";
-    setupOpts = mkPluginSetupOption "aerial.nvim" {};
-
-    mappings = {
-      toggle = mkMappingOption "Toggle aerial window" "gO";
-    };
-  };
-}

modules/plugins/utility/outline/aerial-nvim/config.nix

@@ -1,42 +0,0 @@
-{
-  options,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.nvim.binds) mkKeymap;
-
-  cfg = config.vim.utility.outline.aerial-nvim;
-  inherit (options.vim.utility.outline.aerial-nvim) mappings;
-in {
-  config = mkIf cfg.enable {
-    vim = {
-      lazy.plugins.aerial-nvim = {
-        package = "aerial-nvim";
-
-        setupModule = "aerial";
-        inherit (cfg) setupOpts;
-
-        cmd = [
-          "AerialClose"
-          "AerialCloseAll"
-          "AerialGo"
-          "AerialInfo"
-          "AerialNavClose"
-          "AerialNavOpen"
-          "AerialNavToggle"
-          "AerialNext"
-          "AerialOpen"
-          "AerialOpenAll"
-          "AerialPrev"
-          "AerialToggle"
-        ];
-
-        keys = [
-          (mkKeymap "n" cfg.mappings.toggle ":AerialToggle<CR>" {desc = mappings.toggle.description;})
-        ];
-      };
-    };
-  };
-}

modules/plugins/utility/outline/aerial-nvim/default.nix

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

modules/plugins/utility/outline/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./aerial-nvim
-  ];
-}