feat: run the config through deadnix

modules/assistant/copilot/copilot.nix

@@ -5,9 +5,7 @@
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.assistant.copilot;
-in {
+with builtins; {
   options.vim.assistant.copilot = {
     enable = mkEnableOption "Enable GitHub Copilot";
 

modules/assistant/tabnine/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/assistant/tabnine/tabnine.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.assistant.tabnine;
-in {
+with builtins; {
   options.vim.assistant.tabnine = {
     enable = mkEnableOption "Enable TabNine assistant";
 

modules/autopairs/nvim-autopairs/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

modules/autopairs/nvim-autopairs/nvim-autopairs.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.autopairs;
-in {
+with builtins; {
   options.vim = {
     autopairs = {
       enable = mkOption {

modules/basic/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

modules/basic/module.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim;
-in {
+with builtins; {
   options.vim = {
     debugMode = {
       enable = mkEnableOption "Enable debug mode";

modules/comments/comment-nvim/comment-nvim.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.comments.comment-nvim;
-in {
+with builtins; {
   options.vim.comments.comment-nvim = {
     enable = mkEnableOption "comment-nvim";
   };

modules/comments/comment-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/comments/kommentary.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/completion/nvim-cmp/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

modules/completion/nvim-cmp/nvim-cmp.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.autocomplete;
-in {
+with builtins; {
   options.vim = {
     autocomplete = {
       enable = mkOption {

modules/core/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib;
@@ -135,7 +134,7 @@ in {
           else (toJSON val)
         );
 
-    filterNonNull = mappings: filterAttrs (name: value: value != null) mappings;
+    filterNonNull = mappings: filterAttrs (_name: value: value != null) mappings;
     globalsScript =
       mapAttrsFlatten (name: value: "let g:${name}=${valToVim value}")
       (filterNonNull cfg.globals);

modules/dashboard/alpha/alpha.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.dashboard.alpha;
-in {
+with builtins; {
   options.vim.dashboard.alpha = {
     enable = mkEnableOption "alpha";
   };

modules/dashboard/alpha/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/dashboard/dashboard-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/dashboard/dashboard-nvim/dashboard-nvim.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.dashboard.dashboard-nvim;
-in {
+with builtins; {
   options.vim.dashboard.dashboard-nvim = {
     enable = mkEnableOption "dashboard-nvim";
   };

modules/dashboard/default.nix

@@ -1,7 +1,4 @@
 {
-  pkgs,
-  config,
-  lib,
   ...
 }: {
   imports = [

modules/dashboard/startify/startify.nix

@@ -1,18 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with builtins;
-with lib; let
-  cfg = config.vim.dashboard.startify;
-
-  mkVimBool = val:
-    if val
-    then "1"
-    else "0";
-in {
+with lib; {
   options.vim.dashboard.startify = {
     enable = mkEnableOption "Enable startify";
 

modules/filetree/nvimtree-lua/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/filetree/nvimtree-lua/nvimtree-lua.nix

@@ -5,9 +5,7 @@
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.filetree.nvimTreeLua;
-in {
+with builtins; {
   options.vim.filetree.nvimTreeLua = {
     enable = mkOption {
       type = types.bool;

modules/git/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/git/default.nix

@@ -1,7 +1,4 @@
 {
-  pkgs,
-  config,
-  lib,
   ...
 }: {
   imports = [

modules/git/git.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -23,12 +22,7 @@ in {
   config =
     mkIf cfg.enable
     (
-      let
-        mkVimBool = val:
-          if val
-          then "1"
-          else "0";
-      in {
+      {
         vim.startPlugins =
           if (cfg.gitsigns.enable)
           then ["gitsigns-nvim"]

modules/lsp/default.nix

@@ -1,7 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
   ...
 }: {
   imports = [

modules/lsp/lightbulb/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/lightbulb/lightbulb.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.lsp;
-in {
+with builtins; {
   options.vim.lsp = {
     lightbulb = {
       enable = mkEnableOption "lightbulb for code actions. Requires emoji font";

modules/lsp/lsp-signature/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/lsp-signature/lsp-signature.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.lsp;
-in {
+with builtins; {
   options.vim.lsp = {
     lspSignature = {
       enable = mkEnableOption "lsp signature viewer";

modules/lsp/lspsaga/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/lspsaga/lspsaga.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

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

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

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

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.lsp;
-in {
+with builtins; {
   options.vim.lsp = {
     nvimCodeActionMenu = {
       enable = mkEnableOption "nvim code action menu";

modules/lsp/trouble/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/trouble/trouble.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.lsp;
-in {
+with builtins; {
   options.vim.lsp = {
     trouble = {
       enable = mkEnableOption "trouble diagnostics viewer";

modules/markdown/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/markdown/default.nix

@@ -1,7 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
   ...
 }: {
   imports = [

modules/markdown/glow/glow.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.markdown.glow;
-in {
+with builtins; {
   options.vim.markdown.glow = {
     enable = mkOption {
       type = types.bool;

modules/markdown/module.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/minimap/codewindow/codewindow.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.minimap.codewindow;
-in {
+with builtins; {
   options.vim.minimap.codewindow = {
     enable = mkEnableOption "Enable minimap-vim plugin";
   };

modules/minimap/codewindow/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/minimap/default.nix

@@ -1,7 +1,4 @@
 {
-  pkgs,
-  lib,
-  config,
   ...
 }: {
   imports = [

modules/minimap/minimap-vim/minimap-vim.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.minimap.minimap-vim;
-in {
+with builtins; {
   options.vim.minimap.minimap-vim = {
     enable = mkEnableOption "Enable minimap-vim plugin";
   };

modules/notes/mind-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notes/mind-nvim/mind-nvim.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.notes.mind-nvim;
-in {
+with builtins; {
   options.vim.notes.mind-nvim = {
     enable = mkEnableOption "The power of trees at your fingertips. ";
   };

modules/notes/obsidian/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notes/obsidian/obsidian.nix

@@ -1,14 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.notes.obsidian;
-  auto = config.vim.autocomplete;
-in {
+with builtins; {
   options.vim.notes = {
     obsidian = {
       enable = mkEnableOption "Complementary neovim plugins for Obsidian editor";

modules/notes/orgmode/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notes/orgmode/orgmode.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.notes.orgmode;
-in {
+with builtins; {
   options.vim.notes.orgmode = {
     enable = mkEnableOption "Neovim plugin for Emac Orgmode. Get the best of both worlds.";
     orgAgendaFiles = mkOption {

modules/notes/todo-comments/todo-comments.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.notes.todo-comments;
-in {
+with builtins; {
   options.vim.notes.todo-comments = {
     enable = mkEnableOption "todo-comments";
 

modules/notifications/nvim-notify/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notifications/nvim-notify/nvim-notify.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.notify.nvim-notify;
-in {
+with builtins; {
   options.vim.notify.nvim-notify = {
     enable = mkEnableOption "Enable nvim-notify plugin";
     stages = mkOption {

modules/rich-presence/presence-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/rich-presence/presence-nvim/presence-nvim.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.presence.presence-nvim;
-in {
+with builtins; {
   options.vim.presence.presence-nvim = {
     enable = mkEnableOption "Enable presence.nvim plugin";
 

modules/session/nvim-session-manager/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/session/nvim-session-manager/nvim-session-manager.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.session.nvim-session-manager;
-in {
+with builtins; {
   options.vim.session.nvim-session-manager = {
     enable = mkEnableOption "Enable nvim-session-manager";
   };

modules/snippets/vsnip/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/snippets/vsnip/vsnip.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.snippets.vsnip;
-in {
+with builtins; {
   options.vim.snippets.vsnip = {
     enable = mkEnableOption "Enable vim-vsnip";
   };

modules/statusline/default.nix

@@ -1,7 +1,4 @@
 {
-  pkgs,
-  config,
-  lib,
   ...
 }: {
   imports = [

modules/statusline/lualine/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/statusline/lualine/lualine.nix

@@ -1,12 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
 with builtins; let
-  cfg = config.vim.statusline.lualine;
   supported_themes = import ./supported_themes.nix;
 in {
   options.vim.statusline.lualine = {

modules/tabline/nvim-bufferline/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/tabline/nvim-bufferline/nvim-bufferline.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.tabline.nvimBufferline;
-in {
+with builtins; {
   options.vim.tabline.nvimBufferline = {
     enable = mkEnableOption "nvim-bufferline-lua";
   };

modules/terminal/toggleterm/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/terminal/toggleterm/toggleterm.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.terminal.toggleterm;
-in {
+with builtins; {
   options.vim.terminal.toggleterm = {
     enable = mkEnableOption "Enable toggleterm as a replacement to built-in terminal command";
     direction = mkOption {

modules/theme/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/theme/default.nix

@@ -1,7 +1,4 @@
 {
-  pkgs,
-  config,
-  lib,
   ...
 }: {
   imports = [

modules/theme/theme.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/tidal/default.nix

@@ -1,7 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
   ...
 }: {
   imports = [

modules/tidal/tidal.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.tidal;
-in {
+with builtins; {
   options.vim.tidal = {
     enable = mkEnableOption "tidal tools and plugins";
 

modules/treesitter/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/treesitter/context.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/treesitter/default.nix

@@ -1,7 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
   ...
 }: {
   imports = [

modules/treesitter/treesitter.nix

@@ -5,9 +5,7 @@
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.treesitter;
-in {
+with builtins; {
   options.vim.treesitter = {
     enable = mkOption {
       default = false;

modules/ui/noice/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/ui/noice/noice.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.ui.noice;
-in {
+with builtins; {
   options.vim.ui.noice = {
     enable = mkEnableOption "noice-nvim";
   };

modules/utility/binds/cheatsheet/cheatsheet.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.binds.cheatsheet;
-in {
+with builtins; {
   options.vim.binds.cheatsheet = {
     enable = mkEnableOption "Searchable cheatsheet for nvim using telescope";
   };

modules/utility/binds/cheatsheet/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/binds/which-key/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/binds/which-key/which-key.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.binds.whichKey;
-in {
+with builtins; {
   options.vim.binds.whichKey = {
     enable = mkEnableOption "which-key menu";
   };

modules/utility/colorizer/colorizer.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.utility.colorizer;
-in {
+with builtins; {
   options.vim.utility.colorizer = {
     enable = mkEnableOption "ccc color picker for neovim";
   };

modules/utility/colorizer/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/diffview/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/diffview/diffview.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.utility.diffview-nvim;
-in {
+with builtins; {
   options.vim.utility.diffview-nvim = {
     enable = mkEnableOption "Enable diffview-nvim";
   };

modules/utility/gestures/gesture-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/gestures/gesture-nvim/gesture-nvim.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.gestures.gesture-nvim;
-in {
+with builtins; {
   options.vim.gestures.gesture-nvim = {
     enable = mkEnableOption "Enable gesture-nvim plugin";
   };

modules/utility/icon-picker/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/icon-picker/icon-picker.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.utility.icon-picker;
-in {
+with builtins; {
   options.vim.utility.icon-picker = {
     enable = mkEnableOption "Nerdfonts icon picker for nvim";
   };

modules/utility/telescope/telescope.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.telescope;
-in {
+with builtins; {
   options.vim.telescope = {
     enable = mkEnableOption "enable telescope";
   };

modules/utility/venn/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/venn/venn.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.utility.venn-nvim;
-in {
+with builtins; {
   options.vim.utility.venn-nvim = {
     enable = mkEnableOption "draw ASCII diagrams in Neovim";
   };

modules/visuals/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/visuals/default.nix

@@ -1,7 +1,4 @@
 {
-  pkgs,
-  config,
-  lib,
   ...
 }: {
   imports = [

modules/visuals/visuals.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.visuals;
-in {
+with builtins; {
   options.vim.visuals = {
     enable = mkOption {
       type = types.bool;