From 16ccd518525a4a6c44fd497159e427a58bcfdfd7 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 05:20:35 +0300 Subject: [PATCH] feat: run the config through deadnix --- flake.nix | 1 - flake/overlays.nix | 11 +++-------- flake/packages.nix | 1 - lib/dag.nix | 2 +- modules/assistant/copilot/copilot.nix | 4 +--- modules/assistant/tabnine/config.nix | 1 - modules/assistant/tabnine/tabnine.nix | 5 +---- modules/autopairs/nvim-autopairs/config.nix | 1 - modules/autopairs/nvim-autopairs/nvim-autopairs.nix | 5 +---- modules/basic/config.nix | 1 - modules/basic/module.nix | 5 +---- modules/comments/comment-nvim/comment-nvim.nix | 5 +---- modules/comments/comment-nvim/config.nix | 1 - modules/comments/kommentary.nix | 1 - modules/completion/nvim-cmp/config.nix | 1 - modules/completion/nvim-cmp/nvim-cmp.nix | 5 +---- modules/core/default.nix | 3 +-- modules/dashboard/alpha/alpha.nix | 5 +---- modules/dashboard/alpha/config.nix | 1 - modules/dashboard/dashboard-nvim/config.nix | 1 - modules/dashboard/dashboard-nvim/dashboard-nvim.nix | 5 +---- modules/dashboard/default.nix | 3 --- modules/dashboard/startify/startify.nix | 10 +--------- modules/filetree/nvimtree-lua/config.nix | 1 - modules/filetree/nvimtree-lua/nvimtree-lua.nix | 4 +--- modules/git/config.nix | 1 - modules/git/default.nix | 3 --- modules/git/git.nix | 8 +------- modules/lsp/default.nix | 3 --- modules/lsp/lightbulb/config.nix | 1 - modules/lsp/lightbulb/lightbulb.nix | 5 +---- modules/lsp/lsp-signature/config.nix | 1 - modules/lsp/lsp-signature/lsp-signature.nix | 5 +---- modules/lsp/lspsaga/config.nix | 1 - modules/lsp/lspsaga/lspsaga.nix | 1 - modules/lsp/nvim-code-action-menu/config.nix | 1 - .../nvim-code-action-menu/nvim-code-action-menu.nix | 5 +---- modules/lsp/trouble/config.nix | 1 - modules/lsp/trouble/trouble.nix | 5 +---- modules/markdown/config.nix | 1 - modules/markdown/default.nix | 3 --- modules/markdown/glow/glow.nix | 5 +---- modules/markdown/module.nix | 1 - modules/minimap/codewindow/codewindow.nix | 5 +---- modules/minimap/codewindow/config.nix | 1 - modules/minimap/default.nix | 3 --- modules/minimap/minimap-vim/minimap-vim.nix | 5 +---- modules/notes/mind-nvim/config.nix | 1 - modules/notes/mind-nvim/mind-nvim.nix | 5 +---- modules/notes/obsidian/config.nix | 1 - modules/notes/obsidian/obsidian.nix | 6 +----- modules/notes/orgmode/config.nix | 1 - modules/notes/orgmode/orgmode.nix | 5 +---- modules/notes/todo-comments/todo-comments.nix | 5 +---- modules/notifications/nvim-notify/config.nix | 1 - modules/notifications/nvim-notify/nvim-notify.nix | 5 +---- modules/rich-presence/presence-nvim/config.nix | 1 - modules/rich-presence/presence-nvim/presence-nvim.nix | 5 +---- modules/session/nvim-session-manager/config.nix | 1 - .../nvim-session-manager/nvim-session-manager.nix | 5 +---- modules/snippets/vsnip/config.nix | 1 - modules/snippets/vsnip/vsnip.nix | 5 +---- modules/statusline/default.nix | 3 --- modules/statusline/lualine/config.nix | 1 - modules/statusline/lualine/lualine.nix | 2 -- modules/tabline/nvim-bufferline/config.nix | 1 - modules/tabline/nvim-bufferline/nvim-bufferline.nix | 5 +---- modules/terminal/toggleterm/config.nix | 1 - modules/terminal/toggleterm/toggleterm.nix | 5 +---- modules/theme/config.nix | 1 - modules/theme/default.nix | 3 --- modules/theme/theme.nix | 1 - modules/tidal/default.nix | 3 --- modules/tidal/tidal.nix | 5 +---- modules/treesitter/config.nix | 1 - modules/treesitter/context.nix | 1 - modules/treesitter/default.nix | 3 --- modules/treesitter/treesitter.nix | 4 +--- modules/ui/noice/config.nix | 1 - modules/ui/noice/noice.nix | 5 +---- modules/utility/binds/cheatsheet/cheatsheet.nix | 5 +---- modules/utility/binds/cheatsheet/config.nix | 1 - modules/utility/binds/which-key/config.nix | 1 - modules/utility/binds/which-key/which-key.nix | 5 +---- modules/utility/colorizer/colorizer.nix | 5 +---- modules/utility/colorizer/config.nix | 1 - modules/utility/diffview/config.nix | 1 - modules/utility/diffview/diffview.nix | 5 +---- modules/utility/gestures/gesture-nvim/config.nix | 1 - .../utility/gestures/gesture-nvim/gesture-nvim.nix | 5 +---- modules/utility/icon-picker/config.nix | 1 - modules/utility/icon-picker/icon-picker.nix | 5 +---- modules/utility/telescope/telescope.nix | 5 +---- modules/utility/venn/config.nix | 1 - modules/utility/venn/venn.nix | 5 +---- modules/visuals/config.nix | 1 - modules/visuals/default.nix | 3 --- modules/visuals/visuals.nix | 5 +---- 98 files changed, 45 insertions(+), 253 deletions(-) diff --git a/flake.nix b/flake.nix index f3b5ea23..a74aae5f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ outputs = { nixpkgs, flake-parts, - zig, ... } @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/flake/overlays.nix b/flake/overlays.nix index 44002b5d..1850a914 100644 --- a/flake/overlays.nix +++ b/flake/overlays.nix @@ -1,20 +1,15 @@ {inputs, ...}: let inherit (import ../extra.nix inputs) neovimConfiguration mainConfig; - tidalConfig = { - config.vim.tidal.enable = true; - }; - buildPkg = pkgs: modules: - (neovimConfiguration { - inherit pkgs modules; - }) + (neovimConfiguration {inherit pkgs modules;}) .neovim; nixConfig = mainConfig false; maximalConfig = mainConfig true; + tidalConfig = {config.vim.tidal.enable = true;}; in { - flake.overlays.default = final: prev: { + flake.overlays.default = _final: prev: { inherit neovimConfiguration; neovim-nix = buildPkg prev [nixConfig]; neovim-maximal = buildPkg prev [maximalConfig]; diff --git a/flake/packages.nix b/flake/packages.nix index d21aaf32..c50b418f 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -3,7 +3,6 @@ system, config, pkgs, - lib, ... }: { packages = let diff --git a/lib/dag.nix b/lib/dag.nix index 0b392f94..0b2dfc4b 100644 --- a/lib/dag.nix +++ b/lib/dag.nix @@ -77,7 +77,7 @@ in { topoSort = dag: let dagBefore = dag: name: builtins.attrNames - (filterAttrs (n: v: builtins.elem name v.before) dag); + (filterAttrs (_n: v: builtins.elem name v.before) dag); normalizedDag = mapAttrs (n: v: { name = n; diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix index 5dc12453..ad3e6225 100644 --- a/modules/assistant/copilot/copilot.nix +++ b/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"; diff --git a/modules/assistant/tabnine/config.nix b/modules/assistant/tabnine/config.nix index 8b10bcf7..d925ed05 100644 --- a/modules/assistant/tabnine/config.nix +++ b/modules/assistant/tabnine/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/assistant/tabnine/tabnine.nix b/modules/assistant/tabnine/tabnine.nix index 785e3928..f0674cbb 100644 --- a/modules/assistant/tabnine/tabnine.nix +++ b/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"; diff --git a/modules/autopairs/nvim-autopairs/config.nix b/modules/autopairs/nvim-autopairs/config.nix index 87903ef2..59ad538f 100644 --- a/modules/autopairs/nvim-autopairs/config.nix +++ b/modules/autopairs/nvim-autopairs/config.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix b/modules/autopairs/nvim-autopairs/nvim-autopairs.nix index 402561e4..f355919e 100644 --- a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix +++ b/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 { diff --git a/modules/basic/config.nix b/modules/basic/config.nix index dd0c7d35..a06cae29 100644 --- a/modules/basic/config.nix +++ b/modules/basic/config.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/basic/module.nix b/modules/basic/module.nix index 479dcab4..7ac5ad76 100644 --- a/modules/basic/module.nix +++ b/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"; diff --git a/modules/comments/comment-nvim/comment-nvim.nix b/modules/comments/comment-nvim/comment-nvim.nix index b445d913..65c6fbbc 100644 --- a/modules/comments/comment-nvim/comment-nvim.nix +++ b/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"; }; diff --git a/modules/comments/comment-nvim/config.nix b/modules/comments/comment-nvim/config.nix index 8b0dbd08..1a2e150f 100644 --- a/modules/comments/comment-nvim/config.nix +++ b/modules/comments/comment-nvim/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/comments/kommentary.nix b/modules/comments/kommentary.nix index 5c05cba7..25f71f82 100644 --- a/modules/comments/kommentary.nix +++ b/modules/comments/kommentary.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/completion/nvim-cmp/config.nix b/modules/completion/nvim-cmp/config.nix index 65675af1..f27dcada 100644 --- a/modules/completion/nvim-cmp/config.nix +++ b/modules/completion/nvim-cmp/config.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/completion/nvim-cmp/nvim-cmp.nix b/modules/completion/nvim-cmp/nvim-cmp.nix index 99868771..59f5f1df 100644 --- a/modules/completion/nvim-cmp/nvim-cmp.nix +++ b/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 { diff --git a/modules/core/default.nix b/modules/core/default.nix index 0580cbee..d77f0a95 100644 --- a/modules/core/default.nix +++ b/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); diff --git a/modules/dashboard/alpha/alpha.nix b/modules/dashboard/alpha/alpha.nix index c1101a7f..8989b898 100644 --- a/modules/dashboard/alpha/alpha.nix +++ b/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"; }; diff --git a/modules/dashboard/alpha/config.nix b/modules/dashboard/alpha/config.nix index c5053ad9..5fd07b85 100644 --- a/modules/dashboard/alpha/config.nix +++ b/modules/dashboard/alpha/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/dashboard/dashboard-nvim/config.nix b/modules/dashboard/dashboard-nvim/config.nix index e63399b8..9edf34ab 100644 --- a/modules/dashboard/dashboard-nvim/config.nix +++ b/modules/dashboard/dashboard-nvim/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix b/modules/dashboard/dashboard-nvim/dashboard-nvim.nix index b62667ed..4600233e 100644 --- a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix +++ b/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"; }; diff --git a/modules/dashboard/default.nix b/modules/dashboard/default.nix index 0056f895..122c06a1 100644 --- a/modules/dashboard/default.nix +++ b/modules/dashboard/default.nix @@ -1,7 +1,4 @@ { - pkgs, - config, - lib, ... }: { imports = [ diff --git a/modules/dashboard/startify/startify.nix b/modules/dashboard/startify/startify.nix index bbf791ec..3467920f 100644 --- a/modules/dashboard/startify/startify.nix +++ b/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"; diff --git a/modules/filetree/nvimtree-lua/config.nix b/modules/filetree/nvimtree-lua/config.nix index d9c43a6d..a8cc9dc7 100644 --- a/modules/filetree/nvimtree-lua/config.nix +++ b/modules/filetree/nvimtree-lua/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/filetree/nvimtree-lua/nvimtree-lua.nix b/modules/filetree/nvimtree-lua/nvimtree-lua.nix index 871018dc..fbd0fb65 100644 --- a/modules/filetree/nvimtree-lua/nvimtree-lua.nix +++ b/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; diff --git a/modules/git/config.nix b/modules/git/config.nix index 7e12f2f7..ae2c1b41 100644 --- a/modules/git/config.nix +++ b/modules/git/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/git/default.nix b/modules/git/default.nix index cb09d72a..cf4c2d0e 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -1,7 +1,4 @@ { - pkgs, - config, - lib, ... }: { imports = [ diff --git a/modules/git/git.nix b/modules/git/git.nix index 07060bd7..ea3e2dd8 100644 --- a/modules/git/git.nix +++ b/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"] diff --git a/modules/lsp/default.nix b/modules/lsp/default.nix index 0caa22cb..2c6474f0 100644 --- a/modules/lsp/default.nix +++ b/modules/lsp/default.nix @@ -1,7 +1,4 @@ { - config, - lib, - pkgs, ... }: { imports = [ diff --git a/modules/lsp/lightbulb/config.nix b/modules/lsp/lightbulb/config.nix index f8b628fe..97f5e075 100644 --- a/modules/lsp/lightbulb/config.nix +++ b/modules/lsp/lightbulb/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/lsp/lightbulb/lightbulb.nix b/modules/lsp/lightbulb/lightbulb.nix index 0caef2bc..ae1c8292 100644 --- a/modules/lsp/lightbulb/lightbulb.nix +++ b/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"; diff --git a/modules/lsp/lsp-signature/config.nix b/modules/lsp/lsp-signature/config.nix index 7296a2cf..738dcb5e 100644 --- a/modules/lsp/lsp-signature/config.nix +++ b/modules/lsp/lsp-signature/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/lsp/lsp-signature/lsp-signature.nix b/modules/lsp/lsp-signature/lsp-signature.nix index c9544540..b8b0a727 100644 --- a/modules/lsp/lsp-signature/lsp-signature.nix +++ b/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"; diff --git a/modules/lsp/lspsaga/config.nix b/modules/lsp/lspsaga/config.nix index db8ac6b3..f8f80247 100644 --- a/modules/lsp/lspsaga/config.nix +++ b/modules/lsp/lspsaga/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/lsp/lspsaga/lspsaga.nix b/modules/lsp/lspsaga/lspsaga.nix index d2445942..eecfa420 100644 --- a/modules/lsp/lspsaga/lspsaga.nix +++ b/modules/lsp/lspsaga/lspsaga.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/lsp/nvim-code-action-menu/config.nix b/modules/lsp/nvim-code-action-menu/config.nix index e814af18..27d3cbb7 100644 --- a/modules/lsp/nvim-code-action-menu/config.nix +++ b/modules/lsp/nvim-code-action-menu/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix b/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix index 4b7a3be9..8bcd5d0e 100644 --- a/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix +++ b/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"; diff --git a/modules/lsp/trouble/config.nix b/modules/lsp/trouble/config.nix index d3efd302..092802ab 100644 --- a/modules/lsp/trouble/config.nix +++ b/modules/lsp/trouble/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/lsp/trouble/trouble.nix b/modules/lsp/trouble/trouble.nix index 63334f0e..af449212 100644 --- a/modules/lsp/trouble/trouble.nix +++ b/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"; diff --git a/modules/markdown/config.nix b/modules/markdown/config.nix index ace4eaf6..c8929cea 100644 --- a/modules/markdown/config.nix +++ b/modules/markdown/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/markdown/default.nix b/modules/markdown/default.nix index 2a0a1e5d..e49e4165 100644 --- a/modules/markdown/default.nix +++ b/modules/markdown/default.nix @@ -1,7 +1,4 @@ { - config, - lib, - pkgs, ... }: { imports = [ diff --git a/modules/markdown/glow/glow.nix b/modules/markdown/glow/glow.nix index 48e44407..ad20b652 100644 --- a/modules/markdown/glow/glow.nix +++ b/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; diff --git a/modules/markdown/module.nix b/modules/markdown/module.nix index 4292173a..cfcb7921 100644 --- a/modules/markdown/module.nix +++ b/modules/markdown/module.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/minimap/codewindow/codewindow.nix b/modules/minimap/codewindow/codewindow.nix index 629a478e..2e71f579 100644 --- a/modules/minimap/codewindow/codewindow.nix +++ b/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"; }; diff --git a/modules/minimap/codewindow/config.nix b/modules/minimap/codewindow/config.nix index c3f7dd52..dd6a0872 100644 --- a/modules/minimap/codewindow/config.nix +++ b/modules/minimap/codewindow/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/minimap/default.nix b/modules/minimap/default.nix index 5222d6df..454c2f3c 100644 --- a/modules/minimap/default.nix +++ b/modules/minimap/default.nix @@ -1,7 +1,4 @@ { - pkgs, - lib, - config, ... }: { imports = [ diff --git a/modules/minimap/minimap-vim/minimap-vim.nix b/modules/minimap/minimap-vim/minimap-vim.nix index 54fea929..11c0748f 100644 --- a/modules/minimap/minimap-vim/minimap-vim.nix +++ b/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"; }; diff --git a/modules/notes/mind-nvim/config.nix b/modules/notes/mind-nvim/config.nix index 2baf0ee6..befbf703 100644 --- a/modules/notes/mind-nvim/config.nix +++ b/modules/notes/mind-nvim/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/notes/mind-nvim/mind-nvim.nix b/modules/notes/mind-nvim/mind-nvim.nix index 14e81c58..aa496d82 100644 --- a/modules/notes/mind-nvim/mind-nvim.nix +++ b/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. "; }; diff --git a/modules/notes/obsidian/config.nix b/modules/notes/obsidian/config.nix index 279a8b15..1107c35c 100644 --- a/modules/notes/obsidian/config.nix +++ b/modules/notes/obsidian/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/notes/obsidian/obsidian.nix b/modules/notes/obsidian/obsidian.nix index 186b5d3a..c4631d9c 100644 --- a/modules/notes/obsidian/obsidian.nix +++ b/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"; diff --git a/modules/notes/orgmode/config.nix b/modules/notes/orgmode/config.nix index f623db35..355610d0 100644 --- a/modules/notes/orgmode/config.nix +++ b/modules/notes/orgmode/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/notes/orgmode/orgmode.nix b/modules/notes/orgmode/orgmode.nix index c3d799a4..5bac1167 100644 --- a/modules/notes/orgmode/orgmode.nix +++ b/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 { diff --git a/modules/notes/todo-comments/todo-comments.nix b/modules/notes/todo-comments/todo-comments.nix index ec445eb4..773a8a18 100644 --- a/modules/notes/todo-comments/todo-comments.nix +++ b/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"; diff --git a/modules/notifications/nvim-notify/config.nix b/modules/notifications/nvim-notify/config.nix index 58fb303a..3c4b573d 100644 --- a/modules/notifications/nvim-notify/config.nix +++ b/modules/notifications/nvim-notify/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/notifications/nvim-notify/nvim-notify.nix b/modules/notifications/nvim-notify/nvim-notify.nix index 8aab9849..d24e82db 100644 --- a/modules/notifications/nvim-notify/nvim-notify.nix +++ b/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 { diff --git a/modules/rich-presence/presence-nvim/config.nix b/modules/rich-presence/presence-nvim/config.nix index 351074bd..493853c5 100644 --- a/modules/rich-presence/presence-nvim/config.nix +++ b/modules/rich-presence/presence-nvim/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/rich-presence/presence-nvim/presence-nvim.nix b/modules/rich-presence/presence-nvim/presence-nvim.nix index c3f80ffa..420e809c 100644 --- a/modules/rich-presence/presence-nvim/presence-nvim.nix +++ b/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"; diff --git a/modules/session/nvim-session-manager/config.nix b/modules/session/nvim-session-manager/config.nix index 4319b6c1..8d8e26b3 100644 --- a/modules/session/nvim-session-manager/config.nix +++ b/modules/session/nvim-session-manager/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/session/nvim-session-manager/nvim-session-manager.nix b/modules/session/nvim-session-manager/nvim-session-manager.nix index af7ca324..062b02d7 100644 --- a/modules/session/nvim-session-manager/nvim-session-manager.nix +++ b/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"; }; diff --git a/modules/snippets/vsnip/config.nix b/modules/snippets/vsnip/config.nix index b1753280..bf76d55a 100644 --- a/modules/snippets/vsnip/config.nix +++ b/modules/snippets/vsnip/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/snippets/vsnip/vsnip.nix b/modules/snippets/vsnip/vsnip.nix index 1049651d..88e421cd 100644 --- a/modules/snippets/vsnip/vsnip.nix +++ b/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"; }; diff --git a/modules/statusline/default.nix b/modules/statusline/default.nix index 643832b2..bfe34d56 100644 --- a/modules/statusline/default.nix +++ b/modules/statusline/default.nix @@ -1,7 +1,4 @@ { - pkgs, - config, - lib, ... }: { imports = [ diff --git a/modules/statusline/lualine/config.nix b/modules/statusline/lualine/config.nix index 5e64886c..deb78fba 100644 --- a/modules/statusline/lualine/config.nix +++ b/modules/statusline/lualine/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix index 499b7799..b0e32a18 100644 --- a/modules/statusline/lualine/lualine.nix +++ b/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 = { diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/tabline/nvim-bufferline/config.nix index 0e621f7e..4ed2820a 100644 --- a/modules/tabline/nvim-bufferline/config.nix +++ b/modules/tabline/nvim-bufferline/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/tabline/nvim-bufferline/nvim-bufferline.nix index e9d897b8..4a98dbd5 100644 --- a/modules/tabline/nvim-bufferline/nvim-bufferline.nix +++ b/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"; }; diff --git a/modules/terminal/toggleterm/config.nix b/modules/terminal/toggleterm/config.nix index 89ed51cf..9e98bb12 100644 --- a/modules/terminal/toggleterm/config.nix +++ b/modules/terminal/toggleterm/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/terminal/toggleterm/toggleterm.nix index 3383780b..e2ed9401 100644 --- a/modules/terminal/toggleterm/toggleterm.nix +++ b/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 { diff --git a/modules/theme/config.nix b/modules/theme/config.nix index aed77f7a..33386438 100644 --- a/modules/theme/config.nix +++ b/modules/theme/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/theme/default.nix b/modules/theme/default.nix index d511fc48..f30e8149 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -1,7 +1,4 @@ { - pkgs, - config, - lib, ... }: { imports = [ diff --git a/modules/theme/theme.nix b/modules/theme/theme.nix index 1246b90b..4d922690 100644 --- a/modules/theme/theme.nix +++ b/modules/theme/theme.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/tidal/default.nix b/modules/tidal/default.nix index 9ef675fb..6af2c59d 100644 --- a/modules/tidal/default.nix +++ b/modules/tidal/default.nix @@ -1,7 +1,4 @@ { - config, - lib, - pkgs, ... }: { imports = [ diff --git a/modules/tidal/tidal.nix b/modules/tidal/tidal.nix index 5db5bbb2..8db4b120 100644 --- a/modules/tidal/tidal.nix +++ b/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"; diff --git a/modules/treesitter/config.nix b/modules/treesitter/config.nix index b7c26386..08acaa0c 100644 --- a/modules/treesitter/config.nix +++ b/modules/treesitter/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/treesitter/context.nix b/modules/treesitter/context.nix index 64e421ef..30472aef 100644 --- a/modules/treesitter/context.nix +++ b/modules/treesitter/context.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/treesitter/default.nix b/modules/treesitter/default.nix index 3b5bf204..dc4260c7 100644 --- a/modules/treesitter/default.nix +++ b/modules/treesitter/default.nix @@ -1,7 +1,4 @@ { - config, - lib, - pkgs, ... }: { imports = [ diff --git a/modules/treesitter/treesitter.nix b/modules/treesitter/treesitter.nix index c206336f..f36a3f48 100644 --- a/modules/treesitter/treesitter.nix +++ b/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; diff --git a/modules/ui/noice/config.nix b/modules/ui/noice/config.nix index 9a571370..38d45b61 100644 --- a/modules/ui/noice/config.nix +++ b/modules/ui/noice/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/ui/noice/noice.nix b/modules/ui/noice/noice.nix index a88f8ed8..5a50fd3a 100644 --- a/modules/ui/noice/noice.nix +++ b/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"; }; diff --git a/modules/utility/binds/cheatsheet/cheatsheet.nix b/modules/utility/binds/cheatsheet/cheatsheet.nix index aabee33c..b48f7bee 100644 --- a/modules/utility/binds/cheatsheet/cheatsheet.nix +++ b/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"; }; diff --git a/modules/utility/binds/cheatsheet/config.nix b/modules/utility/binds/cheatsheet/config.nix index 3aff60eb..e6d4ea5d 100644 --- a/modules/utility/binds/cheatsheet/config.nix +++ b/modules/utility/binds/cheatsheet/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/utility/binds/which-key/config.nix b/modules/utility/binds/which-key/config.nix index 8ce9c029..967d4f72 100644 --- a/modules/utility/binds/which-key/config.nix +++ b/modules/utility/binds/which-key/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/utility/binds/which-key/which-key.nix b/modules/utility/binds/which-key/which-key.nix index f26b38b1..b00c586a 100644 --- a/modules/utility/binds/which-key/which-key.nix +++ b/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"; }; diff --git a/modules/utility/colorizer/colorizer.nix b/modules/utility/colorizer/colorizer.nix index 8d14c366..fdcd34cb 100644 --- a/modules/utility/colorizer/colorizer.nix +++ b/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"; }; diff --git a/modules/utility/colorizer/config.nix b/modules/utility/colorizer/config.nix index 7f384797..93c72dcb 100644 --- a/modules/utility/colorizer/config.nix +++ b/modules/utility/colorizer/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/utility/diffview/config.nix b/modules/utility/diffview/config.nix index 6b81ee41..8ce66a0d 100644 --- a/modules/utility/diffview/config.nix +++ b/modules/utility/diffview/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/utility/diffview/diffview.nix b/modules/utility/diffview/diffview.nix index 13d876f2..ad66155a 100644 --- a/modules/utility/diffview/diffview.nix +++ b/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"; }; diff --git a/modules/utility/gestures/gesture-nvim/config.nix b/modules/utility/gestures/gesture-nvim/config.nix index def0cfb6..e1e1c346 100644 --- a/modules/utility/gestures/gesture-nvim/config.nix +++ b/modules/utility/gestures/gesture-nvim/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix b/modules/utility/gestures/gesture-nvim/gesture-nvim.nix index 6a7dbbf5..9c37148c 100644 --- a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix +++ b/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"; }; diff --git a/modules/utility/icon-picker/config.nix b/modules/utility/icon-picker/config.nix index e146dfd3..75c1490d 100644 --- a/modules/utility/icon-picker/config.nix +++ b/modules/utility/icon-picker/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/utility/icon-picker/icon-picker.nix b/modules/utility/icon-picker/icon-picker.nix index 902b3c3f..fe9b05ff 100644 --- a/modules/utility/icon-picker/icon-picker.nix +++ b/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"; }; diff --git a/modules/utility/telescope/telescope.nix b/modules/utility/telescope/telescope.nix index 2b43e001..4d2cbc15 100644 --- a/modules/utility/telescope/telescope.nix +++ b/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"; }; diff --git a/modules/utility/venn/config.nix b/modules/utility/venn/config.nix index 22d47b39..1bd958db 100644 --- a/modules/utility/venn/config.nix +++ b/modules/utility/venn/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/utility/venn/venn.nix b/modules/utility/venn/venn.nix index 93f13b49..ae933548 100644 --- a/modules/utility/venn/venn.nix +++ b/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"; }; diff --git a/modules/visuals/config.nix b/modules/visuals/config.nix index b1824fa5..ff87b50d 100644 --- a/modules/visuals/config.nix +++ b/modules/visuals/config.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/visuals/default.nix b/modules/visuals/default.nix index 59a3e544..20a1f492 100644 --- a/modules/visuals/default.nix +++ b/modules/visuals/default.nix @@ -1,7 +1,4 @@ { - pkgs, - config, - lib, ... }: { imports = [ diff --git a/modules/visuals/visuals.nix b/modules/visuals/visuals.nix index 43e48df4..f09ff42b 100644 --- a/modules/visuals/visuals.nix +++ b/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;