mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-01-14 14:37:49 +00:00
Merge 73cd50b04b into e0f6fe7a2a
This commit is contained in:
commit
e22845c4d2
6 changed files with 78 additions and 1 deletions
|
|
@ -94,6 +94,7 @@ isMaximal: {
|
||||||
|
|
||||||
tailwind.enable = false;
|
tailwind.enable = false;
|
||||||
svelte.enable = false;
|
svelte.enable = false;
|
||||||
|
tera.enable = false;
|
||||||
|
|
||||||
# Nim LSP is broken on Darwin and therefore
|
# Nim LSP is broken on Darwin and therefore
|
||||||
# should be disabled by default. Users may still enable
|
# should be disabled by default. Users may still enable
|
||||||
|
|
|
||||||
|
|
@ -23,4 +23,11 @@
|
||||||
[ccc.nvim]: https://github.com/uga-rosa/ccc.nvim
|
[ccc.nvim]: https://github.com/uga-rosa/ccc.nvim
|
||||||
|
|
||||||
- Added [ccc.nvim] option {option}`vim.utility.ccc.setupOpts` with the existing
|
- Added [ccc.nvim] option {option}`vim.utility.ccc.setupOpts` with the existing
|
||||||
hard-coded options as default values.
|
hard-coded options as default values
|
||||||
|
|
||||||
|
[Snoweuph](https://github.com/snoweuph):
|
||||||
|
|
||||||
|
- Added [tera](https://keats.github.io/tera/) language support (syntax highlighting only).
|
||||||
|
- Added neovim theme `grubber-darker` <https://github.com/blazkowolf/gruber-darker.nvim>.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ in {
|
||||||
./helm.nix
|
./helm.nix
|
||||||
./kotlin.nix
|
./kotlin.nix
|
||||||
./html.nix
|
./html.nix
|
||||||
|
./tera.nix
|
||||||
./haskell.nix
|
./haskell.nix
|
||||||
./java.nix
|
./java.nix
|
||||||
./json.nix
|
./json.nix
|
||||||
|
|
|
||||||
28
modules/plugins/languages/tera.nix
Normal file
28
modules/plugins/languages/tera.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (lib.options) mkEnableOption;
|
||||||
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
|
inherit (lib.nvim.types) mkGrammarOption;
|
||||||
|
|
||||||
|
cfg = config.vim.languages.tera;
|
||||||
|
in {
|
||||||
|
options.vim.languages.tera = {
|
||||||
|
enable = mkEnableOption "Tera templating language support";
|
||||||
|
|
||||||
|
treesitter = {
|
||||||
|
enable = mkEnableOption "Tera treesitter" // {default = config.vim.languages.enableTreesitter;};
|
||||||
|
package = mkGrammarOption pkgs "tera";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable (mkMerge [
|
||||||
|
(mkIf cfg.treesitter.enable {
|
||||||
|
vim.treesitter.enable = true;
|
||||||
|
vim.treesitter.grammars = [cfg.treesitter.package];
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
@ -37,6 +37,33 @@ in {
|
||||||
'';
|
'';
|
||||||
styles = ["dark" "darker" "cool" "deep" "warm" "warmer"];
|
styles = ["dark" "darker" "cool" "deep" "warm" "warmer"];
|
||||||
};
|
};
|
||||||
|
gruber-darker = {
|
||||||
|
setup = _:
|
||||||
|
/*
|
||||||
|
lua
|
||||||
|
*/
|
||||||
|
''
|
||||||
|
require('gruber-darker').setup({
|
||||||
|
-- defaults
|
||||||
|
bold = true,
|
||||||
|
invert = {
|
||||||
|
signs = false,
|
||||||
|
tabline = false,
|
||||||
|
visual = false,
|
||||||
|
},
|
||||||
|
italic = {
|
||||||
|
strings = true,
|
||||||
|
comments = true,
|
||||||
|
operators = false,
|
||||||
|
folds = true,
|
||||||
|
},
|
||||||
|
undercurl = true,
|
||||||
|
underline = true,
|
||||||
|
})
|
||||||
|
vim.cmd('colorscheme gruber-darker')
|
||||||
|
'';
|
||||||
|
styles = ["dark"];
|
||||||
|
};
|
||||||
|
|
||||||
tokyonight = {
|
tokyonight = {
|
||||||
setup = {
|
setup = {
|
||||||
|
|
|
||||||
|
|
@ -643,6 +643,19 @@
|
||||||
"url": "https://github.com/ellisonleao/glow.nvim/archive/5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2.tar.gz",
|
"url": "https://github.com/ellisonleao/glow.nvim/archive/5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2.tar.gz",
|
||||||
"hash": "11rlis4riy1w4clnkiza8x6fs8xjwsrsgfzlz2k8z041ancmrw0a"
|
"hash": "11rlis4riy1w4clnkiza8x6fs8xjwsrsgfzlz2k8z041ancmrw0a"
|
||||||
},
|
},
|
||||||
|
"gruber-darker": {
|
||||||
|
"type": "Git",
|
||||||
|
"repository": {
|
||||||
|
"type": "GitHub",
|
||||||
|
"owner": "blazkowolf",
|
||||||
|
"repo": "gruber-darker.nvim"
|
||||||
|
},
|
||||||
|
"branch": "main",
|
||||||
|
"submodules": false,
|
||||||
|
"revision": "98a2e141981cbd5a194a97eae024bf55af854579",
|
||||||
|
"url": "https://github.com/blazkowolf/gruber-darker.nvim/archive/98a2e141981cbd5a194a97eae024bf55af854579.tar.gz",
|
||||||
|
"hash": "0bxv33isymnbdzf71w79pfxkwi8ylhjiq3ir9ws2as1d73nnl6lv"
|
||||||
|
},
|
||||||
"gruvbox": {
|
"gruvbox": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue