mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-03-06 00:42:55 +00:00
Compare commits
6 commits
0dc687c6b3
...
14cf7fc9b8
| Author | SHA1 | Date | |
|---|---|---|---|
|
14cf7fc9b8 |
|||
|
a315c01ff0 |
|||
|
ba22aa662a |
|||
|
a81aa0f691 |
|||
|
26edb440af |
|||
|
325eae4a75 |
6 changed files with 43 additions and 43 deletions
|
|
@ -56,6 +56,10 @@
|
||||||
treesitter grammars were changed to prefer `grammarPlugins` over
|
treesitter grammars were changed to prefer `grammarPlugins` over
|
||||||
`builtGrammars`.
|
`builtGrammars`.
|
||||||
|
|
||||||
|
[NotAShelf](https://github.com/notashelf):
|
||||||
|
|
||||||
|
- Lazyload noice.nvim and nvim-web-devicons on `DeferredUIEnter`
|
||||||
|
|
||||||
[jfeo](https://github.com/jfeo):
|
[jfeo](https://github.com/jfeo):
|
||||||
|
|
||||||
[ccc.nvim]: https://github.com/uga-rosa/ccc.nvim
|
[ccc.nvim]: https://github.com/uga-rosa/ccc.nvim
|
||||||
|
|
|
||||||
18
flake.lock
generated
18
flake.lock
generated
|
|
@ -23,11 +23,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768135262,
|
"lastModified": 1769996383,
|
||||||
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
|
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
|
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -38,11 +38,11 @@
|
||||||
},
|
},
|
||||||
"mnw": {
|
"mnw": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769981889,
|
"lastModified": 1770419553,
|
||||||
"narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=",
|
"narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "mnw",
|
"repo": "mnw",
|
||||||
"rev": "332fed8f43b77149c582f1782683d6aeee1f07cf",
|
"rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -74,11 +74,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769461804,
|
"lastModified": 1771008912,
|
||||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,6 @@
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
inherit (lib.lists) optionals;
|
inherit (lib.lists) optionals;
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
|
||||||
inherit (lib.nvim.dag) entryAnywhere;
|
|
||||||
|
|
||||||
cfg = config.vim.ui.noice;
|
cfg = config.vim.ui.noice;
|
||||||
tscfg = config.vim.treesitter;
|
tscfg = config.vim.treesitter;
|
||||||
|
|
@ -16,16 +14,15 @@
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = [
|
startPlugins = ["nui-nvim"];
|
||||||
"noice-nvim"
|
|
||||||
"nui-nvim"
|
|
||||||
];
|
|
||||||
|
|
||||||
treesitter.grammars = optionals tscfg.addDefaultGrammars defaultGrammars;
|
treesitter.grammars = optionals tscfg.addDefaultGrammars defaultGrammars;
|
||||||
|
|
||||||
pluginRC.noice-nvim = entryAnywhere ''
|
lazy.plugins.noice-nvim = {
|
||||||
require("noice").setup(${toLuaObject cfg.setupOpts})
|
package = "noice-nvim";
|
||||||
'';
|
setupModule = "noice";
|
||||||
|
event = ["DeferredUIEnter"];
|
||||||
|
inherit (cfg) setupOpts;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,18 +4,17 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
|
||||||
inherit (lib.nvim.dag) entryAnywhere;
|
|
||||||
|
|
||||||
cfg = config.vim.visuals.nvim-web-devicons;
|
cfg = config.vim.visuals.nvim-web-devicons;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["nvim-web-devicons"];
|
lazy.plugins.nvim-web-devicons = {
|
||||||
|
package = "nvim-web-devicons";
|
||||||
pluginRC.nvim-web-devicons = entryAnywhere ''
|
setupModule = "nvim-web-devicons";
|
||||||
require("nvim-web-devicons").setup(${toLuaObject cfg.setupOpts})
|
event = ["DeferredUIEnter"];
|
||||||
'';
|
inherit (cfg) setupOpts;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{lib, ...}: let
|
{lib, ...}: let
|
||||||
inherit (lib.modules) mkRenamedOptionModule;
|
inherit (lib.modules) mkRenamedOptionModule;
|
||||||
inherit (lib.options) mkOption mkEnableOption literalExpression;
|
inherit (lib.options) mkOption mkEnableOption;
|
||||||
inherit (lib.types) nullOr attrsOf attrs enum;
|
inherit (lib.types) nullOr attrsOf attrs enum;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
inherit (lib.nvim.types) mkPluginSetupOption;
|
||||||
in {
|
in {
|
||||||
|
|
@ -16,27 +16,27 @@ in {
|
||||||
variant = mkOption {
|
variant = mkOption {
|
||||||
type = nullOr (enum ["light" "dark"]);
|
type = nullOr (enum ["light" "dark"]);
|
||||||
default = null;
|
default = null;
|
||||||
description = "Set the light or dark variant manually, instead of relying on `background`";
|
description = ''
|
||||||
|
Set the light or dark variant manually, instead of relying on `background`
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
override = mkOption {
|
override = mkOption {
|
||||||
type = attrsOf attrs;
|
type = attrsOf attrs;
|
||||||
default = {};
|
default = {};
|
||||||
example = literalExpression ''
|
example = {
|
||||||
{
|
zsh = {
|
||||||
zsh = {
|
name = "Zsh";
|
||||||
name = "Zsh";
|
icon = "";
|
||||||
icon = "";
|
color = "#428850";
|
||||||
color = "#428850";
|
cterm_color = "65";
|
||||||
cterm_color = "65";
|
};
|
||||||
};
|
};
|
||||||
}
|
|
||||||
'';
|
|
||||||
description = ''
|
description = ''
|
||||||
Your personal icon overrides.
|
Your personal icon overrides.
|
||||||
|
|
||||||
You can specify color or cterm_color instead of specifying
|
You can specify color or `cterm_color` instead of specifying both of
|
||||||
both of them. DevIcon will be appended to `name`
|
them. `DevIcon` will be appended to `name`
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2129,9 +2129,9 @@
|
||||||
},
|
},
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"submodules": false,
|
"submodules": false,
|
||||||
"revision": "b8221e42cf7287c4dcde81f232f58d7b947c210d",
|
"revision": "746ffbb17975ebd6c40142362eee1b0249969c5c",
|
||||||
"url": "https://github.com/nvim-tree/nvim-web-devicons/archive/b8221e42cf7287c4dcde81f232f58d7b947c210d.tar.gz",
|
"url": "https://github.com/nvim-tree/nvim-web-devicons/archive/746ffbb17975ebd6c40142362eee1b0249969c5c.tar.gz",
|
||||||
"hash": "sha256-lVrakFrpIP9lp7sMfMb33KeMPIkcn1qBFVytJzKCfuE="
|
"hash": "sha256-jXWBPcfLwSkWQ/eRbxVDWC7kFOODSsCRmzC3rHKQLhQ="
|
||||||
},
|
},
|
||||||
"obsidian-nvim": {
|
"obsidian-nvim": {
|
||||||
"type": "GitRelease",
|
"type": "GitRelease",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue