diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index eb7ca0db..16ec2863 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -28,9 +28,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]
diff --git a/flake.lock b/flake.lock
index 4b56f7fa..0a7ee1a5 100644
--- a/flake.lock
+++ b/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": {
@@ -2106,7 +2090,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",
diff --git a/flake.nix b/flake.nix
index f5014afe..d5a7b709 100644
--- a/flake.nix
+++ b/flake.nix
@@ -730,10 +730,5 @@
       url = "github:mrcjkb/haskell-tools.nvim";
       flake = false;
     };
-
-    plugin-aerial-nvim = {
-      url = "github:stevearc/aerial.nvim";
-      flake = false;
-    };
   };
 }
diff --git a/modules/plugins/filetree/nvimtree/config.nix b/modules/plugins/filetree/nvimtree/config.nix
index 0d0381a0..11fa9fed 100644
--- a/modules/plugins/filetree/nvimtree/config.nix
+++ b/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 = {
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 686295e2..835ebf6e 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./outline
     ./binds
     ./ccc
     ./gestures
diff --git a/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix b/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix
deleted file mode 100644
index beede428..00000000
--- a/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix
+++ /dev/null
@@ -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";
-    };
-  };
-}
diff --git a/modules/plugins/utility/outline/aerial-nvim/config.nix b/modules/plugins/utility/outline/aerial-nvim/config.nix
deleted file mode 100644
index 803302f7..00000000
--- a/modules/plugins/utility/outline/aerial-nvim/config.nix
+++ /dev/null
@@ -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;})
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/plugins/utility/outline/aerial-nvim/default.nix b/modules/plugins/utility/outline/aerial-nvim/default.nix
deleted file mode 100644
index ea782c89..00000000
--- a/modules/plugins/utility/outline/aerial-nvim/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./aerial-nvim.nix
-    ./config.nix
-  ];
-}
diff --git a/modules/plugins/utility/outline/default.nix b/modules/plugins/utility/outline/default.nix
deleted file mode 100644
index d8262edd..00000000
--- a/modules/plugins/utility/outline/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./aerial-nvim
-  ];
-}