diff --git a/flake/develop.nix b/flake/develop.nix
index 71c13688..aae9d92f 100644
--- a/flake/develop.nix
+++ b/flake/develop.nix
@@ -3,6 +3,7 @@
     pkgs,
     config,
     self',
+    inputs',
     ...
   }: {
     devShells = {
diff --git a/modules/neovim/init/util.nix b/modules/neovim/init/util.nix
index d151e53a..cc98d10a 100644
--- a/modules/neovim/init/util.nix
+++ b/modules/neovim/init/util.nix
@@ -3,6 +3,7 @@
   lib,
   ...
 }: let
+  inherit (builtins) filter;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.dag) entryBefore;
 
diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix
index bf4d9972..b1066e5a 100644
--- a/modules/plugins/assistant/chatgpt/config.nix
+++ b/modules/plugins/assistant/chatgpt/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -11,7 +10,8 @@
 
   cfg = config.vim.assistant.chatgpt;
 
-  mappingDefinitions = options.vim.assistant.chatgpt.mappings;
+  self = import ./chatgpt.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.assistant.chatgpt.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
   maps = mkMerge [
     (mkSetBinding mappings.editWithInstructions "<cmd>ChatGPTEditWithInstruction<CR>")
diff --git a/modules/plugins/git/git-conflict/config.nix b/modules/plugins/git/git-conflict/config.nix
index 9d99aacc..bc9905d6 100644
--- a/modules/plugins/git/git-conflict/config.nix
+++ b/modules/plugins/git/git-conflict/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -11,7 +10,8 @@
 
   cfg = config.vim.git.git-conflict;
 
-  gcMappingDefinitions = options.vim.git.git-conflict.mappings;
+  self = import ./git-conflict.nix {inherit lib config;};
+  gcMappingDefinitions = self.options.vim.git.git-conflict.mappings;
 
   gcMappings = addDescriptionsToMappings cfg.mappings gcMappingDefinitions;
 in {
diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix
index e2d31df5..e89eebcf 100644
--- a/modules/plugins/git/gitsigns/config.nix
+++ b/modules/plugins/git/gitsigns/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (builtins) toJSON;
@@ -13,7 +12,8 @@
 
   cfg = config.vim.git.gitsigns;
 
-  gsMappingDefinitions = options.vim.git.gitsigns.mappings;
+  self = import ./gitsigns.nix {inherit lib config;};
+  gsMappingDefinitions = self.options.vim.git.gitsigns.mappings;
 
   gsMappings = addDescriptionsToMappings cfg.mappings gsMappingDefinitions;
 in {
diff --git a/modules/plugins/languages/clojure.nix b/modules/plugins/languages/clojure.nix
index 25452d9b..442df2b7 100644
--- a/modules/plugins/languages/clojure.nix
+++ b/modules/plugins/languages/clojure.nix
@@ -8,8 +8,10 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum listOf package;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
   inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.clojure;
diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix
index e73140f4..600c7724 100644
--- a/modules/plugins/languages/haskell.nix
+++ b/modules/plugins/languages/haskell.nix
@@ -10,10 +10,11 @@
   inherit (lib.strings) optionalString;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.dag) entryAfter;
+  inherit (lib.nvim.dag) entryAfter entryBefore;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.meta) getExe';
   inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (pkgs) haskellPackages;
   inherit (lib.nvim.lua) toLuaObject;
 
diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index d6875205..e7b67c8e 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  options,
+  pkgs,
   ...
 }: let
   inherit (lib.generators) mkLuaInline;
@@ -14,11 +14,12 @@
   cfg = config.vim.lsp;
   usingNvimCmp = config.vim.autocomplete.nvim-cmp.enable;
   usingBlinkCmp = config.vim.autocomplete.blink-cmp.enable;
+  self = import ./module.nix {inherit config lib pkgs;};
   conformCfg = config.vim.formatter.conform-nvim;
   conformFormatOnSave = conformCfg.enable && conformCfg.setupOpts.format_on_save != null;
 
   augroup = "nvf_lsp";
-  mappingDefinitions = options.vim.lsp.mappings;
+  mappingDefinitions = self.options.vim.lsp.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
   mkBinding = binding: action:
     if binding.value != null
diff --git a/modules/plugins/lsp/nvim-docs-view/config.nix b/modules/plugins/lsp/nvim-docs-view/config.nix
index 997e9a72..5c7ad2b7 100644
--- a/modules/plugins/lsp/nvim-docs-view/config.nix
+++ b/modules/plugins/lsp/nvim-docs-view/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,8 +9,9 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.lsp.nvim-docs-view;
+  self = import ./nvim-docs-view.nix {inherit lib;};
 
-  mappingDefinitions = options.vim.lsp.nvim-docs-view.mappings;
+  mappingDefinitions = self.options.vim.lsp.nvim-docs-view.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/lsp/otter/config.nix b/modules/plugins/lsp/otter/config.nix
index f3dbe4d6..85f24c70 100644
--- a/modules/plugins/lsp/otter/config.nix
+++ b/modules/plugins/lsp/otter/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -11,7 +10,8 @@
 
   cfg = config.vim.lsp;
 
