From 10ed327a1db0c557663f4f169e2e7b3ec9e54ef9 Mon Sep 17 00:00:00 2001 From: Yoni FIRROLONI Date: Wed, 29 Mar 2023 12:30:08 +0200 Subject: [PATCH 01/28] Change hm-module to default as can be found in the code --- docs/home-manager.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/home-manager.adoc b/docs/home-manager.adoc index ed85f90..fa1b963 100644 --- a/docs/home-manager.adoc +++ b/docs/home-manager.adoc @@ -19,7 +19,7 @@ Followed by importing the HM module. [source,nix] ---- { - imports = [ neovim-flake.nixosModules.hm-module ]; + imports = [ neovim-flake.nixosModules.default ]; } ---- From 686fa87c8f14d68d7dcb44530b276f728f6fdedd Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 29 Mar 2023 16:20:43 +0300 Subject: [PATCH 02/28] dev: separate home-manager module output --- flake.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 821e45f..4c0f617 100644 --- a/flake.nix +++ b/flake.nix @@ -34,12 +34,16 @@ }; nixosModules.default = { - imports = [./lib/hm-module.nix]; + home-manager.sharedModules = [./lib/hm-module.]; nixpkgs.overlays = [ inputs.tidalcycles.overlays.default inputs.self.overlays.default ]; }; + + homeManagerModules.default = { + imports = [./lib/hm-module.nix]; + }; }; perSystem = { From e4d0f57c7bd77dd4fc140d9bb9d654b8a37cc3af Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 29 Mar 2023 17:43:02 +0300 Subject: [PATCH 03/28] dev: add overlays again? --- flake.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 4c0f617..0dd067d 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ }; nixosModules.default = { - home-manager.sharedModules = [./lib/hm-module.]; + home-manager.sharedModules = [./lib/hm-module.nix]; nixpkgs.overlays = [ inputs.tidalcycles.overlays.default inputs.self.overlays.default @@ -43,6 +43,10 @@ homeManagerModules.default = { imports = [./lib/hm-module.nix]; + nixpkgs.overlays = [ + inputs.tidalcycles.overlays.default + inputs.self.overlays.default + ]; }; }; From 3f46600abc38a502a7ab8e4d69591b000c5c1921 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 29 Mar 2023 18:05:59 +0300 Subject: [PATCH 04/28] dev: default hm module should not declare nixpkgs options --- flake.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flake.nix b/flake.nix index 0dd067d..f3b5ea2 100644 --- a/flake.nix +++ b/flake.nix @@ -43,10 +43,6 @@ homeManagerModules.default = { imports = [./lib/hm-module.nix]; - nixpkgs.overlays = [ - inputs.tidalcycles.overlays.default - inputs.self.overlays.default - ]; }; }; From 16ccd518525a4a6c44fd497159e427a58bcfdfd7 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 05:20:35 +0300 Subject: [PATCH 05/28] 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 f3b5ea2..a74aae5 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 44002b5..1850a91 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 d21aaf3..c50b418 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 0b392f9..0b2dfc4 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 5dc1245..ad3e622 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 8b10bcf..d925ed0 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 785e392..f0674cb 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 87903ef..59ad538 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 402561e..f355919 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 dd0c7d3..a06cae2 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 479dcab..7ac5ad7 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 b445d91..65c6fbb 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 8b0dbd0..1a2e150 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 5c05cba..25f71f8 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 65675af..f27dcad 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 9986877..59f5f1d 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 0580cbe..d77f0a9 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 c1101a7..8989b89 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 c5053ad..5fd07b8 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 e63399b..9edf34a 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 b62667e..4600233 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 0056f89..122c06a 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 bbf791e..3467920 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 d9c43a6..a8cc9dc 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 871018d..fbd0fb6 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 7e12f2f..ae2c1b4 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 cb09d72..cf4c2d0 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 07060bd..ea3e2dd 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 0caa22c..2c6474f 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 f8b628f..97f5e07 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 0caef2b..ae1c829 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 7296a2c..738dcb5 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 c954454..b8b0a72 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 db8ac6b..f8f8024 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 d244594..eecfa42 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 e814af1..27d3cbb 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 4b7a3be..8bcd5d0 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 d3efd30..092802a 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 63334f0..af44921 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 ace4eaf..c8929ce 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 2a0a1e5..e49e416 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 48e4440..ad20b65 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 4292173..cfcb792 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 629a478..2e71f57 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 c3f7dd5..dd6a087 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 5222d6d..454c2f3 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 54fea92..11c0748 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 2baf0ee..befbf70 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 14e81c5..aa496d8 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 279a8b1..1107c35 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 186b5d3..c4631d9 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 f623db3..355610d 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 c3d799a..5bac116 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 ec445eb..773a8a1 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 58fb303..3c4b573 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 8aab984..d24e82d 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 351074b..493853c 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 c3f80ff..420e809 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 4319b6c..8d8e26b 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 af7ca32..062b02d 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 b175328..bf76d55 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 1049651..88e421c 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 643832b..bfe34d5 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 5e64886..deb78fb 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 499b779..b0e32a1 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 0e621f7..4ed2820 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 e9d897b..4a98dbd 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 89ed51c..9e98bb1 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 3383780..e2ed940 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 aed77f7..3338643 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 d511fc4..f30e814 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 1246b90..4d92269 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 9ef675f..6af2c59 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 5db5bbb..8db4b12 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 b7c2638..08acaa0 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 64e421e..30472ae 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 3b5bf20..dc4260c 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 c206336..f36a3f4 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 9a57137..38d45b6 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 a88f8ed..5a50fd3 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 aabee33..b48f7be 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 3aff60e..e6d4ea5 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 8ce9c02..967d4f7 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 f26b38b..b00c586 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 8d14c36..fdcd34c 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 7f38479..93c72dc 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 6b81ee4..8ce66a0 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 13d876f..ad66155 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 def0cfb..e1e1c34 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 6a7dbbf..9c37148 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 e146dfd..75c1490 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 902b3c3..fe9b05f 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 2b43e00..4d2cbc1 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 22d47b3..1bd958d 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 93f13b4..ae93354 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 b1824fa..ff87b50 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 59a3e54..20a1f49 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 43e48df..f09ff42 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; From e1aa20e787b9b8a0c8b5c90c573061a753a6f257 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 05:26:46 +0300 Subject: [PATCH 06/28] dev: relocate confusing letin --- flake/packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake/packages.nix b/flake/packages.nix index c50b418..a87c8a2 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -4,13 +4,13 @@ config, pkgs, ... - }: { - packages = let - docs = import ../docs { - inherit pkgs; - nmdSrc = inputs.nmd; - }; - in + }: let + docs = import ../docs { + inherit pkgs; + nmdSrc = inputs.nmd; + }; + in { + packages = { # Documentation docs = docs.manual.html; From 5f1bd13da460bca30009f9fdf07b1763ea8bf261 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 05:27:01 +0300 Subject: [PATCH 07/28] feat: use self packages for maximal --- lib/hm-module.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/hm-module.nix b/lib/hm-module.nix index 838f8c4..03e21ac 100644 --- a/lib/hm-module.nix +++ b/lib/hm-module.nix @@ -1,7 +1,8 @@ # Home Manager module { + self, config, - pkgs, + pkgs ? self.packages.default, lib ? pkgs.lib, ... }: let From 898760b5c603330328a9860952829d7dd02c7dc4 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 05:34:14 +0300 Subject: [PATCH 08/28] try using self.packages instead of overlays --- flake.nix | 4 +++- lib/hm-module.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a74aae5..36632c1 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,9 @@ }; homeManagerModules.default = { - imports = [./lib/hm-module.nix]; + imports = [ + ./lib/hm-module.nix + ]; }; }; diff --git a/lib/hm-module.nix b/lib/hm-module.nix index 03e21ac..4648966 100644 --- a/lib/hm-module.nix +++ b/lib/hm-module.nix @@ -2,12 +2,12 @@ { self, config, - pkgs ? self.packages.default, + pkgs, lib ? pkgs.lib, ... }: let cfg = config.programs.neovim-flake; - set = pkgs.neovim-maximal {mainConfig = cfg.settings;}; + set = self.packages.neovim-maximal {mainConfig = cfg.settings;}; in with lib; { meta.maintainers = [maintainers.notashelf]; From 89c0cc0373f3ae094d41cf1bdbabea0445cdb7ed Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 17:42:05 +0300 Subject: [PATCH 09/28] self.packages.maximal instead of pkgs.neovim-maximal --- lib/module/default.nix | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 lib/module/default.nix diff --git a/lib/module/default.nix b/lib/module/default.nix new file mode 100644 index 0000000..4648966 --- /dev/null +++ b/lib/module/default.nix @@ -0,0 +1,45 @@ +# Home Manager module +{ + self, + config, + pkgs, + lib ? pkgs.lib, + ... +}: let + cfg = config.programs.neovim-flake; + set = self.packages.neovim-maximal {mainConfig = cfg.settings;}; +in + with lib; { + meta.maintainers = [maintainers.notashelf]; + + options.programs.neovim-flake = { + enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility."; + + settings = mkOption { + type = types.attrsOf types.anything; + default = {}; + example = literalExpression '' + { + vim.viAlias = false; + vim.vimAlias = true; + vim.lsp = { + enable = true; + formatOnSave = true; + lightbulb.enable = true; + lspsaga.enable = false; + nvimCodeActionMenu.enable = true; + trouble.enable = true; + lspSignature.enable = true; + rust.enable = false; + nix = true; + }; + } + ''; + description = "Attribute set of neoflake preferences."; + }; + }; + + config = mkIf cfg.enable { + home.packages = [set.neovim]; + }; + } From c97a621b7187d4923ab66f41a8eae5ec553bc5df Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 17:42:15 +0300 Subject: [PATCH 10/28] clean up lib --- flake.nix | 6 ++- lib/default.nix | 2 +- lib/hm-module.nix | 45 --------------------- lib/types.nix | 7 ---- lib/{types-dag.nix => types/dag.nix} | 0 lib/types/default.nix | 7 ++++ lib/{types-plugin.nix => types/plugins.nix} | 0 7 files changed, 12 insertions(+), 55 deletions(-) delete mode 100644 lib/hm-module.nix delete mode 100644 lib/types.nix rename lib/{types-dag.nix => types/dag.nix} (100%) create mode 100644 lib/types/default.nix rename lib/{types-plugin.nix => types/plugins.nix} (100%) diff --git a/flake.nix b/flake.nix index 36632c1..a0ab89e 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,9 @@ }; nixosModules.default = { - home-manager.sharedModules = [./lib/hm-module.nix]; + home-manager.sharedModules = [ + ./lib/module + ]; nixpkgs.overlays = [ inputs.tidalcycles.overlays.default inputs.self.overlays.default @@ -42,7 +44,7 @@ homeManagerModules.default = { imports = [ - ./lib/hm-module.nix + ./lib/module ]; }; }; diff --git a/lib/default.nix b/lib/default.nix index bb4a271..873f31b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,5 +1,5 @@ {lib}: { dag = import ./dag.nix {inherit lib;}; booleans = import ./booleans.nix {inherit lib;}; - types = import ./types.nix {inherit lib;}; + types = import ./types {inherit lib;}; } diff --git a/lib/hm-module.nix b/lib/hm-module.nix deleted file mode 100644 index 4648966..0000000 --- a/lib/hm-module.nix +++ /dev/null @@ -1,45 +0,0 @@ -# Home Manager module -{ - self, - config, - pkgs, - lib ? pkgs.lib, - ... -}: let - cfg = config.programs.neovim-flake; - set = self.packages.neovim-maximal {mainConfig = cfg.settings;}; -in - with lib; { - meta.maintainers = [maintainers.notashelf]; - - options.programs.neovim-flake = { - enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility."; - - settings = mkOption { - type = types.attrsOf types.anything; - default = {}; - example = literalExpression '' - { - vim.viAlias = false; - vim.vimAlias = true; - vim.lsp = { - enable = true; - formatOnSave = true; - lightbulb.enable = true; - lspsaga.enable = false; - nvimCodeActionMenu.enable = true; - trouble.enable = true; - lspSignature.enable = true; - rust.enable = false; - nix = true; - }; - } - ''; - description = "Attribute set of neoflake preferences."; - }; - }; - - config = mkIf cfg.enable { - home.packages = [set.neovim]; - }; - } diff --git a/lib/types.nix b/lib/types.nix deleted file mode 100644 index 8625f18..0000000 --- a/lib/types.nix +++ /dev/null @@ -1,7 +0,0 @@ -{lib}: let - typesDag = import ./types-dag.nix {inherit lib;}; - typesPlugin = import ./types-plugin.nix {inherit lib;}; -in { - inherit (typesDag) dagOf; - inherit (typesPlugin) pluginsOpt; -} diff --git a/lib/types-dag.nix b/lib/types/dag.nix similarity index 100% rename from lib/types-dag.nix rename to lib/types/dag.nix diff --git a/lib/types/default.nix b/lib/types/default.nix new file mode 100644 index 0000000..fca45ba --- /dev/null +++ b/lib/types/default.nix @@ -0,0 +1,7 @@ +{lib}: let + typesDag = import ./dag.nix {inherit lib;}; + typesPlugin = import ./plugins.nix {inherit lib;}; +in { + inherit (typesDag) dagOf; + inherit (typesPlugin) pluginsOpt; +} diff --git a/lib/types-plugin.nix b/lib/types/plugins.nix similarity index 100% rename from lib/types-plugin.nix rename to lib/types/plugins.nix From f2151efd691366a857da60424c802f1a86f4bff5 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 17:46:33 +0300 Subject: [PATCH 11/28] self.packages.maximal instead of pkgs.neovim-maximal --- lib/module/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index 4648966..b26a97e 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -7,7 +7,7 @@ ... }: let cfg = config.programs.neovim-flake; - set = self.packages.neovim-maximal {mainConfig = cfg.settings;}; + set = self.packages.maximal {mainConfig = cfg.settings;}; in with lib; { meta.maintainers = [maintainers.notashelf]; From 1ba910f8de3b15a72ade247c034df703a9566e90 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 18:05:28 +0300 Subject: [PATCH 12/28] adapt to flake-parts --- lib/module/default.nix | 82 +++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index b26a97e..9942ea6 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -1,45 +1,47 @@ # Home Manager module -{ - self, - config, - pkgs, - lib ? pkgs.lib, - ... -}: let - cfg = config.programs.neovim-flake; - set = self.packages.maximal {mainConfig = cfg.settings;}; -in - with lib; { - meta.maintainers = [maintainers.notashelf]; +{inputs, ...}: { + perSystem = { + system, + config, + pkgs, + lib ? pkgs.lib, + ... + }: + with lib; let + cfg = config.programs.neovim-flake; + set = self'.packages.maximal {mainConfig = cfg.settings;}; + in { + meta.maintainers = [maintainers.notashelf]; - options.programs.neovim-flake = { - enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility."; + options.programs.neovim-flake = { + enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility."; - settings = mkOption { - type = types.attrsOf types.anything; - default = {}; - example = literalExpression '' - { - vim.viAlias = false; - vim.vimAlias = true; - vim.lsp = { - enable = true; - formatOnSave = true; - lightbulb.enable = true; - lspsaga.enable = false; - nvimCodeActionMenu.enable = true; - trouble.enable = true; - lspSignature.enable = true; - rust.enable = false; - nix = true; - }; - } - ''; - description = "Attribute set of neoflake preferences."; + settings = mkOption { + type = types.attrsOf types.anything; + default = {}; + example = literalExpression '' + { + vim.viAlias = false; + vim.vimAlias = true; + vim.lsp = { + enable = true; + formatOnSave = true; + lightbulb.enable = true; + lspsaga.enable = false; + nvimCodeActionMenu.enable = true; + trouble.enable = true; + lspSignature.enable = true; + rust.enable = false; + nix = true; + }; + } + ''; + description = "Attribute set of neoflake preferences."; + }; + }; + + config = mkIf cfg.enable { + home.packages = [set.neovim]; }; }; - - config = mkIf cfg.enable { - home.packages = [set.neovim]; - }; - } +} From c818cc108e0067f5fb00ad38940ecfbbaa0e6c5f Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 18:17:06 +0300 Subject: [PATCH 13/28] use config.packages --- lib/module/default.nix | 81 ++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index 9942ea6..1a5c3a9 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -1,47 +1,44 @@ # Home Manager module -{inputs, ...}: { - perSystem = { - system, - config, - pkgs, - lib ? pkgs.lib, - ... - }: - with lib; let - cfg = config.programs.neovim-flake; - set = self'.packages.maximal {mainConfig = cfg.settings;}; - in { - meta.maintainers = [maintainers.notashelf]; +{ + pkgs, + config, + lib ? pkgs.lib, + ... +}: +with lib; let + cfg = config.programs.neovim-flake; + set = config.packages.maximal {mainConfig = cfg.settings;}; +in { + meta.maintainers = [maintainers.notashelf]; - options.programs.neovim-flake = { - enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility."; + options.programs.neovim-flake = { + enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility."; - settings = mkOption { - type = types.attrsOf types.anything; - default = {}; - example = literalExpression '' - { - vim.viAlias = false; - vim.vimAlias = true; - vim.lsp = { - enable = true; - formatOnSave = true; - lightbulb.enable = true; - lspsaga.enable = false; - nvimCodeActionMenu.enable = true; - trouble.enable = true; - lspSignature.enable = true; - rust.enable = false; - nix = true; - }; - } - ''; - description = "Attribute set of neoflake preferences."; - }; - }; - - config = mkIf cfg.enable { - home.packages = [set.neovim]; - }; + settings = mkOption { + type = types.attrsOf types.anything; + default = {}; + example = literalExpression '' + { + vim.viAlias = false; + vim.vimAlias = true; + vim.lsp = { + enable = true; + formatOnSave = true; + lightbulb.enable = true; + lspsaga.enable = false; + nvimCodeActionMenu.enable = true; + trouble.enable = true; + lspSignature.enable = true; + rust.enable = false; + nix = true; + }; + } + ''; + description = "Attribute set of neoflake preferences."; }; + }; + + config = mkIf cfg.enable { + home.packages = [set.neovim]; + }; } From 67bb5f17bd7adebd10143df158e0f6966d6e44aa Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 18:20:08 +0300 Subject: [PATCH 14/28] dev: use config.legacyPackags --- lib/module/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index 1a5c3a9..5454b28 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -7,7 +7,7 @@ }: with lib; let cfg = config.programs.neovim-flake; - set = config.packages.maximal {mainConfig = cfg.settings;}; + set = config.legacyPackages.neovim-maximal {mainConfig = cfg.settings;}; in { meta.maintainers = [maintainers.notashelf]; From e74578b84c49062860b4cc5edfa47301f9632df9 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 31 Mar 2023 18:47:17 +0300 Subject: [PATCH 15/28] style: formatting --- modules/dashboard/default.nix | 4 +- modules/git/default.nix | 4 +- modules/git/git.nix | 68 +++++++++++++++++----------------- modules/lsp/default.nix | 4 +- modules/markdown/default.nix | 4 +- modules/minimap/default.nix | 4 +- modules/statusline/default.nix | 4 +- modules/theme/default.nix | 4 +- modules/tidal/default.nix | 4 +- modules/treesitter/default.nix | 4 +- modules/visuals/default.nix | 4 +- 11 files changed, 43 insertions(+), 65 deletions(-) diff --git a/modules/dashboard/default.nix b/modules/dashboard/default.nix index 122c06a..c63ad3e 100644 --- a/modules/dashboard/default.nix +++ b/modules/dashboard/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./alpha ./dashboard-nvim diff --git a/modules/git/default.nix b/modules/git/default.nix index cf4c2d0..6336b41 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./config.nix ./git.nix diff --git a/modules/git/git.nix b/modules/git/git.nix index ea3e2dd..e9af83b 100644 --- a/modules/git/git.nix +++ b/modules/git/git.nix @@ -21,43 +21,41 @@ in { config = mkIf cfg.enable - ( - { - vim.startPlugins = - if (cfg.gitsigns.enable) - then ["gitsigns-nvim"] - else []; + { + vim.startPlugins = + if (cfg.gitsigns.enable) + then ["gitsigns-nvim"] + else []; - vim.luaConfigRC.gitsigns = mkIf (cfg.gitsigns.enable) (nvim.dag.entryAnywhere '' - -- GitSigns setup - require('gitsigns').setup { - keymaps = { - noremap = true, + vim.luaConfigRC.gitsigns = mkIf (cfg.gitsigns.enable) (nvim.dag.entryAnywhere '' + -- GitSigns setup + require('gitsigns').setup { + keymaps = { + noremap = true, - ['n gn'] = { expr = true, "&diff ? \'\' : 'Gitsigns next_hunk'"}, - ['n gp'] = { expr = true, "&diff ? \'\' : 'Gitsigns prev_hunk'"}, + ['n gn'] = { expr = true, "&diff ? \'\' : 'Gitsigns next_hunk'"}, + ['n gp'] = { expr = true, "&diff ? \'\' : 'Gitsigns prev_hunk'"}, - ['n gs'] = 'Gitsigns stage_hunk', - ['v gs'] = ':Gitsigns stage_hunk', - ['n gu'] = 'Gitsigns undo_stage_hunk', - ['n gr'] = 'Gitsigns reset_hunk', - ['v gr'] = ':Gitsigns reset_hunk', - ['n gR'] = 'Gitsigns reset_buffer', - ['n gp'] = 'Gitsigns preview_hunk', - ['n gb'] = 'lua require"gitsigns".blame_line{full=true}', - ['n gS'] = 'Gitsigns stage_buffer', - ['n gU'] = 'Gitsigns reset_buffer_index', - ['n gts'] = ':Gitsigns toggle_signs', - ['n gtn'] = ':Gitsigns toggle_numhl', - ['n gtl'] = ':Gitsigns toggle_linehl', - ['n gtw'] = ':Gitsigns toggle_word_diff', + ['n gs'] = 'Gitsigns stage_hunk', + ['v gs'] = ':Gitsigns stage_hunk', + ['n gu'] = 'Gitsigns undo_stage_hunk', + ['n gr'] = 'Gitsigns reset_hunk', + ['v gr'] = ':Gitsigns reset_hunk', + ['n gR'] = 'Gitsigns reset_buffer', + ['n gp'] = 'Gitsigns preview_hunk', + ['n gb'] = 'lua require"gitsigns".blame_line{full=true}', + ['n gS'] = 'Gitsigns stage_buffer', + ['n gU'] = 'Gitsigns reset_buffer_index', + ['n gts'] = ':Gitsigns toggle_signs', + ['n gtn'] = ':Gitsigns toggle_numhl', + ['n gtl'] = ':Gitsigns toggle_linehl', + ['n gtw'] = ':Gitsigns toggle_word_diff', - -- Text objects - ['o ih'] = ':Gitsigns select_hunk', - ['x ih'] = ':Gitsigns select_hunk' - }, - } - ''); - } - ); + -- Text objects + ['o ih'] = ':Gitsigns select_hunk', + ['x ih'] = ':Gitsigns select_hunk' + }, + } + ''); + }; } diff --git a/modules/lsp/default.nix b/modules/lsp/default.nix index 2c6474f..8f093cb 100644 --- a/modules/lsp/default.nix +++ b/modules/lsp/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ # nvim lsp support ./config.nix diff --git a/modules/markdown/default.nix b/modules/markdown/default.nix index e49e416..e975149 100644 --- a/modules/markdown/default.nix +++ b/modules/markdown/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./glow ./config.nix diff --git a/modules/minimap/default.nix b/modules/minimap/default.nix index 454c2f3..6a03b01 100644 --- a/modules/minimap/default.nix +++ b/modules/minimap/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./minimap-vim ./codewindow diff --git a/modules/statusline/default.nix b/modules/statusline/default.nix index bfe34d5..82e3dd2 100644 --- a/modules/statusline/default.nix +++ b/modules/statusline/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./lualine ]; diff --git a/modules/theme/default.nix b/modules/theme/default.nix index f30e814..02f4f37 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./theme.nix ./config.nix diff --git a/modules/tidal/default.nix b/modules/tidal/default.nix index 6af2c59..da6dd5a 100644 --- a/modules/tidal/default.nix +++ b/modules/tidal/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./tidal.nix ./config.nix diff --git a/modules/treesitter/default.nix b/modules/treesitter/default.nix index dc4260c..30d51d5 100644 --- a/modules/treesitter/default.nix +++ b/modules/treesitter/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./treesitter.nix ./context.nix diff --git a/modules/visuals/default.nix b/modules/visuals/default.nix index 20a1f49..9efdde7 100644 --- a/modules/visuals/default.nix +++ b/modules/visuals/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./config.nix ./visuals.nix From 17e6fe5150de602b9aad967f35b2e6956ce21ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= <30625554+n3oney@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:37:24 +0200 Subject: [PATCH 16/28] fix: fix cannot coerce null to a string when noice or notify-nvim not enabled --- modules/utility/telescope/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/utility/telescope/config.nix b/modules/utility/telescope/config.nix index 135637c..3caae1b 100644 --- a/modules/utility/telescope/config.nix +++ b/modules/utility/telescope/config.nix @@ -101,13 +101,13 @@ in { ${ if config.vim.ui.noice.enable then "telescope.load_extension('noice')" - else null + else "" } ${ if config.vim.notify.nvim-notify.enable then "telescope.load_extension('notify')" - else null + else "" } ''; }; From f9a783904ecabd4f5b4a01102506ad333c9976b0 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 1 Apr 2023 00:57:25 +0300 Subject: [PATCH 17/28] dev: get maximal from self.packages --- flake.nix | 3 ++- lib/module/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a0ab89e..b9755a4 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ outputs = { nixpkgs, flake-parts, + self, ... } @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { @@ -44,7 +45,7 @@ homeManagerModules.default = { imports = [ - ./lib/module + (import ./lib/module self.packages) ]; }; }; diff --git a/lib/module/default.nix b/lib/module/default.nix index 5454b28..41dc41a 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -1,13 +1,14 @@ # Home Manager module -{ +packages: { pkgs, config, lib ? pkgs.lib, + self, ... }: with lib; let cfg = config.programs.neovim-flake; - set = config.legacyPackages.neovim-maximal {mainConfig = cfg.settings;}; + set = self.packages.maximal {mainConfig = cfg.settings;}; in { meta.maintainers = [maintainers.notashelf]; From d109d66a9c05cc8cd65bffec25069b949a63514d Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 1 Apr 2023 01:01:22 +0300 Subject: [PATCH 18/28] dev: its pkgs.system --- lib/module/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index 41dc41a..0c27890 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -8,7 +8,7 @@ packages: { }: with lib; let cfg = config.programs.neovim-flake; - set = self.packages.maximal {mainConfig = cfg.settings;}; + set = self.packages.${pkgs.system}.maximal {mainConfig = cfg.settings;}; in { meta.maintainers = [maintainers.notashelf]; From 35888c639c31c44a4650f9232043f1cea2ca9aa3 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 1 Apr 2023 01:09:14 +0300 Subject: [PATCH 19/28] dev: befriend scopes --- lib/module/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index 0c27890..f87a549 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -8,7 +8,7 @@ packages: { }: with lib; let cfg = config.programs.neovim-flake; - set = self.packages.${pkgs.system}.maximal {mainConfig = cfg.settings;}; + set = packages.${pkgs.system}.maximal {mainConfig = cfg.settings;}; in { meta.maintainers = [maintainers.notashelf]; From 3f330a1118e26fb5443f7d83859abf1dd23a60d0 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 1 Apr 2023 01:15:05 +0300 Subject: [PATCH 20/28] dev: try overrides --- lib/module/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index f87a549..025b340 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -8,7 +8,7 @@ packages: { }: with lib; let cfg = config.programs.neovim-flake; - set = packages.${pkgs.system}.maximal {mainConfig = cfg.settings;}; + set = packages.${pkgs.system}.maximal.override {mainConfig = cfg.settings;}; in { meta.maintainers = [maintainers.notashelf]; From d4acc8b309a4ecbe0492691b19a553297cf47b83 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 1 Apr 2023 01:35:35 +0300 Subject: [PATCH 21/28] dev: try legacypackages --- flake.nix | 2 +- lib/module/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index b9755a4..8c5cb1c 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ homeManagerModules.default = { imports = [ - (import ./lib/module self.packages) + (import ./lib/module self.config) ]; }; }; diff --git a/lib/module/default.nix b/lib/module/default.nix index 025b340..f87a549 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -8,7 +8,7 @@ packages: { }: with lib; let cfg = config.programs.neovim-flake; - set = packages.${pkgs.system}.maximal.override {mainConfig = cfg.settings;}; + set = packages.${pkgs.system}.maximal {mainConfig = cfg.settings;}; in { meta.maintainers = [maintainers.notashelf]; From 91ac6fd6c0b2dc0724be4d0be9bdbe70e2184bb5 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 1 Apr 2023 01:44:47 +0300 Subject: [PATCH 22/28] Revert "dev: try legacypackages" This reverts commit 317ff16bb7d71f49ecbba0550a085463deb301a5. --- flake.nix | 2 +- lib/module/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8c5cb1c..b9755a4 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ homeManagerModules.default = { imports = [ - (import ./lib/module self.config) + (import ./lib/module self.packages) ]; }; }; diff --git a/lib/module/default.nix b/lib/module/default.nix index f87a549..025b340 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -8,7 +8,7 @@ packages: { }: with lib; let cfg = config.programs.neovim-flake; - set = packages.${pkgs.system}.maximal {mainConfig = cfg.settings;}; + set = packages.${pkgs.system}.maximal.override {mainConfig = cfg.settings;}; in { meta.maintainers = [maintainers.notashelf]; From 787c2065abc4746302f8a1a019ccaf2383ced0f9 Mon Sep 17 00:00:00 2001 From: FlafyDev Date: Sat, 1 Apr 2023 15:19:46 +0300 Subject: [PATCH 23/28] fix(hm module): use neovimConfiguration to make package --- flake.nix | 2 +- lib/module/default.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index b9755a4..f1661b1 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ homeManagerModules.default = { imports = [ - (import ./lib/module self.packages) + (import ./lib/module self.packages inputs) ]; }; }; diff --git a/lib/module/default.nix b/lib/module/default.nix index 025b340..7689aef 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -1,5 +1,5 @@ # Home Manager module -packages: { +packages: inputs: { pkgs, config, lib ? pkgs.lib, @@ -8,7 +8,11 @@ packages: { }: with lib; let cfg = config.programs.neovim-flake; - set = packages.${pkgs.system}.maximal.override {mainConfig = cfg.settings;}; + inherit (import ../../extra.nix inputs) neovimConfiguration; + set = neovimConfiguration { + inherit pkgs; + modules = [cfg.settings]; + }; in { meta.maintainers = [maintainers.notashelf]; From 78103c175905c76a2d8e1286aa32f6c1b3b33af5 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 2 Apr 2023 19:10:04 +0300 Subject: [PATCH 24/28] feat: bump flake inputs --- flake.lock | 306 ++++++++++++++++++++++++++--------------------------- 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/flake.lock b/flake.lock index 9147d2a..b7fa1b2 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "alpha-nvim": { "flake": false, "locked": { - "lastModified": 1677868849, - "narHash": "sha256-230AM1W6S1zKhDsVACR3Zsw3WWo6X6OEXN6ur77kehs=", + "lastModified": 1679422215, + "narHash": "sha256-jNJ/0ueUXgArpWHypIkNA4hKrwYjthva7gK9JuE4VWM=", "owner": "goolord", "repo": "alpha-nvim", - "rev": "4b0ba68022d8612b04b26844f1ce5e708c0d23b0", + "rev": "dafa11a6218c2296df044e00f88d9187222ba6b0", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "catppuccin": { "flake": false, "locked": { - "lastModified": 1677749356, - "narHash": "sha256-AjXzNow5v/xFS+L6OfHbid1yPq8GbmNS0Nn0gILRnDI=", + "lastModified": 1679888068, + "narHash": "sha256-UrHoESRYwALPo6LFFocEIM0CZa740tjxjvmYES7O5Rw=", "owner": "catppuccin", "repo": "nvim", - "rev": "e406cf07a1573c77ab83e142cc0d8c9d798d5c81", + "rev": "73587f9c454da81679202f1668c30fea6cdafd5e", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "cmp-treesitter": { "flake": false, "locked": { - "lastModified": 1666995820, - "narHash": "sha256-+dOqV9QqN+s1no8vfL6DNeFBc2dYyduQqAH5zVwm3Rw=", + "lastModified": 1679830722, + "narHash": "sha256-t1xEQn6NXcNG215ldm0ivKZdgaoGFwDiZUb8ROBeZHU=", "owner": "ray-x", "repo": "cmp-treesitter", - "rev": "b40178b780d547bcf131c684bc5fd41af17d05f2", + "rev": "c8e3a74b51597d69d240085a258636972ce98e15", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "colorizer": { "flake": false, "locked": { - "lastModified": 1677805707, - "narHash": "sha256-OhZbK5igSDBS6Vk5qgW478M6ZXev+HECNT09NVTuBQg=", + "lastModified": 1680271664, + "narHash": "sha256-UQwIf96eG79iEBDhQvfjByrAc+LXyKiT4EVrPe1+YmY=", "owner": "uga-rosa", "repo": "ccc.nvim", - "rev": "e66fd3a18eff0c9c4c772a5e5fd9ad68753c6d8e", + "rev": "3e07b8ffc9dab162cd2940e75601da75ed0cebbe", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "comment-nvim": { "flake": false, "locked": { - "lastModified": 1676528587, - "narHash": "sha256-SwN67ILsNJk0bNkcfQFiipAULaDxTfnCDHSC/+XKeLA=", + "lastModified": 1678452935, + "narHash": "sha256-mVJJJ9fUJYgVyGZnW8e6P5QWB0K8nuhTwSWzlBvxv2M=", "owner": "numToStr", "repo": "Comment.nvim", - "rev": "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43", + "rev": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "copilot-lua": { "flake": false, "locked": { - "lastModified": 1677479736, - "narHash": "sha256-n/SCrzzzL5WUHJk0sCXbgGusk/dQuy8DI9Pqdh+lVeQ=", + "lastModified": 1680027228, + "narHash": "sha256-3u+2azMRm24mp5iOrxwYg9QrM2xJHnSjGsldIDRS6HQ=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f", + "rev": "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "crates-nvim": { "flake": false, "locked": { - "lastModified": 1677075483, - "narHash": "sha256-xarbPUL3yFMOn5Bse+syw1vLxqA/krS3tbuu/baup/k=", + "lastModified": 1680384424, + "narHash": "sha256-0fgC3wEMc2fmxHPLHyt0UTdpvuAOkdhdfEDWJ6qA9Q0=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "c33aae75745877ee1ef16f5781478f4f2f120623", + "rev": "097da7b79246247b8e660815c12908706031e09a", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "dashboard-nvim": { "flake": false, "locked": { - "lastModified": 1677759071, - "narHash": "sha256-FaiDd0IldvMVBD/oO+g1ti6jzhZ2UmnYnM2dA18Jo8E=", + "lastModified": 1680074354, + "narHash": "sha256-V16XxNlFBGFtKsquqPy44+IFWiBZcs3OY/6SF+7bdrA=", "owner": "glepnir", "repo": "dashboard-nvim", - "rev": "42213650c278d007dd198a1d115394e85b406188", + "rev": "4c2b038c5cfa70f90506f1551e5fd2d040174e08", "type": "github" }, "original": { @@ -275,11 +275,11 @@ "diffview-nvim": { "flake": false, "locked": { - "lastModified": 1677593773, - "narHash": "sha256-CMURShXn0RjZW3dc96o1usaLwWC+gOPAkIn3D9YPyBg=", + "lastModified": 1680290718, + "narHash": "sha256-t4YC8xAjRA+6p7IPM71lL5wWY0pAwTqL7vom3cDSV44=", "owner": "sindrets", "repo": "diffview.nvim", - "rev": "009beb8054e510e7e2df122ee3ddb2b46bef542b", + "rev": "932d10de327bccdedee439d9d55f4d857caa334e", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "fidget-nvim": { "flake": false, "locked": { - "lastModified": 1676661245, - "narHash": "sha256-f49AwromG0rHZ5i1q4i6GJgLNtusa8QpciljL0dgSJo=", + "lastModified": 1679938700, + "narHash": "sha256-rmJgfrEr/PYBq0S7j3tzRZvxi7PMMaAo0k528miXOQc=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "688b4fec4517650e29c3e63cfbb6e498b3112ba1", + "rev": "0ba1e16d07627532b6cae915cc992ecac249fb97", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1677714448, - "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=", + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -435,11 +435,11 @@ "gesture-nvim": { "flake": false, "locked": { - "lastModified": 1677239871, - "narHash": "sha256-hc0nFK7cC4A8kttQ4BrSDzeFlQyHUHWOo0MgT7ayoJU=", + "lastModified": 1680321931, + "narHash": "sha256-WXH71e+9MLbylq1StuwWQX61brYtS4Kx10OGWlfi/FY=", "owner": "notomo", "repo": "gesture.nvim", - "rev": "b1024dbe2ee4dd5f7bc6293e3d6f2898e793594c", + "rev": "5fa0d76b890717081786c74b4824546052e14671", "type": "github" }, "original": { @@ -451,11 +451,11 @@ "gitsigns-nvim": { "flake": false, "locked": { - "lastModified": 1677707536, - "narHash": "sha256-Ny2kW4FpA5reDmvJkXaezRi2BlIaTiIZYFuTuunFJh8=", + "lastModified": 1680209380, + "narHash": "sha256-IoWMURofYoLSy9QVE3m1gAcj2s7iRA30gOts47J3rcU=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be", + "rev": "f412f51d0eaf0905a2759c8087090071689bb8fb", "type": "github" }, "original": { @@ -467,11 +467,11 @@ "glow-nvim": { "flake": false, "locked": { - "lastModified": 1677812369, - "narHash": "sha256-fIV2hfuoeQrzJjqrYO69k+utu5/YhlqqeestGc/l8n0=", + "lastModified": 1679769779, + "narHash": "sha256-kPM5c7iQ19cxVt5t/nk+svTsk814PBPsnYWAd2yhlas=", "owner": "ellisonleao", "repo": "glow.nvim", - "rev": "5a8ccfb1876b1b2e29ea32c63221be6df45870d1", + "rev": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215", "type": "github" }, "original": { @@ -531,11 +531,11 @@ "lsp-signature": { "flake": false, "locked": { - "lastModified": 1675379662, - "narHash": "sha256-g5bAumjFvA0MBPNKWqOxk5OsaR4KEe5CEsiNN5YbIQU=", + "lastModified": 1679524823, + "narHash": "sha256-krQ0ihqbrsG4u8HdYlgaq0fOyIIDX4KDdffMRaJKQ78=", "owner": "ray-x", "repo": "lsp_signature.nvim", - "rev": "6f6252f63b0baf0f2224c4caea33819a27f3f550", + "rev": "1882019270be445a8cad4353f1530574f2b2d02d", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "lualine": { "flake": false, "locked": { - "lastModified": 1676394253, - "narHash": "sha256-mItWWRqWj9a/JaW8sccnGBijBsvvnh/b4q/S60UwYwc=", + "lastModified": 1680275227, + "narHash": "sha256-bZSt9rBaeO5CjExu9Si3Ch/k0H/mzBE89KeeTCg4AbU=", "owner": "hoob3rt", "repo": "lualine.nvim", - "rev": "e99d733e0213ceb8f548ae6551b04ae32e590c80", + "rev": "9170434aa100f3967b43d5d34bb9adc56fae1986", "type": "github" }, "original": { @@ -595,11 +595,11 @@ "mind-nvim": { "flake": false, "locked": { - "lastModified": 1674572816, - "narHash": "sha256-yLf/2NvPT0RtFh6+0W32Uaj3Tjs52oyZSb8Jq3INZI4=", + "lastModified": 1679526071, + "narHash": "sha256-JIhAhQYGLLRucwlhzfckQYU5qjqbHtNH52JlGS5a79w=", "owner": "phaazon", "repo": "mind.nvim", - "rev": "e59c52758c399caceb549c698cfa2d65e6bbb9f9", + "rev": "002137dd7cf97865ebd01b6a260209d2daf2da66", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "minimap-vim": { "flake": false, "locked": { - "lastModified": 1666947112, - "narHash": "sha256-xKQfCh3R4MdHolRocZS0IC/OADZd8aVRQLlC0ErWSkc=", + "lastModified": 1680280122, + "narHash": "sha256-xrKkVTVVna9wc38K/CGCnQmWrofUAYJ0f92NR/ycfZ4=", "owner": "wfxr", "repo": "minimap.vim", - "rev": "2b0151d7302f87f90c4664d119518dda73cc4633", + "rev": "15dce1b667d4df0eec715798ab94c0850316e8a3", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1677910793, - "narHash": "sha256-xjlzJzPVUFJ2Jq7wXnGzhcP9y7gIdm64mdj8N5+XNGM=", + "lastModified": 1680310604, + "narHash": "sha256-2jop/z79HYhmV/hrdGvhjfTMouvzQvNRgFTkPhwWVcg=", "owner": "neovim", "repo": "neovim", - "rev": "de14f2c928f913d4fb617d693024eec5cf2223ec", + "rev": "75e1b1d5c934aa3a12693a7df58795563fb7877e", "type": "github" }, "original": { @@ -678,11 +678,11 @@ ] }, "locked": { - "lastModified": 1677917632, - "narHash": "sha256-NwjqAYbhHlTNfvTBfLV1lfHiVnnzuRBTHF9VtCj6rG8=", + "lastModified": 1680336751, + "narHash": "sha256-otSdFRXsNyPYOsbo+49vN4UGwZrVoLDrEp0EkyVJ/rY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "8066172d476a51da5a437ed512bbd0b9ddf0fdc7", + "rev": "d56f32281f4d6d74ce925a99946713dc6b5a0e30", "type": "github" }, "original": { @@ -702,11 +702,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1677868216, - "narHash": "sha256-689PNrU+2O/xUV+UMAjiqGNTpRf2ZC99DnfPVeTdQvw=", + "lastModified": 1680185050, + "narHash": "sha256-MtyaP3j1yxwrqPFUsLD0qFyyH7d/h0D/whfErxS2UFM=", "owner": "oxalica", "repo": "nil", - "rev": "0f918f956fefee72eff801cdcfc0c7cce5be586a", + "rev": "0718fca59b82e53aef07699db7e1bbd86ba8dacf", "type": "github" }, "original": { @@ -717,11 +717,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677852945, - "narHash": "sha256-liiVJjkBTuBTAkRW3hrI8MbPD2ImYzwUpa7kvteiKhM=", + "lastModified": 1680273054, + "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f5ffd5787786dde3a8bf648c7a1b5f78c4e01abb", + "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", "type": "github" }, "original": { @@ -734,11 +734,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1677407201, - "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=", + "lastModified": 1678375444, + "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505", + "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "type": "github" }, "original": { @@ -800,11 +800,11 @@ "nmd": { "flake": false, "locked": { - "lastModified": 1675884907, - "narHash": "sha256-IyLmIotAp7g6sxjeKx6gl52KQ/Xi6wyyHFhd/AWuM5o=", + "lastModified": 1680213367, + "narHash": "sha256-NbSXxpFAK5IMcsQTK0vSGy099HExx3SEagqW4Lpc+X8=", "owner": "rycee", "repo": "nmd", - "rev": "fa87e124c83ba343f88607b7348a4bd8a0ad061c", + "rev": "abb15317ebd17e5a0a7dd105e2ce52f2700185a8", "type": "gitlab" }, "original": { @@ -816,11 +816,11 @@ "noice-nvim": { "flake": false, "locked": { - "lastModified": 1677882849, - "narHash": "sha256-3XQklNVwwzkrQtaKw8U8iXnNcDMiuEvXtceE2ACY6wc=", + "lastModified": 1679827108, + "narHash": "sha256-05/yAwaoz7mAAKXP1CsRXUoqsTW/z1wAT0OodiYJw6M=", "owner": "folke", "repo": "noice.nvim", - "rev": "c22651651da01239fc4afac4cdb7261797d5f02e", + "rev": "1da4edfba3e9278e98fc9723d7235d9ab3889744", "type": "github" }, "original": { @@ -832,11 +832,11 @@ "nui-nvim": { "flake": false, "locked": { - "lastModified": 1677566469, - "narHash": "sha256-xHpNGJ8ikTMiWHAtqaZg5IVKSngH/k0LN7WaOHl2iz8=", + "lastModified": 1680113440, + "narHash": "sha256-pDroyXtkrBGbEZs0mcf+96ba72c0leNMW0AlM50RDJ8=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be", + "rev": "4eaec2ac66af2ca6ddddd3f665ad0909b90ae36a", "type": "github" }, "original": { @@ -848,11 +848,11 @@ "null-ls": { "flake": false, "locked": { - "lastModified": 1676936752, - "narHash": "sha256-uGyXBh1SpNpOkUlZpQ0RWRTMW6x3uhg4x07hmjkpSro=", + "lastModified": 1680311856, + "narHash": "sha256-JViLNL2LLzm+ZQYnR4HF3e2mBa7AbDK7jWn4ZhjKYbY=", "owner": "jose-elias-alvarez", "repo": "null-ls.nvim", - "rev": "689cdd78f70af20a37b5309ebc287ac645ae4f76", + "rev": "defa0518762abb32279d601443344fb9773f9330", "type": "github" }, "original": { @@ -864,11 +864,11 @@ "nvim-autopairs": { "flake": false, "locked": { - "lastModified": 1677712006, - "narHash": "sha256-TruglMs8Rl6og2F8HANlB1V73QXmORLyUifCkJ6HPBU=", + "lastModified": 1679861399, + "narHash": "sha256-G5D07KozNj48CxzcMevf1+ZqJEMXQql7VfWUseg6Rzc=", "owner": "windwp", "repo": "nvim-autopairs", - "rev": "ab49517cfd1765b3f3de52c1f0fda6190b44e27b", + "rev": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4", "type": "github" }, "original": { @@ -897,11 +897,11 @@ "nvim-cmp": { "flake": false, "locked": { - "lastModified": 1677479977, - "narHash": "sha256-cFX19DqWSwkki8TDfEBca1EV81PIPTx92rCpNUslaL8=", + "lastModified": 1679026924, + "narHash": "sha256-CoHGIiZrhRAHZ/Er0JSQMapI7jwllNF5OysLlx2QEik=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "01f697a68905f9dcae70960a9eb013695a17f9a2", + "rev": "777450fd0ae289463a14481673e26246b5e38bf2", "type": "github" }, "original": { @@ -977,11 +977,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1677827056, - "narHash": "sha256-iO9Y25/2RaqMScCXA5P6vj/fSgmsrSN5HSPjBlUkHmE=", + "lastModified": 1680376121, + "narHash": "sha256-iEBGdENh3qXKHpRCqApG2JfJwXOsInivO0dUGton+I4=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "e0926b6abc84578f44fb8917d61cdee22188639e", + "rev": "8cbfc30c4b238cc2465ff256803f7747376f046a", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ "nvim-notify": { "flake": false, "locked": { - "lastModified": 1677922748, - "narHash": "sha256-3E9FN+dAKswzLTX6PYJIj30MWxd3estsZORBEf2Csn0=", + "lastModified": 1679522899, + "narHash": "sha256-xkDr0tASezDmnxyLb7JvzCjE/HPv4ckqiJsBmaSR+Fs=", "owner": "rcarriga", "repo": "nvim-notify", - "rev": "281e4d793c550c866bea3fb85d39de1f0188fb50", + "rev": "50d037041ada0895aeba4c0215cde6d11b7729c4", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ "nvim-session-manager": { "flake": false, "locked": { - "lastModified": 1675414961, - "narHash": "sha256-dHFhZtBvU6sc6XR49oL3TW0sUwAOwLf4S5q+m8u76c8=", + "lastModified": 1680110654, + "narHash": "sha256-w0tPefWblZJpLC560saBz9eRuSvbAkoSnq36Zdyjnm8=", "owner": "Shatur", "repo": "neovim-session-manager", - "rev": "e7a2cbf56b5fd3a223f2774b535499fc62eca6ef", + "rev": "d1883f30921193f3cff4537e27514e454e0331e9", "type": "github" }, "original": { @@ -1041,11 +1041,11 @@ "nvim-tree-lua": { "flake": false, "locked": { - "lastModified": 1677902521, - "narHash": "sha256-POU6+SwyYJRLQKjvft3S6a3U25aUmNlGm+pynFnD9jQ=", + "lastModified": 1679961168, + "narHash": "sha256-9e5kBw9cZX08uQAfFb/YP17a1biDR8PNg617PhkKJhk=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "1b453441f4b1a501a6251db4138cf67172d0d5d2", + "rev": "45400cd7e02027937cd5e49845545e606ecf5a1f", "type": "github" }, "original": { @@ -1073,11 +1073,11 @@ "nvim-ts-autotag": { "flake": false, "locked": { - "lastModified": 1660219579, - "narHash": "sha256-ltGiYNXWpWSI5RrWTVR+k6SZjcZbsHtH5m9uHTMKnzM=", + "lastModified": 1679019585, + "narHash": "sha256-XNR09azYMviWt8aU8XuhS7q+AT5xRBK+FkeejlAAshg=", "owner": "windwp", "repo": "nvim-ts-autotag", - "rev": "fdefe46c6807441460f11f11a167a2baf8e4534b", + "rev": "25698e4033cd6cd3745454bfc837dd670eba0480", "type": "github" }, "original": { @@ -1089,11 +1089,11 @@ "nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1677896805, - "narHash": "sha256-aLxgt3tV0RN1+s1gFmPyXX6z0+6Waw1jA5n10B7TW/4=", + "lastModified": 1680259444, + "narHash": "sha256-KY0L9j7zKSXgVLUqoda3btiQ6r1h/gckJGpma4CXqUM=", "owner": "kyazdani42", "repo": "nvim-web-devicons", - "rev": "c3c1dc4e36969370ff589b7025df8ec2e5c881a2", + "rev": "d92b3f4275f4774c0cb23b8b094a41d1dbb3e78c", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ "obsidian-nvim": { "flake": false, "locked": { - "lastModified": 1676575215, - "narHash": "sha256-r7Wr16SuVa1HqGrUWnRc3tjKGTBRiLbrV+iED8p7G+o=", + "lastModified": 1680287173, + "narHash": "sha256-OV3s/0qZi29GH1tWqjQjbBWMHkOJfmTujjMO18/rKg8=", "owner": "epwalsh", "repo": "obsidian.nvim", - "rev": "5ecf680cf8fc49c6881126f4242a496d79c6f6f7", + "rev": "e1c4658cc6530a8d2f393451f68bd9e6366173b9", "type": "github" }, "original": { @@ -1121,11 +1121,11 @@ "onedark": { "flake": false, "locked": { - "lastModified": 1676397581, - "narHash": "sha256-x3Tx0Spbm95M71sBvm2sVCyCIkeRSfvlC/TKcBMIwg4=", + "lastModified": 1679504944, + "narHash": "sha256-vwrffcwutr1HKKcNz2hGEO46EIJS1Fug17VCuWRNu/o=", "owner": "navarasu", "repo": "onedark.nvim", - "rev": "1fe908fb4acdcee26573e9ccde0de94ec77e5e84", + "rev": "dd640f6cfb0e370cfd3db389f04b172508848bd3", "type": "github" }, "original": { @@ -1137,11 +1137,11 @@ "orgmode-nvim": { "flake": false, "locked": { - "lastModified": 1676102032, - "narHash": "sha256-rSesMpucbNdlGVVjN5JKR9ZjfvFRxm1HqT6B5ls7KrU=", + "lastModified": 1680214315, + "narHash": "sha256-jveJ1ffvv4pkfog1t98yPvTiltTv8Li89gEDbBnz8K0=", "owner": "nvim-orgmode", "repo": "orgmode", - "rev": "313ce5a04e7fc3d677ad906a94fc49c1f54d1572", + "rev": "070f7588629b956bba17d9892e6fa15bf19a2260", "type": "github" }, "original": { @@ -1185,11 +1185,11 @@ "registers": { "flake": false, "locked": { - "lastModified": 1676623826, - "narHash": "sha256-wU5WD9se2rvEap/hRki7AM2T0XyTDooER3o1RlSAGRg=", + "lastModified": 1678110851, + "narHash": "sha256-JxOtdChh4V/SfBQNVDoHdWvH49nfDhlokS/7vWQWryI=", "owner": "tversteeg", "repo": "registers.nvim", - "rev": "2d08fffeb8533d3678bd796010c13c7fa2534263", + "rev": "0a461e635403065b3f9a525bd77eff30759cfba0", "type": "github" }, "original": { @@ -1313,11 +1313,11 @@ ] }, "locked": { - "lastModified": 1677638104, - "narHash": "sha256-vbdOoDYnQ1QYSchMb3fYGCLYeta3XwmGvMrlXchST5s=", + "lastModified": 1678415622, + "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f388187efb41ce4195b2f4de0b6bb463d3cd0a76", + "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7", "type": "github" }, "original": { @@ -1345,11 +1345,11 @@ "scrollbar-nvim": { "flake": false, "locked": { - "lastModified": 1676328140, - "narHash": "sha256-ZTU8+OPROdtkov75rvFpd3RuZ98PN1wiA7UOyPUqmw8=", + "lastModified": 1679265551, + "narHash": "sha256-NdrWWiumuDM2RJKmVIGjnknUmcqIc/jOzfYKgPCxO9k=", "owner": "petertriho", "repo": "nvim-scrollbar", - "rev": "75210c554e935740448cfb532d8a671ae544bb1b", + "rev": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943", "type": "github" }, "original": { @@ -1361,11 +1361,11 @@ "sqls-nvim": { "flake": false, "locked": { - "lastModified": 1657291129, - "narHash": "sha256-tatUEAI8EVXDYQPAAZ5+38YOPWb8Ei9VHCzHp+AyRjc=", + "lastModified": 1678906855, + "narHash": "sha256-YOCnl7pYF9gZpx6/+eeSpsv4c/TtCgUmKwPuV4k33U0=", "owner": "nanotee", "repo": "sqls.nvim", - "rev": "a0048b7018c99b68456f91b4aa42ce288f0c0774", + "rev": "bb70de250433ca5f6f7b617a9b3f5ab02eccf861", "type": "github" }, "original": { @@ -1410,11 +1410,11 @@ "telescope": { "flake": false, "locked": { - "lastModified": 1677414372, - "narHash": "sha256-QmyVJ/LZFtb/qqD5Q5fHsqAGgqaOT9XkVoLyOcqM14w=", + "lastModified": 1679492995, + "narHash": "sha256-Kyw9ryb8YgAKFWLac9yl/fD3nNcu7mv7xzuNU6pDMkU=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2", + "rev": "942fe5faef47b21241e970551eba407bc10d9547", "type": "github" }, "original": { @@ -1467,11 +1467,11 @@ "todo-comments": { "flake": false, "locked": { - "lastModified": 1674503659, - "narHash": "sha256-2BV8ahB5iZmEh5N/JFqMdz4CqVXAIdmxE7rNC1+igsw=", + "lastModified": 1680261407, + "narHash": "sha256-Z4jaklYoU4TU/3UuK1krImqMzU6sNxJM/XWPCnNBuwo=", "owner": "folke", "repo": "todo-comments.nvim", - "rev": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1", + "rev": "8febc60a76feefd8203077ef78b6a262ea1a41f9", "type": "github" }, "original": { @@ -1483,11 +1483,11 @@ "toggleterm-nvim": { "flake": false, "locked": { - "lastModified": 1677405147, - "narHash": "sha256-CB/X+Y0kdHn4rMiwGrMr9GqyD5hhqcFFvC3zV1gmI7w=", + "lastModified": 1680290314, + "narHash": "sha256-862KtB9oqktx/mPI0wSauF7eJIJogqgG6wTTYlCSo9U=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "31d38d11390bcd35a568fcc65a79b7d6ec89de62", + "rev": "b86982429325112d2b20c6d0cc7a5c4b182ab705", "type": "github" }, "original": { @@ -1499,11 +1499,11 @@ "tokyonight": { "flake": false, "locked": { - "lastModified": 1677914756, - "narHash": "sha256-vHvCb3Bp6uZ4OnqXjEuNOroG+5V2ZhnMYawY4O6YK3s=", + "lastModified": 1679554571, + "narHash": "sha256-M1fX5o8w6MbDX46HiN1Nw9xjG4Z79zraPKi0VUpyyVU=", "owner": "folke", "repo": "tokyonight.nvim", - "rev": "a0d5034fd6c26d997cd050a2f7d7083a20d2c94b", + "rev": "1b0c88094548a62641ece1e668fa9a234e1c539e", "type": "github" }, "original": { @@ -1515,11 +1515,11 @@ "trouble": { "flake": false, "locked": { - "lastModified": 1677584608, - "narHash": "sha256-5ZclnMkYOOD9l1zu5VF/WBV9po356PdTC7iX3EBC2mw=", + "lastModified": 1679827111, + "narHash": "sha256-uw/wfMKoFN2sHw/99ZcqGKJ3jQVP9pkDHqDaXaYn3CA=", "owner": "folke", "repo": "trouble.nvim", - "rev": "67337644e38144b444d026b0df2dc5fa0038930f", + "rev": "2ae7237c2917d661f458443c9a88680f8ca2d7b2", "type": "github" }, "original": { @@ -1626,11 +1626,11 @@ "vim-vsnip": { "flake": false, "locked": { - "lastModified": 1671546474, - "narHash": "sha256-vFYn5fAM7AAuvTI5behiYM08sV2qQyV7zZ++jgpZfSc=", + "lastModified": 1678609126, + "narHash": "sha256-ehPnvGle7YrECn76YlSY/2V7Zeq56JGlmZPlwgz2FdE=", "owner": "hrsh7th", "repo": "vim-vsnip", - "rev": "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e", + "rev": "7753ba9c10429c29d25abfd11b4c60b76718c438", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ "which-key": { "flake": false, "locked": { - "lastModified": 1677739890, - "narHash": "sha256-4VY9sOKZe2w6cOrYINJIvwDDXx1zkj1xCgHnceSxyZU=", + "lastModified": 1679827118, + "narHash": "sha256-R52U1Aa30KgNyyTxN3ZiWaoh86/Vsj5kmUmCCos5DjE=", "owner": "folke", "repo": "which-key.nvim", - "rev": "fb027738340502b556c3f43051f113bcaa7e8e63", + "rev": "4b73390eec680b4c061ea175eb32c0ff3412271d", "type": "github" }, "original": { @@ -1679,11 +1679,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1677808960, - "narHash": "sha256-1bVHRbhHT8Ynfnynd6ZY7hwMeatEV50lAB1/2uB+P48=", + "lastModified": 1680308637, + "narHash": "sha256-gas/Oo1hYbYOHzr1TBoHGH1mEzMMlPIdosb3yt573c0=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "128492d8bc5c171bc4b21196a40ff80858f1ac66", + "rev": "0d01cdde8c66b2b49cb30f8b52f11237b1ae5f6f", "type": "github" }, "original": { From 7b5b7bfccef91154bbe7cf166492bb8c30ea88c8 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 2 Apr 2023 19:10:24 +0300 Subject: [PATCH 25/28] dev: homeManagerModule alias --- flake.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index f1661b1..e64624d 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ inherit (import ./extra.nix inputs) neovimConfiguration; }; + /* nixosModules.default = { home-manager.sharedModules = [ ./lib/module @@ -42,11 +43,16 @@ inputs.self.overlays.default ]; }; + */ - homeManagerModules.default = { - imports = [ - (import ./lib/module self.packages inputs) - ]; + homeManagerModules = { + neovim-flake = { + imports = [ + (import ./lib/module self.packages inputs) + ]; + }; + + default = self.homeManagerModules.neovim-flake; }; }; From 7ee66ea37608e7877d74d8a62ba5238cdf8d32cd Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 2 Apr 2023 19:58:13 +0300 Subject: [PATCH 26/28] feat: assert on broken/unsupported config structures --- lib/assertions.nix | 16 ++++++++++++++++ lib/default.nix | 4 ++++ lib/module/default.nix | 9 +++++++++ 3 files changed, 29 insertions(+) create mode 100644 lib/assertions.nix diff --git a/lib/assertions.nix b/lib/assertions.nix new file mode 100644 index 0000000..49ea8ac --- /dev/null +++ b/lib/assertions.nix @@ -0,0 +1,16 @@ +{ + pkgs, + config, + lib, + ... +}: +with lib; let + cfg = config.vim; +in { + assertions = mkMerge [ + { + assertion = cfg.kommentary.enable; + message = "Kommentary has been deprecated in favor"; + } + ]; +} diff --git a/lib/default.nix b/lib/default.nix index 873f31b..bf12f0d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -2,4 +2,8 @@ dag = import ./dag.nix {inherit lib;}; booleans = import ./booleans.nix {inherit lib;}; types = import ./types {inherit lib;}; + + imports = [ + ./assertions.nix + ]; } diff --git a/lib/module/default.nix b/lib/module/default.nix index 7689aef..77e4732 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -45,5 +45,14 @@ in { config = mkIf cfg.enable { home.packages = [set.neovim]; + + assertions = mkMerge [ + mkIf + (config.programs.neovim-flake.enable) + { + assertion = !config.programs.neovim.enable; + message = "You cannot use neovim-flake together with vanilla neovim."; + } + ]; }; } From f7e860d6e5b2735e4c53724422de067559e56f38 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 2 Apr 2023 19:58:37 +0300 Subject: [PATCH 27/28] docs: clarify nixos and home-manager usage --- docs/custom-configs.adoc | 9 +++++++-- docs/home-manager.adoc | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/custom-configs.adoc b/docs/custom-configs.adoc index 17994f7..7f90b00 100644 --- a/docs/custom-configs.adoc +++ b/docs/custom-configs.adoc @@ -18,7 +18,10 @@ The following is an example of a barebones vim configuration with the default th [source,nix] ---- { - inputs.neovim-flake.url = "github:jordanisaacs/neovim-flake"; + inputs.neovim-flake = { + url = "github:notashelf/neovim-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; outputs = {nixpkgs, neovim-flake, ...}: let system = "x86_64-linux"; @@ -27,7 +30,9 @@ The following is an example of a barebones vim configuration with the default th # Add any custom options (and feel free to upstream them!) # options = ... - config.vim.theme.enable = true; + config.vim = { + theme.enable = true; + }; }; customNeovim = neovim-flake.lib.neovimConfiguration { diff --git a/docs/home-manager.adoc b/docs/home-manager.adoc index fa1b963..bd24a16 100644 --- a/docs/home-manager.adoc +++ b/docs/home-manager.adoc @@ -19,7 +19,7 @@ Followed by importing the HM module. [source,nix] ---- { - imports = [ neovim-flake.nixosModules.default ]; + imports = [ neovim-flake.homeManagerModules.default ]; } ---- @@ -29,7 +29,9 @@ Then we should be able to use the given module. E.g. ---- { programs.neovim-flake = { + enable = true; + # your settings need to go into the settings attrset settings = { vim.viAlias = false; vim.vimAlias = true; From 6fff5303b06dd0dbb7a232942c3acc79da9650aa Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 2 Apr 2023 19:58:57 +0300 Subject: [PATCH 28/28] docs: clarify plugin option documentation --- .../nvim-autopairs/nvim-autopairs.nix | 2 +- .../comments/comment-nvim/comment-nvim.nix | 2 +- modules/comments/kommentary.nix | 2 +- modules/completion/nvim-cmp/nvim-cmp.nix | 2 +- modules/dashboard/alpha/alpha.nix | 2 +- modules/dashboard/dashboard-nvim/config.nix | 3 +-- .../dashboard-nvim/dashboard-nvim.nix | 2 +- modules/dashboard/startify/startify.nix | 2 +- modules/lsp/lightbulb/lightbulb.nix | 2 +- modules/lsp/module.nix | 4 ++-- .../nvim-code-action-menu.nix | 2 +- modules/lsp/trouble/trouble.nix | 2 +- modules/markdown/module.nix | 2 +- modules/minimap/codewindow/codewindow.nix | 2 +- modules/minimap/minimap-vim/minimap-vim.nix | 2 +- modules/notes/orgmode/orgmode.nix | 2 +- modules/notes/todo-comments/todo-comments.nix | 2 +- .../presence-nvim/presence-nvim.nix | 2 +- modules/statusline/lualine/lualine.nix | 2 +- .../nvim-bufferline/nvim-bufferline.nix | 2 +- modules/theme/theme.nix | 2 +- modules/tidal/tidal.nix | 2 +- modules/treesitter/treesitter.nix | 6 ++--- modules/ui/noice/noice.nix | 2 +- .../utility/binds/cheatsheet/cheatsheet.nix | 2 +- modules/utility/binds/which-key/which-key.nix | 2 +- modules/utility/colorizer/colorizer.nix | 2 +- modules/utility/icon-picker/icon-picker.nix | 2 +- modules/utility/telescope/telescope.nix | 2 +- modules/utility/venn/venn.nix | 2 +- modules/visuals/visuals.nix | 24 +++++++++---------- 31 files changed, 45 insertions(+), 46 deletions(-) diff --git a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix b/modules/autopairs/nvim-autopairs/nvim-autopairs.nix index f355919..ecfda6f 100644 --- a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix +++ b/modules/autopairs/nvim-autopairs/nvim-autopairs.nix @@ -10,7 +10,7 @@ with builtins; { enable = mkOption { type = types.bool; default = false; - description = "enable autopairs"; + description = "Enable autopairs"; }; type = mkOption { diff --git a/modules/comments/comment-nvim/comment-nvim.nix b/modules/comments/comment-nvim/comment-nvim.nix index 65c6fbb..0e1369b 100644 --- a/modules/comments/comment-nvim/comment-nvim.nix +++ b/modules/comments/comment-nvim/comment-nvim.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.comments.comment-nvim = { - enable = mkEnableOption "comment-nvim"; + enable = mkEnableOption "Enable comment-nvim"; }; } diff --git a/modules/comments/kommentary.nix b/modules/comments/kommentary.nix index 25f71f8..37442a2 100644 --- a/modules/comments/kommentary.nix +++ b/modules/comments/kommentary.nix @@ -8,7 +8,7 @@ with builtins; let cfg = config.vim.comments.kommentary; in { options.vim.comments.kommentary = { - enable = mkEnableOption "kommentary"; + enable = mkEnableOption "Enable kommentary"; }; config = mkIf cfg.enable { diff --git a/modules/completion/nvim-cmp/nvim-cmp.nix b/modules/completion/nvim-cmp/nvim-cmp.nix index 59f5f1d..5938525 100644 --- a/modules/completion/nvim-cmp/nvim-cmp.nix +++ b/modules/completion/nvim-cmp/nvim-cmp.nix @@ -10,7 +10,7 @@ with builtins; { enable = mkOption { type = types.bool; default = false; - description = "enable autocomplete"; + description = "Enable autocomplete via nvim-cmp"; }; type = mkOption { diff --git a/modules/dashboard/alpha/alpha.nix b/modules/dashboard/alpha/alpha.nix index 8989b89..40edafb 100644 --- a/modules/dashboard/alpha/alpha.nix +++ b/modules/dashboard/alpha/alpha.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.dashboard.alpha = { - enable = mkEnableOption "alpha"; + enable = mkEnableOption "Enable alpha.nvim"; }; } diff --git a/modules/dashboard/dashboard-nvim/config.nix b/modules/dashboard/dashboard-nvim/config.nix index 9edf34a..14166f6 100644 --- a/modules/dashboard/dashboard-nvim/config.nix +++ b/modules/dashboard/dashboard-nvim/config.nix @@ -13,8 +13,7 @@ in { ]; vim.luaConfigRC.dashboard-nvim = nvim.dag.entryAnywhere '' - require("dashboard").setup{ - } + require("dashboard").setup{} ''; }; } diff --git a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix b/modules/dashboard/dashboard-nvim/dashboard-nvim.nix index 4600233..e74e39e 100644 --- a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix +++ b/modules/dashboard/dashboard-nvim/dashboard-nvim.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.dashboard.dashboard-nvim = { - enable = mkEnableOption "dashboard-nvim"; + enable = mkEnableOption "Enable dashboard.nvim"; }; } diff --git a/modules/dashboard/startify/startify.nix b/modules/dashboard/startify/startify.nix index 3467920..5d75964 100644 --- a/modules/dashboard/startify/startify.nix +++ b/modules/dashboard/startify/startify.nix @@ -6,7 +6,7 @@ with builtins; with lib; { options.vim.dashboard.startify = { - enable = mkEnableOption "Enable startify"; + enable = mkEnableOption "Enable vim-startify"; bookmarks = mkOption { default = []; diff --git a/modules/lsp/lightbulb/lightbulb.nix b/modules/lsp/lightbulb/lightbulb.nix index ae1c829..b754835 100644 --- a/modules/lsp/lightbulb/lightbulb.nix +++ b/modules/lsp/lightbulb/lightbulb.nix @@ -7,7 +7,7 @@ with lib; with builtins; { options.vim.lsp = { lightbulb = { - enable = mkEnableOption "lightbulb for code actions. Requires emoji font"; + enable = mkEnableOption "Lightbulb for code actions. Requires an emoji font"; }; }; } diff --git a/modules/lsp/module.nix b/modules/lsp/module.nix index 42ed054..4cc256c 100644 --- a/modules/lsp/module.nix +++ b/modules/lsp/module.nix @@ -9,7 +9,7 @@ with builtins; let cfg = config.vim.lsp; in { options.vim.lsp = { - enable = mkEnableOption "neovim lsp support"; + enable = mkEnableOption "Enable neovim lsp support. Requires language specific LSPs to be anabled to take effect"; formatOnSave = mkEnableOption "Format on save"; nix = { enable = mkEnableOption "Nix LSP"; @@ -45,7 +45,7 @@ in { }, }, ''; - description = "options to pass to rust analyzer"; + description = "Options to pass to rust analyzer"; }; }; python = mkEnableOption "Python LSP"; 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 8bcd5d0..95058e6 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 @@ -7,7 +7,7 @@ with lib; with builtins; { options.vim.lsp = { nvimCodeActionMenu = { - enable = mkEnableOption "nvim code action menu"; + enable = mkEnableOption "Enable nvim code action menu"; }; }; } diff --git a/modules/lsp/trouble/trouble.nix b/modules/lsp/trouble/trouble.nix index af44921..2a5c392 100644 --- a/modules/lsp/trouble/trouble.nix +++ b/modules/lsp/trouble/trouble.nix @@ -7,7 +7,7 @@ with lib; with builtins; { options.vim.lsp = { trouble = { - enable = mkEnableOption "trouble diagnostics viewer"; + enable = mkEnableOption "Enable trouble diagnostics viewer"; }; }; } diff --git a/modules/markdown/module.nix b/modules/markdown/module.nix index cfcb792..761f58c 100644 --- a/modules/markdown/module.nix +++ b/modules/markdown/module.nix @@ -8,7 +8,7 @@ with builtins; let cfg = config.vim.markdown; in { options.vim.markdown = { - enable = mkEnableOption "markdown tools and plugins"; + enable = mkEnableOption "Enable markdown tools and plugins"; }; config = mkIf (cfg.enable) { diff --git a/modules/minimap/codewindow/codewindow.nix b/modules/minimap/codewindow/codewindow.nix index 2e71f57..58c7a85 100644 --- a/modules/minimap/codewindow/codewindow.nix +++ b/modules/minimap/codewindow/codewindow.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.minimap.codewindow = { - enable = mkEnableOption "Enable minimap-vim plugin"; + enable = mkEnableOption "Enable codewindow plugin for minimap view"; }; } diff --git a/modules/minimap/minimap-vim/minimap-vim.nix b/modules/minimap/minimap-vim/minimap-vim.nix index 11c0748..33d166a 100644 --- a/modules/minimap/minimap-vim/minimap-vim.nix +++ b/modules/minimap/minimap-vim/minimap-vim.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.minimap.minimap-vim = { - enable = mkEnableOption "Enable minimap-vim plugin"; + enable = mkEnableOption "Enable minimap-vim plugin for minimap view"; }; } diff --git a/modules/notes/orgmode/orgmode.nix b/modules/notes/orgmode/orgmode.nix index 5bac116..68a7620 100644 --- a/modules/notes/orgmode/orgmode.nix +++ b/modules/notes/orgmode/orgmode.nix @@ -6,7 +6,7 @@ with lib; with builtins; { options.vim.notes.orgmode = { - enable = mkEnableOption "Neovim plugin for Emac Orgmode. Get the best of both worlds."; + enable = mkEnableOption "Enable nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds"; orgAgendaFiles = mkOption { type = types.str; default = "{'~/Dropbox/org/*', '~/my-orgs/**/*'}"; diff --git a/modules/notes/todo-comments/todo-comments.nix b/modules/notes/todo-comments/todo-comments.nix index 773a8a1..3064e75 100644 --- a/modules/notes/todo-comments/todo-comments.nix +++ b/modules/notes/todo-comments/todo-comments.nix @@ -6,7 +6,7 @@ with lib; with builtins; { options.vim.notes.todo-comments = { - enable = mkEnableOption "todo-comments"; + enable = mkEnableOption "Enable todo-comments"; patterns = { highlight = mkOption { diff --git a/modules/rich-presence/presence-nvim/presence-nvim.nix b/modules/rich-presence/presence-nvim/presence-nvim.nix index 420e809..491aadd 100644 --- a/modules/rich-presence/presence-nvim/presence-nvim.nix +++ b/modules/rich-presence/presence-nvim/presence-nvim.nix @@ -6,7 +6,7 @@ with lib; with builtins; { options.vim.presence.presence-nvim = { - enable = mkEnableOption "Enable presence.nvim plugin"; + enable = mkEnableOption "Enable presence.nvim plugin for discord rich presence"; image_text = mkOption { type = types.str; diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix index b0e32a1..f95850a 100644 --- a/modules/statusline/lualine/lualine.nix +++ b/modules/statusline/lualine/lualine.nix @@ -10,7 +10,7 @@ in { options.vim.statusline.lualine = { enable = mkOption { type = types.bool; - description = "Enable lualine"; + description = "Enable lualine statusline"; default = true; }; diff --git a/modules/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/tabline/nvim-bufferline/nvim-bufferline.nix index 4a98dbd..ad707bf 100644 --- a/modules/tabline/nvim-bufferline/nvim-bufferline.nix +++ b/modules/tabline/nvim-bufferline/nvim-bufferline.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.tabline.nvimBufferline = { - enable = mkEnableOption "nvim-bufferline-lua"; + enable = mkEnableOption "Enable nvim-bufferline-lua as a bufferline"; }; } diff --git a/modules/theme/theme.nix b/modules/theme/theme.nix index 4d92269..16a2713 100644 --- a/modules/theme/theme.nix +++ b/modules/theme/theme.nix @@ -12,7 +12,7 @@ in { options.vim.theme = { enable = mkOption { type = types.bool; - description = "Enable Theme"; + description = "Enable theming"; }; name = mkOption { diff --git a/modules/tidal/tidal.nix b/modules/tidal/tidal.nix index 8db4b12..9554571 100644 --- a/modules/tidal/tidal.nix +++ b/modules/tidal/tidal.nix @@ -6,7 +6,7 @@ with lib; with builtins; { options.vim.tidal = { - enable = mkEnableOption "tidal tools and plugins"; + enable = mkEnableOption "Enable tidalcycles tools and plugins"; flash = mkOption { description = ''When sending a paragraph or a single line, vim-tidal will "flash" the selection for some milliseconds''; diff --git a/modules/treesitter/treesitter.nix b/modules/treesitter/treesitter.nix index f36a3f4..ab3cea6 100644 --- a/modules/treesitter/treesitter.nix +++ b/modules/treesitter/treesitter.nix @@ -10,19 +10,19 @@ with builtins; { enable = mkOption { default = false; type = types.bool; - description = "enable tree-sitter [nvim-treesitter]"; + description = "Enable tree-sitter [nvim-treesitter]"; }; fold = mkOption { default = false; type = types.bool; - description = "enable fold with tree-sitter"; + description = "Enable fold with tree-sitter"; }; autotagHtml = mkOption { default = false; type = types.bool; - description = "enable autoclose and rename html tag [nvim-ts-autotag]"; + description = "Enable autoclose and rename html tag [nvim-ts-autotag]"; }; grammars = mkOption { diff --git a/modules/ui/noice/noice.nix b/modules/ui/noice/noice.nix index 5a50fd3..481785e 100644 --- a/modules/ui/noice/noice.nix +++ b/modules/ui/noice/noice.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.ui.noice = { - enable = mkEnableOption "noice-nvim"; + enable = mkEnableOption "Enable noice-nvim UI modifications"; }; } diff --git a/modules/utility/binds/cheatsheet/cheatsheet.nix b/modules/utility/binds/cheatsheet/cheatsheet.nix index b48f7be..c16b1f4 100644 --- a/modules/utility/binds/cheatsheet/cheatsheet.nix +++ b/modules/utility/binds/cheatsheet/cheatsheet.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.binds.cheatsheet = { - enable = mkEnableOption "Searchable cheatsheet for nvim using telescope"; + enable = mkEnableOption "Enable cheatsheet-nvim: searchable cheatsheet for nvim using telescope"; }; } diff --git a/modules/utility/binds/which-key/which-key.nix b/modules/utility/binds/which-key/which-key.nix index b00c586..4135451 100644 --- a/modules/utility/binds/which-key/which-key.nix +++ b/modules/utility/binds/which-key/which-key.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.binds.whichKey = { - enable = mkEnableOption "which-key menu"; + enable = mkEnableOption "Enable which-key keybind menu"; }; } diff --git a/modules/utility/colorizer/colorizer.nix b/modules/utility/colorizer/colorizer.nix index fdcd34c..565f3f6 100644 --- a/modules/utility/colorizer/colorizer.nix +++ b/modules/utility/colorizer/colorizer.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.utility.colorizer = { - enable = mkEnableOption "ccc color picker for neovim"; + enable = mkEnableOption "Enable ccc color picker for neovim"; }; } diff --git a/modules/utility/icon-picker/icon-picker.nix b/modules/utility/icon-picker/icon-picker.nix index fe9b05f..231a8b4 100644 --- a/modules/utility/icon-picker/icon-picker.nix +++ b/modules/utility/icon-picker/icon-picker.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.utility.icon-picker = { - enable = mkEnableOption "Nerdfonts icon picker for nvim"; + enable = mkEnableOption "Enable nerdfonts icon picker for nvim"; }; } diff --git a/modules/utility/telescope/telescope.nix b/modules/utility/telescope/telescope.nix index 4d2cbc1..1ba45b8 100644 --- a/modules/utility/telescope/telescope.nix +++ b/modules/utility/telescope/telescope.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.telescope = { - enable = mkEnableOption "enable telescope"; + enable = mkEnableOption "Enable multi-purpose telescope utility"; }; } diff --git a/modules/utility/venn/venn.nix b/modules/utility/venn/venn.nix index ae93354..8885f64 100644 --- a/modules/utility/venn/venn.nix +++ b/modules/utility/venn/venn.nix @@ -6,6 +6,6 @@ with lib; with builtins; { options.vim.utility.venn-nvim = { - enable = mkEnableOption "draw ASCII diagrams in Neovim"; + enable = mkEnableOption "Enable venn.nvim: draw ASCII diagrams in Neovim"; }; } diff --git a/modules/visuals/visuals.nix b/modules/visuals/visuals.nix index f09ff42..7fe03ad 100644 --- a/modules/visuals/visuals.nix +++ b/modules/visuals/visuals.nix @@ -8,56 +8,56 @@ with builtins; { options.vim.visuals = { enable = mkOption { type = types.bool; - description = "visual enhancements"; + description = "Enable visual enhancements"; default = false; }; nvimWebDevicons.enable = mkOption { type = types.bool; - description = "enable dev icons. required for certain plugins [nvim-web-devicons]"; + description = "Enable dev icons. required for certain plugins [nvim-web-devicons]"; default = false; }; lspkind.enable = mkOption { type = types.bool; - description = "enable vscode-like pictograms for lsp [lspkind]"; + description = "Enable vscode-like pictograms for lsp [lspkind]"; default = false; }; scrollBar.enable = mkOption { type = types.bool; - description = "enable scrollbar [scrollbar.nvim]"; + description = "Enable scrollbar [scrollbar.nvim]"; default = false; }; smoothScroll.enable = mkOption { type = types.bool; - description = "enable smooth scrolling [cinnamon-nvim]"; + description = "Enable smooth scrolling [cinnamon-nvim]"; default = false; }; cellularAutomaton.enable = mkOption { type = types.bool; - description = "enable cellular automaton [cellular-automaton]"; + description = "Enable cellular automaton [cellular-automaton]"; default = false; }; fidget-nvim = { enable = mkOption { type = types.bool; - description = "enable nvim LSP UI element [fidget-nvim]"; + description = "Enable nvim LSP UI element [fidget-nvim]"; default = false; }; align = { bottom = mkOption { type = types.bool; - description = "align to bottom"; + description = "Align to bottom"; default = true; }; right = mkOption { type = types.bool; - description = "align to right"; + description = "Align to right"; default = true; }; }; @@ -66,20 +66,20 @@ with builtins; { cursorWordline = { enable = mkOption { type = types.bool; - description = "enable word and delayed line highlight [nvim-cursorline]"; + description = "Enable word and delayed line highlight [nvim-cursorline]"; default = false; }; lineTimeout = mkOption { type = types.int; - description = "time in milliseconds for cursorline to appear"; + description = "Time in milliseconds for cursorline to appear"; }; }; indentBlankline = { enable = mkOption { type = types.bool; - description = "enable indentation guides [indent-blankline]"; + description = "Enable indentation guides [indent-blankline]"; default = false; };