some refactoring
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.devtools.nixvim;
|
||||
cfg = config.userModules.devtools.nixvim;
|
||||
in {
|
||||
imports = [
|
||||
inputs.nixvim.homeManagerModules.nixvim
|
||||
@@ -18,7 +18,7 @@ in {
|
||||
];
|
||||
|
||||
options = {
|
||||
modules.devtools.nixvim.enable = mkEnableOption "Enable nixvim";
|
||||
userModules.devtools.nixvim.enable = mkEnableOption "Enable nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.barbar;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.barbar;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.cmp;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.cmp;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.comment;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.comment;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.conform;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.conform;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.copilot;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.copilot;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim";
|
||||
userModules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
{userModules, ...}: {
|
||||
{umodPath, ...}: {
|
||||
imports = [
|
||||
"${userModules}/devtools/nixvim/plugins/barbar.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/comment.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/conform.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/cmp.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/copilot.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/efm.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/floaterm.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/harpoon.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/lsp.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/lualine.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/lightline.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/markdown-preview.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/neo-tree.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/nonels.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/rustaceanvim.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/startify.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/tagbar.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/telescope.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/treesitter.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/vimtex.nix"
|
||||
"${userModules}/devtools/nixvim/plugins/yanky.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/barbar.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/comment.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/conform.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/cmp.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/copilot.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/efm.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/floaterm.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/harpoon.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/lsp.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/lualine.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/lightline.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/markdown-preview.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/neo-tree.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/nonels.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/rustaceanvim.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/startify.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/tagbar.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/telescope.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/treesitter.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/vimtex.nix"
|
||||
"${umodPath}/devtools/nixvim/plugins/yanky.nix"
|
||||
];
|
||||
}
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.efm;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.efm;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim";
|
||||
userModules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.floaterm;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.floaterm;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.harpoon;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.harpoon;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.lightline;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.lightline;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.lsp-format;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.lsp-format;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.lsp-format = {
|
||||
userModules.devtools.nixvim.plugins.lsp-format = {
|
||||
enable = mkEnableOption "Enables LSP formatting support for nixvim";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.lsp;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.lsp;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.lsp = {
|
||||
userModules.devtools.nixvim.plugins.lsp = {
|
||||
enable = mkEnableOption "Enables LSP support for nixvim";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.lualine;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.lualine;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.markdown-preview;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.markdown-preview;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.neo-tree;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.neo-tree;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.none-ls;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.none-ls;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.modules.devtools.nixvim.plugins.rustaceanvim;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.rustaceanvim;
|
||||
in {
|
||||
options.modules.devtools.nixvim.plugins.rustaceanvim = {
|
||||
options.userModules.devtools.nixvim.plugins.rustaceanvim = {
|
||||
enable = mkEnableOption "Whether to enable rustaceanvim.";
|
||||
};
|
||||
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.startify;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.startify;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.tagbar;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.tagbar;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.telescope;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.telescope;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.treesitter;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.treesitter;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins = {
|
||||
userModules.devtools.nixvim.plugins = {
|
||||
treesitter.enable = mkEnableOption "Enables Treesitter plugin for nixvim";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.vimtex;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.vimtex;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.modules.devtools.nixvim.plugins.yanky;
|
||||
cfg = config.userModules.devtools.nixvim.plugins.yanky;
|
||||
in {
|
||||
options = {
|
||||
modules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim";
|
||||
userModules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
Reference in New Issue
Block a user