-  mappingDefinitions = options.vim.lsp.otter-nvim.mappings;
+  self = import ./otter.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.lsp.otter-nvim.mappings;
   mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
 in {
   config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
diff --git a/modules/plugins/minimap/codewindow/config.nix b/modules/plugins/minimap/codewindow/config.nix
index 8a62ee04..a853514a 100644
--- a/modules/plugins/minimap/codewindow/config.nix
+++ b/modules/plugins/minimap/codewindow/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,7 +9,9 @@
 
   cfg = config.vim.minimap.codewindow;
 
-  mappingDefinitions = options.vim.minimap.codewindow.mappings;
+  self = import ./codewindow.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.minimap.codewindow.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/notes/todo-comments/config.nix b/modules/plugins/notes/todo-comments/config.nix
index 47fa3641..b03efce4 100644
--- a/modules/plugins/notes/todo-comments/config.nix
+++ b/modules/plugins/notes/todo-comments/config.nix
@@ -1,7 +1,7 @@
 {
+  pkgs,
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkMerge mkIf;
@@ -9,7 +9,8 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.notes.todo-comments;
-  inherit (options.vim.notes.todo-comments) mappings;
+  self = import ./todo-comments.nix {inherit pkgs lib;};
+  inherit (self.options.vim.notes.todo-comments) mappings;
 in {
   config = mkIf cfg.enable {
     vim = {
diff --git a/modules/plugins/tabline/nvim-bufferline/config.nix b/modules/plugins/tabline/nvim-bufferline/config.nix
index 396e6886..250425d3 100644
--- a/modules/plugins/tabline/nvim-bufferline/config.nix
+++ b/modules/plugins/tabline/nvim-bufferline/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,8 +9,8 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.tabline.nvimBufferline;
-
-  inherit (options.vim.tabline.nvimBufferline) mappings;
+  self = import ./nvim-bufferline.nix {inherit config lib;};
+  inherit (self.options.vim.tabline.nvimBufferline) mappings;
 in {
   config = mkIf cfg.enable {
     vim = {
diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix
index f7955110..14aba5e1 100644
--- a/modules/plugins/treesitter/config.nix
+++ b/modules/plugins/treesitter/config.nix
@@ -1,7 +1,7 @@
 {
   config,
+  pkgs,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -12,7 +12,8 @@
 
   cfg = config.vim.treesitter;
 
-  mappingDefinitions = options.vim.treesitter.mappings;
+  self = import ./treesitter.nix {inherit pkgs lib;};
+  mappingDefinitions = self.options.vim.treesitter.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/utility/gestures/gesture-nvim/config.nix b/modules/plugins/utility/gestures/gesture-nvim/config.nix
index 6c40e3ea..9838c178 100644
--- a/modules/plugins/utility/gestures/gesture-nvim/config.nix
+++ b/modules/plugins/utility/gestures/gesture-nvim/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,7 +9,9 @@
 
   cfg = config.vim.gestures.gesture-nvim;
 
-  mappingDefinitions = options.vim.gestures.gesture-nvim.mappings;
+  self = import ./gesture-nvim.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.gestures.gesture-nvim.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/utility/motion/flash/config.nix b/modules/plugins/utility/motion/flash/config.nix
index 73c94ab3..83ddd0b9 100644
--- a/modules/plugins/utility/motion/flash/config.nix
+++ b/modules/plugins/utility/motion/flash/config.nix
@@ -14,7 +14,7 @@ in {
         "flash-nvim" = {
           package = "flash-nvim";
           setupModule = "flash";
-          inherit (cfg) setupOpts;
+          setupOpts = cfg.setupOpts;
 
           lazy = true;
 
diff --git a/modules/plugins/utility/motion/hop/config.nix b/modules/plugins/utility/motion/hop/config.nix
index ef494309..505b9ebb 100644
--- a/modules/plugins/utility/motion/hop/config.nix
+++ b/modules/plugins/utility/motion/hop/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf;
@@ -10,7 +9,9 @@
 
   cfg = config.vim.utility.motion.hop;
 
-  mappingDefinitions = options.vim.utility.motion.hop.mappings;
+  self = import ./hop.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.utility.motion.hop.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/utility/preview/glow/config.nix b/modules/plugins/utility/preview/glow/config.nix
index 7297df83..4529a534 100644
--- a/modules/plugins/utility/preview/glow/config.nix
+++ b/modules/plugins/utility/preview/glow/config.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,7 +9,10 @@
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.utility.preview.glow;
-  inherit (options.vim.utility.preview.glow) mappings;
+  self = import ./glow.nix {
+    inherit lib config pkgs;
+  };
+  inherit (self.options.vim.utility.preview.glow) mappings;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["glow-nvim"];