mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2025-01-10 12:19:49 +01:00
Compare commits
9 commits
781385f991
...
6567b463ee
Author | SHA1 | Date | |
---|---|---|---|
6567b463ee | |||
c3a4686fa1 | |||
cece170a41 | |||
cd6e672835 | |||
f8e1856620 | |||
48829f9d5b | |||
0327918278 | |||
a369352365 | |||
ed3be410c5 |
9 changed files with 142 additions and 33 deletions
3
.github/README.md
vendored
3
.github/README.md
vendored
|
@ -69,7 +69,7 @@
|
||||||
[Home-Manager module]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-hm
|
[Home-Manager module]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-hm
|
||||||
|
|
||||||
- **Simple**: One language to rule them all! Use Nix to configure everything,
|
- **Simple**: One language to rule them all! Use Nix to configure everything,
|
||||||
with additional Lua Support
|
with optional Lua support for robust configurability!
|
||||||
- **Reproducible**: Your configuration will behave the same _anywhere_. No
|
- **Reproducible**: Your configuration will behave the same _anywhere_. No
|
||||||
surprises, promise!
|
surprises, promise!
|
||||||
- **Portable**: nvf depends _solely_ on your Nix store, and nothing else. No
|
- **Portable**: nvf depends _solely_ on your Nix store, and nothing else. No
|
||||||
|
@ -79,6 +79,7 @@
|
||||||
customizable through the Nix module system.
|
customizable through the Nix module system.
|
||||||
- Not comfortable with a full-nix config or want to bring your Lua config? You
|
- Not comfortable with a full-nix config or want to bring your Lua config? You
|
||||||
can do just that, no unnecessary restrictions.
|
can do just that, no unnecessary restrictions.
|
||||||
|
- Lazyloading? We got it! Lazyload both internal and external plugins at will.
|
||||||
- **Well-documented**: Documentation is priority. You will _never_ face
|
- **Well-documented**: Documentation is priority. You will _never_ face
|
||||||
undocumented, obscure behaviour.
|
undocumented, obscure behaviour.
|
||||||
- **Idiomatic**: nvf does things ✨ _the right way_ ✨ - the codebase is, and
|
- **Idiomatic**: nvf does things ✨ _the right way_ ✨ - the codebase is, and
|
||||||
|
|
10
docs/release-notes/rl-0.8.md
Normal file
10
docs/release-notes/rl-0.8.md
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
# Release 0.8 {#sec-release-0.8}
|
||||||
|
|
||||||
|
[NotAShelf](https://github.com/notashelf):
|
||||||
|
|
||||||
|
[typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
|
||||||
|
|
||||||
|
- Add [typst-preview.nvim] under
|
||||||
|
`languages.typst.extensions.typst-preview-nvim`.
|
||||||
|
|
||||||
|
- Add a search widget to the options page in the nvf manual.
|
21
docs/static/script/search.js
vendored
21
docs/static/script/search.js
vendored
|
@ -26,21 +26,32 @@ document.addEventListener("DOMContentLoaded", () => {
|
||||||
ddElement: ddElements[index],
|
ddElement: ddElements[index],
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const hiddenClass = "hidden";
|
||||||
|
const hiddenStyle = document.createElement("style");
|
||||||
|
hiddenStyle.innerHTML = `.${hiddenClass} { display: none; }`;
|
||||||
|
document.head.appendChild(hiddenStyle);
|
||||||
|
|
||||||
let debounceTimeout;
|
let debounceTimeout;
|
||||||
document.getElementById("search-input").addEventListener("input", (event) => {
|
document.getElementById("search-input").addEventListener("input", (event) => {
|
||||||
clearTimeout(debounceTimeout);
|
clearTimeout(debounceTimeout);
|
||||||
debounceTimeout = setTimeout(() => {
|
debounceTimeout = setTimeout(() => {
|
||||||
const query = event.target.value.toLowerCase();
|
const query = event.target.value.toLowerCase();
|
||||||
|
|
||||||
requestAnimationFrame(() => {
|
const matches = [];
|
||||||
const fragment = document.createDocumentFragment();
|
const nonMatches = [];
|
||||||
|
|
||||||
dtElementsData.forEach(({ element, id, ddElement }) => {
|
dtElementsData.forEach(({ element, id, ddElement }) => {
|
||||||
const isMatch = id.includes(query);
|
const isMatch = id.includes(query);
|
||||||
if (element.classList.contains("hidden") !== !isMatch) {
|
if (isMatch) {
|
||||||
element.classList.toggle("hidden", !isMatch);
|
matches.push(element, ddElement);
|
||||||
ddElement?.classList.toggle("hidden", !isMatch);
|
} else {
|
||||||
|
nonMatches.push(element, ddElement);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
matches.forEach((el) => el?.classList.remove(hiddenClass));
|
||||||
|
nonMatches.forEach((el) => el?.classList.add(hiddenClass));
|
||||||
});
|
});
|
||||||
}, 200);
|
}, 200);
|
||||||
});
|
});
|
||||||
|
|
11
docs/static/style.scss
vendored
11
docs/static/style.scss
vendored
|
@ -189,14 +189,16 @@ th {
|
||||||
|
|
||||||
dt {
|
dt {
|
||||||
margin: 1.2rem 0 0.8rem;
|
margin: 1.2rem 0 0.8rem;
|
||||||
|
content-visibility: auto;
|
||||||
|
contain-intrinsic-size: auto 42px;
|
||||||
}
|
}
|
||||||
|
|
||||||
dd {
|
dd {
|
||||||
margin-left: 2rem;
|
margin-left: 2rem;
|
||||||
|
content-visibility: auto;
|
||||||
|
contain-intrinsic-size: auto 500px;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.book {
|
div.book {}
|
||||||
}
|
|
||||||
|
|
||||||
ul {
|
ul {
|
||||||
@include margined;
|
@include margined;
|
||||||
|
@ -238,11 +240,12 @@ li {
|
||||||
top: 0;
|
top: 0;
|
||||||
background: white;
|
background: white;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
border-bottom: 1px solid #ccc;
|
border-bottom: 1px solid $color-gray-200;
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
@media (prefers-color-scheme: dark) {
|
@media (prefers-color-scheme: dark) {
|
||||||
background: $color-gray-900;
|
background: $color-gray-900;
|
||||||
color: $color-gray-50;
|
color: $color-gray-50;
|
||||||
|
border-bottom: 1px solid black;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
17
flake.lock
17
flake.lock
|
@ -1902,6 +1902,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"plugin-typst-preview-nvim": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733120663,
|
||||||
|
"narHash": "sha256-uYMZ2PONiiI3UDvCgNvyy4+jhzmUDbAyxX0phKxELXw=",
|
||||||
|
"owner": "chomosuke",
|
||||||
|
"repo": "typst-preview.nvim",
|
||||||
|
"rev": "0cb5f5627312f50ce089f785ec42b55a85f30ce7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "chomosuke",
|
||||||
|
"repo": "typst-preview.nvim",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"plugin-vim-dirtytalk": {
|
"plugin-vim-dirtytalk": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -2151,6 +2167,7 @@
|
||||||
"plugin-tokyonight": "plugin-tokyonight",
|
"plugin-tokyonight": "plugin-tokyonight",
|
||||||
"plugin-trouble": "plugin-trouble",
|
"plugin-trouble": "plugin-trouble",
|
||||||
"plugin-ts-error-translator": "plugin-ts-error-translator",
|
"plugin-ts-error-translator": "plugin-ts-error-translator",
|
||||||
|
"plugin-typst-preview-nvim": "plugin-typst-preview-nvim",
|
||||||
"plugin-vim-dirtytalk": "plugin-vim-dirtytalk",
|
"plugin-vim-dirtytalk": "plugin-vim-dirtytalk",
|
||||||
"plugin-vim-fugitive": "plugin-vim-fugitive",
|
"plugin-vim-fugitive": "plugin-vim-fugitive",
|
||||||
"plugin-vim-illuminate": "plugin-vim-illuminate",
|
"plugin-vim-illuminate": "plugin-vim-illuminate",
|
||||||
|
|
|
@ -206,6 +206,11 @@
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
plugin-typst-preview-nvim = {
|
||||||
|
url = "github:chomosuke/typst-preview.nvim";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
plugin-nvim-metals = {
|
plugin-nvim-metals = {
|
||||||
url = "github:scalameta/nvim-metals";
|
url = "github:scalameta/nvim-metals";
|
||||||
flake = false;
|
flake = false;
|
||||||
|
|
|
@ -7,10 +7,13 @@
|
||||||
inherit (lib.options) mkEnableOption mkOption;
|
inherit (lib.options) mkEnableOption mkOption;
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.lists) isList;
|
inherit (lib.lists) isList;
|
||||||
inherit (lib.types) enum either listOf package str;
|
inherit (lib.types) nullOr enum either attrsOf listOf package str;
|
||||||
inherit (lib.attrsets) attrNames;
|
inherit (lib.attrsets) attrNames;
|
||||||
inherit (lib.nvim.lua) expToLua;
|
inherit (lib.generators) mkLuaInline;
|
||||||
inherit (lib.nvim.types) mkGrammarOption;
|
inherit (lib.meta) getExe;
|
||||||
|
inherit (lib.nvim.lua) expToLua toLuaObject;
|
||||||
|
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
|
||||||
cfg = config.vim.languages.typst;
|
cfg = config.vim.languages.typst;
|
||||||
|
|
||||||
|
@ -33,6 +36,7 @@
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
tinymist = {
|
tinymist = {
|
||||||
package = pkgs.tinymist;
|
package = pkgs.tinymist;
|
||||||
lspConfig = ''
|
lspConfig = ''
|
||||||
|
@ -120,6 +124,50 @@ in {
|
||||||
default = formats.${cfg.format.type}.package;
|
default = formats.${cfg.format.type}.package;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extensions = {
|
||||||
|
typst-preview-nvim = {
|
||||||
|
enable =
|
||||||
|
mkEnableOption ''
|
||||||
|
[typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
|
||||||
|
|
||||||
|
Low latency typst preview for Neovim via [typst-preview.nvim]
|
||||||
|
''
|
||||||
|
// {default = true;};
|
||||||
|
|
||||||
|
setupOpts = mkPluginSetupOption "typst-preview-nvim" {
|
||||||
|
open_cmd = mkOption {
|
||||||
|
type = nullOr str;
|
||||||
|
default = null;
|
||||||
|
example = "firefox %s -P typst-preview --class typst-preview";
|
||||||
|
description = ''
|
||||||
|
Custom format string to open the output link provided with `%s`
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
dependencies_bin = mkOption {
|
||||||
|
type = attrsOf str;
|
||||||
|
default = {
|
||||||
|
"tinymist" = getExe servers.tinymist.package;
|
||||||
|
"websocat" = getExe pkgs.websocat;
|
||||||
|
};
|
||||||
|
|
||||||
|
description = ''
|
||||||
|
Provide the path to binaries for dependencies. Setting this
|
||||||
|
to a non-null value will skip the download of the binary by
|
||||||
|
the plugin.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
extra_args = mkOption {
|
||||||
|
type = nullOr (listOf str);
|
||||||
|
default = null;
|
||||||
|
example = ["--input=ver=draft" "--ignore-system-fonts"];
|
||||||
|
description = "A list of extra arguments (or `null`) to be passed to previewer";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable (mkMerge [
|
||||||
(mkIf cfg.treesitter.enable {
|
(mkIf cfg.treesitter.enable {
|
||||||
|
@ -136,5 +184,13 @@ in {
|
||||||
vim.lsp.lspconfig.enable = true;
|
vim.lsp.lspconfig.enable = true;
|
||||||
vim.lsp.lspconfig.sources.typst-lsp = servers.${cfg.lsp.server}.lspConfig;
|
vim.lsp.lspconfig.sources.typst-lsp = servers.${cfg.lsp.server}.lspConfig;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Extensions
|
||||||
|
(mkIf cfg.extensions.typst-preview-nvim.enable {
|
||||||
|
vim.startPlugins = ["typst-preview-nvim"];
|
||||||
|
vim.pluginRC.typst-preview-nvim = entryAnywhere ''
|
||||||
|
require("typst-preview").setup(${toLuaObject cfg.extensions.typst-preview-nvim.setupOpts})
|
||||||
|
'';
|
||||||
|
})
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,11 @@
|
||||||
cfg = config.vim;
|
cfg = config.vim;
|
||||||
in {
|
in {
|
||||||
options.vim = {
|
options.vim = {
|
||||||
enableLuaLoader = mkEnableOption ''
|
enableLuaLoader = mkOption {
|
||||||
|
type = bool;
|
||||||
|
default = false;
|
||||||
|
example = true;
|
||||||
|
description = ''
|
||||||
[{option}`official documentation`]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
|
[{option}`official documentation`]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
|
||||||
|
|
||||||
the experimental Lua module loader to speed up the start up process
|
the experimental Lua module loader to speed up the start up process
|
||||||
|
@ -24,10 +28,12 @@ in {
|
||||||
- removes the default Neovim loader
|
- removes the default Neovim loader
|
||||||
|
|
||||||
::: {.note}
|
::: {.note}
|
||||||
This is disabled by default. Before setting this option, please
|
The Lua module loader is *disabled* by default. Before setting this option, please
|
||||||
take a look at the [{option}`official documentation`].
|
take a look at the [{option}`official documentation`]. This option may be enabled by
|
||||||
|
default in the future.
|
||||||
:::
|
:::
|
||||||
'';
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
additionalRuntimePaths = mkOption {
|
additionalRuntimePaths = mkOption {
|
||||||
type = listOf (either path str);
|
type = listOf (either path str);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"release": "v0.7",
|
"release": "v0.8",
|
||||||
"isReleaseBranch": true
|
"isReleaseBranch": false
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue