raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2025-01-10 03:09:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: raf:356f92053c9a23adaef66092d3d6e1d48923a9a8
Branches Tags
raf:main
raf:gh-pages
raf:flutter-fix
raf:feline
raf:more-option-stuff
raf:gitsigns-setupopts
raf:docs-tips
raf:live-docs-preview
raf:render-markdown-nvim
raf:bump-all-inputs
raf:fix-mdpw-ft
raf:docs-search-bar
raf:minimize-maximal
raf:v0.7
raf:v0.6
raf:abstract-lspconfig
raf:refactor-languages
raf:get-edgy
raf:machine-tests
raf:migrate-legacy-code
raf:poc-formatted-lua
raf:v0.5
raf:feature/nvim-debug
raf:v0.7
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2
..
compare: raf:5749739e4b67c955f06efca03a9962bc55038dfc
Branches Tags
raf:main
raf:gh-pages
raf:flutter-fix
raf:feline
raf:more-option-stuff
raf:gitsigns-setupopts
raf:docs-tips
raf:live-docs-preview
raf:render-markdown-nvim
raf:bump-all-inputs
raf:fix-mdpw-ft
raf:docs-search-bar
raf:minimize-maximal
raf:v0.7
raf:v0.6
raf:abstract-lspconfig
raf:refactor-languages
raf:get-edgy
raf:machine-tests
raf:migrate-legacy-code
raf:poc-formatted-lua
raf:v0.5
raf:feature/nvim-debug
raf:v0.7
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2

No commits in common. "356f92053c9a23adaef66092d3d6e1d48923a9a8" and "5749739e4b67c955f06efca03a9962bc55038dfc" have entirely different histories.
356f92053c ... 5749739e4b

51 changed files with 657 additions and 1123 deletions
Show stats Expand all files Collapse all files

36
.github/README.md vendored
View file

@ -206,16 +206,6 @@ features.
## Credits ## Credits
### Co-Maintainers
Alongside myself, nvf is developed by those talented folk:
- [**@horriblename**](https://github.com/horriblename) - For actively
implementing planned features and quality of life updates.
- [**@Diniamo**](https://github.com/Diniamo)
([Liberapay](https://en.liberapay.com/diniamo/)) - For actively submitting
pull requests, issues and assistance with maintenance of nvf.
### Contributors ### Contributors
[mnw]: https://github.com/gerg-l/mnw [mnw]: https://github.com/gerg-l/mnw
@ -223,19 +213,21 @@ Alongside myself, nvf is developed by those talented folk:
nvf would not be what it is today without the awesome people below. Special, nvf would not be what it is today without the awesome people below. Special,
heart-felt thanks to heart-felt thanks to
- [**@fufexan**](https://github.com/fufexan) - For the transition to flake-parts - [@fufexan](https://github.com/fufexan) - For the transition to flake-parts and
and invaluable Nix assistance. invaluable Nix assistance.
- [**@FlafyDev**](https://github.com/FlafyDev) - For getting Home-Manager module - [@FlafyDev](https://github.com/FlafyDev) - For getting home-manager module to
to work and Nix assistance. work and Nix assistance.
- [**@n3oney**](https://github.com/n3oney) - For making custom keybinds finally - [@n3oney](https://github.com/n3oney) - For making custom keybinds finally
possible, and other module additions. possible, and other module additions.
- [**@Yavko**](https://github.com/Yavko) - For the amazing **nvf** logo - [@horriblename](https://github.com/horriblename) - For actively implementing
- [**@FrothyMarrow**](https://github.com/FrothyMarrow) - For seeing mistakes planned features and quality of life updates.
that I could not. - [@Yavko](https://github.com/Yavko) - For the amazing **nvf** logo
- [**@Gerg-l**](https://github.com/gerg-l) 🐸 - For the modern Neovim wrapper, - [@FrothyMarrow](https://github.com/FrothyMarrow) - For seeing mistakes that I
[mnw], and occasional code improvements. could not.
- [**@Soliprem**](https://github.com/soliprem) - Rigorously implementing missing - [@Diniamo](https://github.com/Diniamo) - For actively submitting pull
features and excellent work on new language modules. requests, issues and assistance with maintenance of nvf.
- [@Gerg-l](https://github.com/gerg-l) - For the modern Neovim wrapper, [mnw],
and occasional code improvements.
and everyone who has submitted issues or pull requests! and everyone who has submitted issues or pull requests!

1
configuration.nix
View file

@ -79,7 +79,6 @@ isMaximal: {
dart.enable = false; dart.enable = false;
ocaml.enable = false; ocaml.enable = false;
elixir.enable = false; elixir.enable = false;
haskell.enable = false;
tailwind.enable = false; tailwind.enable = false;
svelte.enable = false; svelte.enable = false;

23
docs/manual/installation/modules/home-manager.md
View file

@ -10,18 +10,12 @@ To use it, we first add the input flake.
```nix ```nix
{ {
inputs = { inputs = {
# Optional, if you intend to follow nvf's obsidian-nvim input
# you must also add it as a flake input.
obsidian-nvim.url = "github:epwalsh/obsidian.nvim"; obsidian-nvim.url = "github:epwalsh/obsidian.nvim";
# Required, nvf works best and only directly supports flakes
nvf = { nvf = {
url = "github:notashelf/nvf"; url = "github:notashelf/nvf";
# You can override the input nixpkgs to follow your system's # you can override input nixpkgs
# instance of nixpkgs. This is safe to do as nvf does not depend
# on a binary cache.
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
# Optionally, you can also override individual plugins # you can also override individual plugins
# for example: # for example:
inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs
}; };
@ -33,8 +27,8 @@ Followed by importing the home-manager module somewhere in your configuration.
```nix ```nix
{ {
# Assuming "nvf" is in your inputs and inputs is in the argument set. # assuming nvf is in your inputs and inputs is in the argset
# See example installation below # see example below
imports = [ inputs.nvf.homeManagerModules.default ]; imports = [ inputs.nvf.homeManagerModules.default ];
} }
``` ```
@ -50,15 +44,12 @@ Followed by importing the home-manager module somewhere in your configuration.
}; };
outputs = { nixpkgs, home-manager, nvf, ... }: let outputs = { nixpkgs, home-manager, nvf, ... }: let
system = "x86_64-linux"; system = "x86_64-linux"; in {
pkgs = nixpkgs.legacyPackages.${system};
in {
# ↓ this is your home output in the flake schema, expected by home-manager # ↓ this is your home output in the flake schema, expected by home-manager
"your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration
inherit pkgs;
modules = [ modules = [
nvf.homeManagerModules.default # <- this imports the home-manager module that provides the options nvf.homeManagerModules.default # <- this imports the home-manager module that provides the options
./home.nix # <- your home entrypoint, `programs.nvf.*` may be defined here ./home.nix # <- your home entrypoint
]; ];
}; };
}; };

17
docs/manual/installation/modules/nixos.md
View file

@ -10,18 +10,12 @@ To use it, we first add the input flake.
```nix ```nix
{ {
inputs = { inputs = {
# Optional, if you intend to follow nvf's obsidian-nvim input
# you must also add it as a flake input.
obsidian-nvim.url = "github:epwalsh/obsidian.nvim"; obsidian-nvim.url = "github:epwalsh/obsidian.nvim";
# Required, nvf works best and only directly supports flakes
nvf = { nvf = {
url = "github:notashelf/nvf"; url = "github:notashelf/nvf";
# You can override the input nixpkgs to follow your system's # you can override input nixpkgs
# instance of nixpkgs. This is safe to do as nvf does not depend
# on a binary cache.
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
# Optionally, you can also override individual plugins # you can also override individual plugins
# for example: # for example:
inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs
}; };
@ -48,12 +42,13 @@ Followed by importing the NixOS module somewhere in your configuration.
nvf.url = "github:notashelf/nvf"; nvf.url = "github:notashelf/nvf";
}; };
outputs = { nixpkgs, nvf, ... }: { outputs = { nixpkgs, nvf, ... }: let
system = "x86_64-linux"; in {
# ↓ this is your host output in the flake schema # ↓ this is your host output in the flake schema
nixosConfigurations."your-hostname" = nixpkgs.lib.nixosSystem { nixosConfigurations."yourUsername»" = nixpkgs.lib.nixosSystem {
modules = [ modules = [
nvf.nixosModules.default # <- this imports the NixOS module that provides the options nvf.nixosModules.default # <- this imports the NixOS module that provides the options
./configuration.nix # <- your host entrypoint, `programs.nvf.*` may be defined here ./configuration.nix # <- your host entrypoint
]; ];
}; };
}; };

1
docs/manual/manual.md
View file

@ -11,7 +11,6 @@ try-it-out.md
default-configs.md default-configs.md
installation.md installation.md
configuring.md configuring.md
tips.md
``` ```
```{=include=} chapters ```{=include=} chapters

6
docs/manual/tips.md
View file

@ -1,6 +0,0 @@
# Helpful Tips {#ch-helpful-tips}
```{=include=} chapters
tips/debugging-nvf.md
tips/offline-docs.md
```

19
docs/manual/tips/debugging-nvf.md
View file

@ -1,19 +0,0 @@
# Debugging nvf {#sec-debugging-nvf}
There may be instances where the your Nix configuration evaluates to invalid
Lua, or times when you will be asked to provide your built Lua configuration for
easier debugging by nvf maintainers. nvf provides two helpful utilities out of
the box.
**nvf-print-config** and **nvf-print-config-path** will be bundled with nvf as
lightweight utilities to help you view or share your built configuration when
necessary.
To view your configuration with syntax highlighting, you may use the
[bat pager](https://github.com/sharkdp/bat).
```bash
nvf-print-config | bat --language=lua
```
Alternatively, `cat` or `less` may also be used.

11
docs/manual/tips/offline-docs.md
View file

@ -1,11 +0,0 @@
# Offline Documentation {#sec-offline-documentation}
[https://notashelf.github.io/nvf/options.html]: https://notashelf.github.io/nvf/options.html
The manpages provided by nvf contains an offline version of the option search
normally available at [https://notashelf.github.io/nvf/options.html]. You may
use the `man 5 nvf` command to view option documentation from the comfort of
your terminal.
Note that this is only available for NixOS and Home-Manager module
installations.

26
docs/release-notes/rl-0.8.md
View file

@ -3,34 +3,8 @@
[NotAShelf](https://github.com/notashelf): [NotAShelf](https://github.com/notashelf):
[typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
[render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
- Add [typst-preview.nvim] under - Add [typst-preview.nvim] under
`languages.typst.extensions.typst-preview-nvim`. `languages.typst.extensions.typst-preview-nvim`.
- Add a search widget to the options page in the nvf manual. - Add a search widget to the options page in the nvf manual.
- Add [render-markdown.nvim] under
`languages.markdown.extensions.render-markdown-nvim`
- Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
in gitsigns configuration.
[amadaluzia](https://github.com/amadaluzia):
[haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
- Add Haskell support under `vim.languages.haskell` using [haskell-tools.nvim].
[diniamo](https://github.com/diniamo):
- Add Odin support under `vim.languages.odin`.
- Disable the built-in format-on-save feature of zls. Use `vim.lsp.formatOnSave`
instead.
[horriblename](https://github.com/horriblename):
[aerial.nvim](https://github.com/stevearc/aerial.nvim)
- Add [aerial.nvim]

383
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1730504689,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1735150973, "lastModified": 1731821965,
"narHash": "sha256-OJhcCAoaMMXeD6o4qI/hxBCNELJp4dN8D5LJZc8w8XA=", "narHash": "sha256-QiGi/HBQRnIRGY4gQPuH7T3hr7NznOpEO7qNpF5ldmE=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "40cd0b006cc48dffd0f8698ad7f54cf1d56779a6", "rev": "5fe5c41975ed0af55f55dc37cd28ba906a5d015e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735523292, "lastModified": 1733024928,
"narHash": "sha256-opBsbR/nrGxiiF6XzlVluiHYb6yN/hEwv+lBWTy9xoM=", "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6d97d419e5a9b36e6293887a89a078cf85f5a61b", "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,14 +114,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1730504152,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
@ -156,22 +156,6 @@
"type": "sourcehut" "type": "sourcehut"
} }
}, },
"plugin-aerial-nvim": {
"flake": false,
"locked": {
"lastModified": 1736064692,
"narHash": "sha256-7YQtkUTACTMfAGoqoFDPmRrqtw+ypxDbeLCTB3sy4Us=",
"owner": "stevearc",
"repo": "aerial.nvim",
"rev": "b3ec25ca8c347fafa976484a6cace162239112e1",
"type": "github"
},
"original": {
"owner": "stevearc",
"repo": "aerial.nvim",
"type": "github"
}
},
"plugin-alpha-nvim": { "plugin-alpha-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -223,11 +207,11 @@
"plugin-catppuccin": { "plugin-catppuccin": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735299190, "lastModified": 1732428187,
"narHash": "sha256-lwQLmqm01FihJdad4QRMK23MTrouyOokyuX/3enWjzs=", "narHash": "sha256-Oogw5wmYkx/zsMlPE/r6Kt3cy5sC92rwVzf0P9rzqyw=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nvim", "repo": "nvim",
"rev": "f67b886d65a029f12ffa298701fb8f1efd89295d", "rev": "faf15ab0201b564b6368ffa47b56feefc92ce3f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +335,11 @@
"plugin-cmp-nvim-lsp": { "plugin-cmp-nvim-lsp": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733823748, "lastModified": 1715931395,
"narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=", "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=",
"owner": "hrsh7th", "owner": "hrsh7th",
"repo": "cmp-nvim-lsp", "repo": "cmp-nvim-lsp",
"rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0", "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -431,11 +415,11 @@
"plugin-copilot-cmp": { "plugin-copilot-cmp": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733947099, "lastModified": 1718601710,
"narHash": "sha256-erRL8bY/zuwuCZfttw+avTrFV7pjv2H6v73NzY2bymM=", "narHash": "sha256-8w9go2SBkI+BrXNadWM8ZxDDfrAnZZJx6RbVHAK4+Pg=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot-cmp", "repo": "copilot-cmp",
"rev": "15fc12af3d0109fa76b60b5cffa1373697e261d1", "rev": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -447,11 +431,11 @@
"plugin-copilot-lua": { "plugin-copilot-lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734926641, "lastModified": 1729295476,
"narHash": "sha256-c2UE0dLBtoYMvMxg+jXzfsD+wN9sZLvftJq4gGmooZU=", "narHash": "sha256-UY6N2Q+egh+Cn4REZXrSGH9ElWQBedl0n8tWJvGe7vs=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot.lua", "repo": "copilot.lua",
"rev": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9", "rev": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +463,11 @@
"plugin-csharpls-extended": { "plugin-csharpls-extended": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734491815, "lastModified": 1732674428,
"narHash": "sha256-jO/vuNgP8JAOIturzPFvxMLL5y+6YTYsUxjWwX6Nyso=", "narHash": "sha256-d7ll3OlOLx/7E+6+uga26L/FAqd8pZ4XquMakxMsFwU=",
"owner": "Decodetalkers", "owner": "Decodetalkers",
"repo": "csharpls-extended-lsp.nvim", "repo": "csharpls-extended-lsp.nvim",
"rev": "4f56c06215d10c4fcfee8a7f04ba766c114aece0", "rev": "c788fed627827238de348195c3f318cd090e8e77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +511,11 @@
"plugin-dracula": { "plugin-dracula": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734597715, "lastModified": 1731308832,
"narHash": "sha256-9iRI5NW3mcVzduitY4sr679dRWAWVbZuCAEfgM1OIOs=", "narHash": "sha256-3Tlk+utoF4QUjTIPszbyMDh5vUyNiBmq4bRW/leMjaU=",
"owner": "Mofiqul", "owner": "Mofiqul",
"repo": "dracula.nvim", "repo": "dracula.nvim",
"rev": "515acae4fd294fcefa5b15237a333c2606e958d1", "rev": "e6128ec3923b92bb2b16e81b4a0f04ed0308038e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +527,11 @@
"plugin-dressing-nvim": { "plugin-dressing-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734804193, "lastModified": 1731521499,
"narHash": "sha256-N4hB5wDgoqXrXxSfzDCrqmdDtdVvq+PtOS7FBPH7qXE=", "narHash": "sha256-O0sdxU+ZQnclnnC5IfBpgqlMxjsJKlmPYQYPP+S3cn8=",
"owner": "stevearc", "owner": "stevearc",
"repo": "dressing.nvim", "repo": "dressing.nvim",
"rev": "3a45525bb182730fe462325c99395529308f431e", "rev": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -559,11 +543,11 @@
"plugin-elixir-tools": { "plugin-elixir-tools": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735076861, "lastModified": 1727872243,
"narHash": "sha256-CoGTVSKifjqshk8hYaQfFYTYgEGsIb1hKdz6fIS81iU=", "narHash": "sha256-7gIvoV6myqbkjLnIhHuyNPix1DFkKEeeND2o6VDxDWc=",
"owner": "elixir-tools", "owner": "elixir-tools",
"repo": "elixir-tools.nvim", "repo": "elixir-tools.nvim",
"rev": "803fa69dbb457305cff98e3997bed2c4b51aea7c", "rev": "b465f6aff50257fa466de3886fc3e7de2dcff0de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,11 +559,11 @@
"plugin-fastaction-nvim": { "plugin-fastaction-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734546047, "lastModified": 1732135971,
"narHash": "sha256-1GSxTyXqufjkRtNK3drWlCn/mGJ9mM9bHMR6ZwWT6X8=", "narHash": "sha256-Q+FX7XiX8LyTC4OZ43Q2pXIdSViDn65P9pkDp8jvbnA=",
"owner": "Chaitanyabsprip", "owner": "Chaitanyabsprip",
"repo": "fastaction.nvim", "repo": "fastaction.nvim",
"rev": "886e22d85e13115808e81ca367d5aaba02d9a25b", "rev": "24255a74e0d35f1e1807aa78997f5c31ae419dbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,11 +575,11 @@
"plugin-fidget-nvim": { "plugin-fidget-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734334336, "lastModified": 1730221432,
"narHash": "sha256-o0za2NxFtzHZa7PRIm9U/P1/fwJrxS1G79ukdGLhJ4Q=", "narHash": "sha256-fQBrkHV54TaOeLYQJ1DE+lr7SFDPN1yqSlzhFm26NAY=",
"owner": "j-hui", "owner": "j-hui",
"repo": "fidget.nvim", "repo": "fidget.nvim",
"rev": "9238947645ce17d96f30842e61ba81147185b657", "rev": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -607,11 +591,11 @@
"plugin-flutter-tools": { "plugin-flutter-tools": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735420417, "lastModified": 1732910301,
"narHash": "sha256-xfSdPhrSUwBYdE9ZA8GgwFvR70nOp+snbNrFHeIfwOM=", "narHash": "sha256-iU0aTq3F5U2z8iKdUMxkvQ8ZopmWIGdx1I8ir0q7n0U=",
"owner": "akinsho", "owner": "akinsho",
"repo": "flutter-tools.nvim", "repo": "flutter-tools.nvim",
"rev": "a526c30f1941a7472509aaedda13758f943c968e", "rev": "40f974b15f82f9af498adda8d93aabd637f3ab58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +607,11 @@
"plugin-friendly-snippets": { "plugin-friendly-snippets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733106470, "lastModified": 1728273759,
"narHash": "sha256-I8SRZxnoNC6SOWW+scoA77Jwyxcb4eUczppLdyOiZe0=", "narHash": "sha256-H94Ryad0ZsSg/gioUgW+7sowij7GgtEUMNFi1IOZAys=",
"owner": "rafamadriz", "owner": "rafamadriz",
"repo": "friendly-snippets", "repo": "friendly-snippets",
"rev": "efff286dd74c22f731cdec26a70b46e5b203c619", "rev": "de8fce94985873666bd9712ea3e49ee17aadb1ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -700,22 +684,6 @@
"type": "github" "type": "github"
} }
}, },
"plugin-haskell-tools-nvim": {
"flake": false,
"locked": {
"lastModified": 1734222260,
"narHash": "sha256-gZVN9ADPO5wFOaf19FydCneb7aKTT9K1vcLoBURPEjk=",
"owner": "mrcjkb",
"repo": "haskell-tools.nvim",
"rev": "943b77b68a79d3991523ba4d373063c9355c6f55",
"type": "github"
},
"original": {
"owner": "mrcjkb",
"repo": "haskell-tools.nvim",
"type": "github"
}
},
"plugin-highlight-undo": { "plugin-highlight-undo": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -767,11 +735,11 @@
"plugin-image-nvim": { "plugin-image-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735173549, "lastModified": 1732136347,
"narHash": "sha256-Sjbmf4BmjkjAorT3tojbC7JivJagFamAVgzwcCipa8k=", "narHash": "sha256-Az/jiHW/DtvHNlV+Wzw6U+p8b2Ic9pNJRQ6YGerL81c=",
"owner": "3rd", "owner": "3rd",
"repo": "image.nvim", "repo": "image.nvim",
"rev": "b991fc7f845bc6ab40c6ec00b39750dcd5190010", "rev": "5f8fceca2d1be96a45b81de21c2f98bf6084fb34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +751,11 @@
"plugin-indent-blankline": { "plugin-indent-blankline": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733296464, "lastModified": 1731320409,
"narHash": "sha256-H3lUQZDvgj3a2STYeMUDiOYPe7rfsy08tJ4SlDd+LuE=", "narHash": "sha256-WVDNi/woG0ohPEYzM83mmXDCRNYnQbqooSDVUtBsJbY=",
"owner": "lukas-reineke", "owner": "lukas-reineke",
"repo": "indent-blankline.nvim", "repo": "indent-blankline.nvim",
"rev": "259357fa4097e232730341fa60988087d189193a", "rev": "7871a88056f7144defca9c931e311a3134c5d509",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -815,11 +783,11 @@
"plugin-lsp-lines": { "plugin-lsp-lines": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734793049, "lastModified": 1716108775,
"narHash": "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM=", "narHash": "sha256-QsvmPOer7JgO7Y+N/iaNJD7Kmy69gnlV4CeyaQesNvA=",
"owner": "~whynothugo", "owner": "~whynothugo",
"repo": "lsp_lines.nvim", "repo": "lsp_lines.nvim",
"rev": "a92c755f182b89ea91bd8a6a2227208026f27b4d", "rev": "7d9e2748b61bff6ebba6e30adbc7173ccf21c055",
"type": "sourcehut" "type": "sourcehut"
}, },
"original": { "original": {
@ -847,11 +815,11 @@
"plugin-lspkind": { "plugin-lspkind": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733408701, "lastModified": 1729872608,
"narHash": "sha256-OCvKUBGuzwy8OWOL1x3Z3fo+0+GyBMI9TX41xSveqvE=", "narHash": "sha256-/ifgjqqCQw67l3+gUs00tt860pa92M1WYdjdZ0lhxak=",
"owner": "onsails", "owner": "onsails",
"repo": "lspkind-nvim", "repo": "lspkind-nvim",
"rev": "d79a1c3299ad0ef94e255d045bed9fa26025dab6", "rev": "a700f1436d4a938b1a1a93c9962dc796afbaef4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -911,11 +879,11 @@
"plugin-luasnip": { "plugin-luasnip": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733162004, "lastModified": 1732967555,
"narHash": "sha256-efDe3RXncnNVkj37AmIv8oj0DKurB50Dziao5FGTLP4=", "narHash": "sha256-iWivJ6dIOEqT3uLQA5KzvCHkDcjC62OlNWagEW680qc=",
"owner": "L3MON4D3", "owner": "L3MON4D3",
"repo": "LuaSnip", "repo": "LuaSnip",
"rev": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d", "rev": "2592b91577136dbb355a4708be1e60619456b7f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -927,11 +895,11 @@
"plugin-lz-n": { "plugin-lz-n": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735437369, "lastModified": 1733019070,
"narHash": "sha256-6NIXqwmX7RgwiZVEzmTnkJgmrPqFNx12ayIcRgNIaEs=", "narHash": "sha256-Go9FBjF3EBFy+/53lpC5AdKYpJBK+uFzInTk6lODxdQ=",
"owner": "nvim-neorocks", "owner": "nvim-neorocks",
"repo": "lz.n", "repo": "lz.n",
"rev": "32be28a221b9c98e56841458e4b20c150a4169c4", "rev": "f308fa4dd81355fb5fddf3ca209847d679af6917",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -992,11 +960,11 @@
"plugin-modes-nvim": { "plugin-modes-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734414076, "lastModified": 1717693302,
"narHash": "sha256-ShIK8ROowT1yFHgSIVHUFnnQOEMr3YPIqw4ixzR8w8M=", "narHash": "sha256-z1XD0O+gG2/+g/skdWGC64Zv4dXvvhWesaK/8DcPF/E=",
"owner": "mvllow", "owner": "mvllow",
"repo": "modes.nvim", "repo": "modes.nvim",
"rev": "c7a4b1b383606832aab150902719bd5eb5cdb2b0", "rev": "326cff3282419b3bcc745061978c1e592cae055d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1008,11 +976,11 @@
"plugin-neo-tree-nvim": { "plugin-neo-tree-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735302061, "lastModified": 1732465535,
"narHash": "sha256-tZMneZsEbB5bgZgYq4ZWwK25B3vcnn80Q7diKcRoEv4=", "narHash": "sha256-3wRojpFbdjcRQPv62/mHqQgyfytTqaBcsX1X0zCNgC8=",
"owner": "nvim-neo-tree", "owner": "nvim-neo-tree",
"repo": "neo-tree.nvim", "repo": "neo-tree.nvim",
"rev": "a9f8943b4c31f8460d25c71e0f463d65e9775f1c", "rev": "42caaf5c3b7ca346ab278201151bb878006a6031",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1024,11 +992,11 @@
"plugin-neocord": { "plugin-neocord": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733429637, "lastModified": 1729369963,
"narHash": "sha256-g/pq6hFo7duonIl1wWoxbJUTh/IRTH3hHEoQUdoiqKE=", "narHash": "sha256-4dVaxigJ8eOXpgiqcxUYIF4SoC1CPFvNHYKT0zxIYo0=",
"owner": "IogaMaster", "owner": "IogaMaster",
"repo": "neocord", "repo": "neocord",
"rev": "4d55d8dab2d5f2f272192add7a2c21982039c699", "rev": "587e03390a355e9c364d48638e0e0db2a8431d73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1056,11 +1024,11 @@
"plugin-neorg": { "plugin-neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734188232, "lastModified": 1732289702,
"narHash": "sha256-xH87caxEebrWLwY/v3xyyOy6PTG/ZqX2OfCdwg/RqDY=", "narHash": "sha256-8RQ+PFnIcjPoNJQB/qz+zv1fjVjFEwPhuAh+JL7GPL4=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "6b945909d84b5aeadc875f9b3f529ec44b9bc60f", "rev": "7a893a176a7d9c074a5371865b53c6aa4e223991",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1104,11 +1072,11 @@
"plugin-noice-nvim": { "plugin-noice-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734026622, "lastModified": 1732649160,
"narHash": "sha256-OpwgNTGunmy6Y7D/k0T+DFK/WJ8MeVTGWwjiPTQlvEY=", "narHash": "sha256-0RLMkThaE6AxYvUKx056Ac63Oc2NTJxvgyRnZJ5/D2g=",
"owner": "folke", "owner": "folke",
"repo": "noice.nvim", "repo": "noice.nvim",
"rev": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f", "rev": "c6f6fb178ebe9b4fd90383de743c3399f8c3a37c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1137,11 +1105,11 @@
"plugin-nui-nvim": { "plugin-nui-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733856815, "lastModified": 1726376728,
"narHash": "sha256-6U7E/i5FuNXQy+sF4C5DVxuTPqNKD5wxUgFohpOjm9Q=", "narHash": "sha256-90Wq+vT361mTaGU/SvAezqJkX9HHmZ2GI2fKBDxPn04=",
"owner": "MunifTanjim", "owner": "MunifTanjim",
"repo": "nui.nvim", "repo": "nui.nvim",
"rev": "53e907ffe5eedebdca1cd503b00aa8692068ca46", "rev": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1185,11 +1153,11 @@
"plugin-nvim-cmp": { "plugin-nvim-cmp": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734672427, "lastModified": 1732948484,
"narHash": "sha256-Z/Qy2ErbCa7dbjZVuJUkMmb4d24amNunNgRcbCGPfOg=", "narHash": "sha256-+0nflL0WCaxPuJgUviELhbXASNYYl/SKZ+nz70sEAXU=",
"owner": "hrsh7th", "owner": "hrsh7th",
"repo": "nvim-cmp", "repo": "nvim-cmp",
"rev": "b555203ce4bd7ff6192e759af3362f9d217e8c89", "rev": "ca4d3330d386e76967e53b85953c170658255ecb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1201,11 +1169,11 @@
"plugin-nvim-colorizer-lua": { "plugin-nvim-colorizer-lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735384185, "lastModified": 1732386340,
"narHash": "sha256-quqs3666vQc/4ticc/Z5BHzGxV6UUVE9jVGT07MEMQQ=", "narHash": "sha256-lAWeljYC17bmEs1Ss80o6eJYrJ9fsFlKvyJWu9e44XU=",
"owner": "NvChad", "owner": "NvChad",
"repo": "nvim-colorizer.lua", "repo": "nvim-colorizer.lua",
"rev": "8a65c448122fc8fac9c67b2e857b6e830a4afd0b", "rev": "4acf88d31b3a7a1a7f31e9c30bf2b23c6313abdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1233,11 +1201,11 @@
"plugin-nvim-dap": { "plugin-nvim-dap": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735568902, "lastModified": 1732901614,
"narHash": "sha256-5iaXim9bDvSAI6jUXgu2OEk/KivfAsMTRry+UTHs2Gk=", "narHash": "sha256-atsgMdPyAAbh4dIxZOAE3hHLLb/664112lHdXHcXtZQ=",
"owner": "mfussenegger", "owner": "mfussenegger",
"repo": "nvim-dap", "repo": "nvim-dap",
"rev": "ffb077e65259f13be096ea6d603e3575a76b214a", "rev": "0a0daa796a5919a51e5e5019ffa91219c94c4fef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1265,11 +1233,11 @@
"plugin-nvim-dap-ui": { "plugin-nvim-dap-ui": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735324898, "lastModified": 1727897692,
"narHash": "sha256-psIBQpx3tV2UWm5hZTMPBANcXHPAX24dIuDq8Qcscxs=", "narHash": "sha256-kg7lyVBeuBqPCVzvt3pBoonQupgf1nGh3EvCF/astf4=",
"owner": "rcarriga", "owner": "rcarriga",
"repo": "nvim-dap-ui", "repo": "nvim-dap-ui",
"rev": "e94d98649dccb6a3884b66aabc2e07beb279e535", "rev": "ffa89839f97bad360e78428d5c740fdad9a0ff02",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1281,11 +1249,11 @@
"plugin-nvim-docs-view": { "plugin-nvim-docs-view": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733658747, "lastModified": 1723781320,
"narHash": "sha256-b5aH8Tj+tMk0BjNCgdeCEeR26oQ9NCobj98P7IDgIPY=", "narHash": "sha256-6kd3IWsD72eYe+q1w78gcFcK9LalCQHCqtSwwqQR3Ew=",
"owner": "amrbashir", "owner": "amrbashir",
"repo": "nvim-docs-view", "repo": "nvim-docs-view",
"rev": "1b97f8f954d74c46061bf289b6cea9232484c12c", "rev": "365593534e0acd762bfddce6e8313315ffa4fa36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1297,11 +1265,11 @@
"plugin-nvim-lightbulb": { "plugin-nvim-lightbulb": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734997673, "lastModified": 1729134062,
"narHash": "sha256-byvgRJvvt5rhiUVWdreY2jELXoPVld5EKQlOXwjNgWE=", "narHash": "sha256-JfXSuOBwyxgH/PzzcBQ7OqoXHkLGZSCYutYHLocbTto=",
"owner": "kosayoda", "owner": "kosayoda",
"repo": "nvim-lightbulb", "repo": "nvim-lightbulb",
"rev": "3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea", "rev": "33d4c95e0e853956bc9468b70b3064c87d5abaca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1313,11 +1281,11 @@
"plugin-nvim-lspconfig": { "plugin-nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735439232, "lastModified": 1733062298,
"narHash": "sha256-6a1HjpLYdZ+ZmWM1B0tv631A3EHHstPrjaV15UnVtoY=", "narHash": "sha256-tLZYWbKSQxiRU1tQqRXAUSTfCS7a1tHNSIMbt0aOamU=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "8b15a1a597a59f4f5306fad9adfe99454feab743", "rev": "90c1c6cc822b1836209514c096069b9bbeab63d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1329,11 +1297,11 @@
"plugin-nvim-metals": { "plugin-nvim-metals": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735386491, "lastModified": 1728295172,
"narHash": "sha256-G9V7fX65uW4z7kiuiP8mLtEjLoTJ1mkltj51OlN5/oM=", "narHash": "sha256-ja/+MNxZ3H9io9jDwm5rhE6iKNi86a22eCOY75g19O8=",
"owner": "scalameta", "owner": "scalameta",
"repo": "nvim-metals", "repo": "nvim-metals",
"rev": "e6b02c99161b43c67cfe1d6e5f9a9b9a0bb4701c", "rev": "f861db9fda55939797ac1b05238c49b0dcdc3bdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1377,11 +1345,11 @@
"plugin-nvim-neoclip": { "plugin-nvim-neoclip": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734898459, "lastModified": 1725927226,
"narHash": "sha256-RCMZi1DM9JFrXWQ5w2wOjFzpANkiukn+RvHB9swMtbk=", "narHash": "sha256-GHkTIGPgX5j1wUS9EW/fGOp3NSRjfVaz+6o1Aehy2Xw=",
"owner": "AckslD", "owner": "AckslD",
"repo": "nvim-neoclip.lua", "repo": "nvim-neoclip.lua",
"rev": "5e5e010251281f4aea69cfc1d4976ffe6065cf0f", "rev": "32e05f2d23dc5b6a284a688c0535a83d1bfc633f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1409,11 +1377,11 @@
"plugin-nvim-notify": { "plugin-nvim-notify": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735562588, "lastModified": 1727022370,
"narHash": "sha256-9jDpoLLto9WgTsV399WeE2XGrTJXWTYbcJ+zOFWldAA=", "narHash": "sha256-Sd7IR5roXHOKRCxhqtYMhWfEltyRJMDEMDO/ecSKenE=",
"owner": "rcarriga", "owner": "rcarriga",
"repo": "nvim-notify", "repo": "nvim-notify",
"rev": "c3797193536711b5d8983975791c4b11dc35ab3a", "rev": "fbef5d32be8466dd76544a257d3f3dce20082a07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1473,11 +1441,11 @@
"plugin-nvim-tree-lua": { "plugin-nvim-tree-lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734820548, "lastModified": 1732428058,
"narHash": "sha256-4PmP31vYPH9xw4AjV5rDSKvcvZGTnIaPfR4Bwc0lAiA=", "narHash": "sha256-HHgC7aH2m3gv2FtOK1jhjBgJOGWrdc+FQOEpMiEWe74=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "68fc4c20f5803444277022c681785c5edd11916d", "rev": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1489,11 +1457,11 @@
"plugin-nvim-treesitter-context": { "plugin-nvim-treesitter-context": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734710732, "lastModified": 1733041360,
"narHash": "sha256-TIFMPKzD2ero1eK9aVfY1iKEvf/Sw8SL/9mk9omCQ3c=", "narHash": "sha256-wcz3F0vDrgMXJjB0Zz7naoVQ8YvHdd55gG4NHqQMYQY=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-context", "repo": "nvim-treesitter-context",
"rev": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0", "rev": "920999bf53daa63ddf12efdeb5137a7cea1cc201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1505,11 +1473,11 @@
"plugin-nvim-ts-autotag": { "plugin-nvim-ts-autotag": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733164313, "lastModified": 1732998473,
"narHash": "sha256-v2NTFBIzKTYizUPWB3uhpnTGVZWaelhE3MT5+BDA6Do=", "narHash": "sha256-HtF0arW9cuE4yQN+1ccRaonqiH6fcoTpyuSecLPKtKc=",
"owner": "windwp", "owner": "windwp",
"repo": "nvim-ts-autotag", "repo": "nvim-ts-autotag",
"rev": "1cca23c9da708047922d3895a71032bc0449c52d", "rev": "f2d24aca1bcbbd2c0306fd93d52e3697027b77ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1521,11 +1489,11 @@
"plugin-nvim-web-devicons": { "plugin-nvim-web-devicons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735569123, "lastModified": 1732925137,
"narHash": "sha256-h9rY6F+2sBlG9PFN34/0ZTkY66oCeCIPe/HEadM03K4=", "narHash": "sha256-Sh+r54pTI60j5tOmSyEkTVS6MzMIt52nqjNdtMp8kpI=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-web-devicons", "repo": "nvim-web-devicons",
"rev": "4adeeaa7a32d46cf3b5833341358c797304f950a", "rev": "203da76ecfbb4b192cf830665b03eb651b635c94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1585,11 +1553,11 @@
"plugin-orgmode-nvim": { "plugin-orgmode-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734770880, "lastModified": 1731656059,
"narHash": "sha256-E1YJeTay1tX2PgiXwV/DRgrlYHIGUe9/uTA+6ORIhBw=", "narHash": "sha256-uKJuJsxQhdh3NxZx1Uu72poQVFN7KEyyMFEHPUr7UgQ=",
"owner": "nvim-orgmode", "owner": "nvim-orgmode",
"repo": "orgmode", "repo": "orgmode",
"rev": "bf657742f7cb56211f99946ff64f5f87d7d7f0d0", "rev": "1d8c9b9417f8c8e9fb146d4f54fb1e90a4f7e534",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1601,11 +1569,11 @@
"plugin-otter-nvim": { "plugin-otter-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735130975, "lastModified": 1724585935,
"narHash": "sha256-NPBGcLi1lEmpGGbGs58Xzw1IriOyKTMQdwIdVFsbVDM=", "narHash": "sha256-euHwoK2WHLF/hrjLY2P4yGrIbYyBN38FL3q4CKNZmLY=",
"owner": "jmbuhr", "owner": "jmbuhr",
"repo": "otter.nvim", "repo": "otter.nvim",
"rev": "e8c662e1aefa8b483cfba6e00729a39a363dcecc", "rev": "ca9ce67d0399380b659923381b58d174344c9ee7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1710,30 +1678,14 @@
"type": "github" "type": "github"
} }
}, },
"plugin-render-markdown-nvim": {
"flake": false,
"locked": {
"lastModified": 1735525479,
"narHash": "sha256-ncFqBv0JITX3pTsLON+HctLUaKXhLRMBUrRWmI8KOSA=",
"owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim",
"rev": "6fbd1491abc104409f119685de5353c35c97c005",
"type": "github"
},
"original": {
"owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim",
"type": "github"
}
},
"plugin-rose-pine": { "plugin-rose-pine": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733845819, "lastModified": 1729724348,
"narHash": "sha256-ejh9UXQbLc8Ie6wF7zszzL1gaJzr16gcu0dUWqTo8AM=", "narHash": "sha256-/a4pwuVJ5odm3Iio2MeoqAm8GlWIPI91mM4cVnSy/gE=",
"owner": "rose-pine", "owner": "rose-pine",
"repo": "neovim", "repo": "neovim",
"rev": "91548dca53b36dbb9d36c10f114385f759731be1", "rev": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1761,11 +1713,11 @@
"plugin-run-nvim": { "plugin-run-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735501787, "lastModified": 1732918526,
"narHash": "sha256-CFOyOARCLQiMOhFPeqz8n2ULyaaRxRZrOk0FCibjuIM=", "narHash": "sha256-kiszNmZZDXG8tAPMQKuGJDCkqCMzsWT7BkCvkVsH2lA=",
"owner": "diniamo", "owner": "diniamo",
"repo": "run.nvim", "repo": "run.nvim",
"rev": "9015c9cece816ccf10a185b420f6e345fd990802", "rev": "d867466e01b8fa4e54a589b9ef446cf43fb966de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1777,11 +1729,11 @@
"plugin-rustaceanvim": { "plugin-rustaceanvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735431742, "lastModified": 1732919014,
"narHash": "sha256-ucZXGbxHtbSKf5n11lL3vb6rD2BxJacIDOgcx32PLzA=", "narHash": "sha256-7UZ54b3IPS1cPyu+JCM/dHhJLHuqa16suaC2XlSw5Og=",
"owner": "mrcjkb", "owner": "mrcjkb",
"repo": "rustaceanvim", "repo": "rustaceanvim",
"rev": "51c097ebfb65d83baa71f48000b1e5c0a8dcc4fb", "rev": "4ac7a3c6cca9e393229651cc90733afbdc7c6395",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1793,11 +1745,11 @@
"plugin-smartcolumn": { "plugin-smartcolumn": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734696989, "lastModified": 1710067624,
"narHash": "sha256-6RodA5BQnL6tB3RCE5G2RiXqBvM3VP3HYZ+T3AxIF7Q=", "narHash": "sha256-DHIeDNUF9n9s14GVeojIwc5QUPwJMYYl3gRvhvO/rdE=",
"owner": "m4xshen", "owner": "m4xshen",
"repo": "smartcolumn.nvim", "repo": "smartcolumn.nvim",
"rev": "f14fbea6f86cd29df5042897ca9e3ba10ba4d27f", "rev": "cefb17be095ad5526030a21bb2a80553cae09127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1809,11 +1761,11 @@
"plugin-sqls-nvim": { "plugin-sqls-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733090837, "lastModified": 1733003065,
"narHash": "sha256-o5uD6shPkweuE+k/goBX42W3I2oojXVijfJC7L50sGU=", "narHash": "sha256-VKN4ggWogAr+hwr/gtIDgY5j3afL9R7dZ2oJ4+qpEtE=",
"owner": "nanotee", "owner": "nanotee",
"repo": "sqls.nvim", "repo": "sqls.nvim",
"rev": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472", "rev": "8d7b6010d276fdda494ede23df511eba120886b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1857,11 +1809,11 @@
"plugin-tiny-devicons-auto-colors": { "plugin-tiny-devicons-auto-colors": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733445616, "lastModified": 1724403745,
"narHash": "sha256-klUZKvdYhwO3sq4Su4sBFDcNSAYXh53O72vg4+ZOrhI=", "narHash": "sha256-Ndkbvxn/x7+fxEYD7JIygqUiItuhoY+4+DaL/pJGKdc=",
"owner": "rachartier", "owner": "rachartier",
"repo": "tiny-devicons-auto-colors.nvim", "repo": "tiny-devicons-auto-colors.nvim",
"rev": "c8f63933ee013c1e0a26091d58131e060546f01f", "rev": "a39fa4c92268832f6034306793b8acbfec2a7549",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1889,11 +1841,11 @@
"plugin-toggleterm-nvim": { "plugin-toggleterm-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735340326, "lastModified": 1731162901,
"narHash": "sha256-oeNIb+QHa/9yGZz/2u9LYIdKluel0bcQkaIqOuQUkis=", "narHash": "sha256-g1FwgCc3a8Fak0Nb0gQQ+SI44uyAGaH1tIk1qpaAPEY=",
"owner": "akinsho", "owner": "akinsho",
"repo": "toggleterm.nvim", "repo": "toggleterm.nvim",
"rev": "344fc1810292785b3d962ddac2de57669e1a7ff9", "rev": "87b2d6a3cab8e2bd9a0255427074285f0365398d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1905,11 +1857,11 @@
"plugin-tokyonight": { "plugin-tokyonight": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734211493, "lastModified": 1732026921,
"narHash": "sha256-TJ/a6N6Cc1T0wdMxMopma1NtwL7rMYbZ6F0zFI1zaIA=", "narHash": "sha256-vKXlFHzga9DihzDn+v+j3pMNDfvhYHcCT8GpPs0Uxgg=",
"owner": "folke", "owner": "folke",
"repo": "tokyonight.nvim", "repo": "tokyonight.nvim",
"rev": "45d22cf0e1b93476d3b6d362d720412b3d34465c", "rev": "c2725eb6d086c8c9624456d734bd365194660017",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1953,11 +1905,11 @@
"plugin-typst-preview-nvim": { "plugin-typst-preview-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734839452, "lastModified": 1733120663,
"narHash": "sha256-d6Tv7xZRghYYDfABk/p2e9qTm4qnWHM+ejKDCcR0TfY=", "narHash": "sha256-uYMZ2PONiiI3UDvCgNvyy4+jhzmUDbAyxX0phKxELXw=",
"owner": "chomosuke", "owner": "chomosuke",
"repo": "typst-preview.nvim", "repo": "typst-preview.nvim",
"rev": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36", "rev": "0cb5f5627312f50ce089f785ec42b55a85f30ce7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1985,11 +1937,11 @@
"plugin-vim-fugitive": { "plugin-vim-fugitive": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735457366, "lastModified": 1732036604,
"narHash": "sha256-45zsqKavWoclA67MC54bAel1nE8CLHtSdullHByiRS8=", "narHash": "sha256-RGS2T6tHuFPZROU0W4Z6j6wMEiJmd8xuKv3qqM3XHPI=",
"owner": "tpope", "owner": "tpope",
"repo": "vim-fugitive", "repo": "vim-fugitive",
"rev": "174230d6a7f2df94705a7ffd8d5413e27ec10a80", "rev": "320b18fba2a4f2fe3c8225c778c687e0d2620384",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2065,11 +2017,11 @@
"plugin-which-key": { "plugin-which-key": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734253151, "lastModified": 1732804356,
"narHash": "sha256-f/+sYMDEguB5ZDiYiQAsDvdF/2cVcWnLBU+9qwigk4s=", "narHash": "sha256-55RmbdN0rNG8946eIMFd5BlN82eY1GKqmHdUiC7BP+U=",
"owner": "folke", "owner": "folke",
"repo": "which-key.nvim", "repo": "which-key.nvim",
"rev": "8ab96b38a2530eacba5be717f52e04601eb59326", "rev": "9b365a6428a9633e3eeb34dbef1b791511c54f70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2106,7 +2058,6 @@
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nmd": "nmd", "nmd": "nmd",
"plugin-aerial-nvim": "plugin-aerial-nvim",
"plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim",
"plugin-base16": "plugin-base16", "plugin-base16": "plugin-base16",
"plugin-bufdelete-nvim": "plugin-bufdelete-nvim", "plugin-bufdelete-nvim": "plugin-bufdelete-nvim",
@ -2140,7 +2091,6 @@
"plugin-gitsigns-nvim": "plugin-gitsigns-nvim", "plugin-gitsigns-nvim": "plugin-gitsigns-nvim",
"plugin-glow-nvim": "plugin-glow-nvim", "plugin-glow-nvim": "plugin-glow-nvim",
"plugin-gruvbox": "plugin-gruvbox", "plugin-gruvbox": "plugin-gruvbox",
"plugin-haskell-tools-nvim": "plugin-haskell-tools-nvim",
"plugin-highlight-undo": "plugin-highlight-undo", "plugin-highlight-undo": "plugin-highlight-undo",
"plugin-hop-nvim": "plugin-hop-nvim", "plugin-hop-nvim": "plugin-hop-nvim",
"plugin-icon-picker-nvim": "plugin-icon-picker-nvim", "plugin-icon-picker-nvim": "plugin-icon-picker-nvim",
@ -2203,7 +2153,6 @@
"plugin-precognition-nvim": "plugin-precognition-nvim", "plugin-precognition-nvim": "plugin-precognition-nvim",
"plugin-project-nvim": "plugin-project-nvim", "plugin-project-nvim": "plugin-project-nvim",
"plugin-registers": "plugin-registers", "plugin-registers": "plugin-registers",
"plugin-render-markdown-nvim": "plugin-render-markdown-nvim",
"plugin-rose-pine": "plugin-rose-pine", "plugin-rose-pine": "plugin-rose-pine",
"plugin-rtp-nvim": "plugin-rtp-nvim", "plugin-rtp-nvim": "plugin-rtp-nvim",
"plugin-run-nvim": "plugin-run-nvim", "plugin-run-nvim": "plugin-run-nvim",

19
flake.nix
View file

@ -31,7 +31,7 @@
}; };
homeManagerModules = { homeManagerModules = {
nvf = import ./flake/modules/home-manager.nix {inherit lib self;}; nvf = import ./flake/modules/home-manager.nix self.packages lib;
default = self.homeManagerModules.nvf; default = self.homeManagerModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''
@ -42,7 +42,7 @@
}; };
nixosModules = { nixosModules = {
nvf = import ./flake/modules/nixos.nix {inherit lib self;}; nvf = import ./flake/modules/nixos.nix self.packages lib;
default = self.nixosModules.nvf; default = self.nixosModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''
@ -488,11 +488,6 @@
flake = false; flake = false;
}; };
plugin-render-markdown-nvim = {
url = "github:MeanderingProgrammer/render-markdown.nvim";
flake = false;
};
# Minimap # Minimap
plugin-minimap-vim = { plugin-minimap-vim = {
url = "github:wfxr/minimap.vim"; url = "github:wfxr/minimap.vim";
@ -725,15 +720,5 @@
url = "github:otavioschwanck/new-file-template.nvim"; url = "github:otavioschwanck/new-file-template.nvim";
flake = false; flake = false;
}; };
plugin-haskell-tools-nvim = {
url = "github:mrcjkb/haskell-tools.nvim";
flake = false;
};
plugin-aerial-nvim = {
url = "github:stevearc/aerial.nvim";
flake = false;
};
}; };
} }

24
flake/modules/home-manager.nix
View file

@ -1,28 +1,22 @@
# Home Manager module # Home Manager module
{ packages: lib: {
self,
lib,
}: {
config, config,
pkgs, pkgs,
... ...
}: let }: let
inherit (self) packages inputs;
inherit (lib) maintainers; inherit (lib) maintainers;
inherit (lib.modules) mkIf mkAliasOptionModule; inherit (lib.modules) mkIf mkAliasOptionModule;
inherit (lib.lists) optional; inherit (lib.lists) optional;
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.types) anything bool submoduleWith; inherit (lib.types) attrsOf anything bool;
inherit (lib.nvim) neovimConfiguration;
inherit (lib.nvim.types) anythingConcatLists;
cfg = config.programs.nvf; cfg = config.programs.nvf;
nvfModule = submoduleWith { neovimConfigured = neovimConfiguration {
description = "Nvf module"; inherit pkgs;
class = "nvf"; modules = [cfg.settings];
specialArgs = {
inherit pkgs lib inputs;
};
modules = import ../../modules/modules.nix {inherit pkgs lib;};
}; };
in { in {
imports = [ imports = [
@ -61,7 +55,7 @@ in {
}; };
settings = mkOption { settings = mkOption {
type = nvfModule; type = attrsOf anythingConcatLists;
default = {}; default = {};
description = "Attribute set of nvf preferences."; description = "Attribute set of nvf preferences.";
example = literalExpression '' example = literalExpression ''
@ -84,7 +78,7 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage; programs.nvf.finalPackage = neovimConfigured.neovim;
home = { home = {
sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";}; sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";};

24
flake/modules/nixos.nix
View file

@ -1,28 +1,22 @@
# NixOS module # NixOS module
{ packages: lib: {
self,
lib,
}: {
config, config,
pkgs, pkgs,
... ...
}: let }: let
inherit (self) inputs packages;
inherit (lib) maintainers; inherit (lib) maintainers;
inherit (lib.modules) mkIf mkOverride mkAliasOptionModule; inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
inherit (lib.lists) optional; inherit (lib.lists) optional;
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.types) anything bool submoduleWith; inherit (lib.types) attrsOf anything bool;
inherit (lib.nvim) neovimConfiguration;
inherit (lib.nvim.types) anythingConcatLists;
cfg = config.programs.nvf; cfg = config.programs.nvf;
nvfModule = submoduleWith { neovimConfigured = neovimConfiguration {
description = "Nvf module"; inherit pkgs;
class = "nvf"; modules = [cfg.settings];
specialArgs = {
inherit pkgs lib inputs;
};
modules = import ../../modules/modules.nix {inherit pkgs lib;};
}; };
in { in {
imports = [ imports = [
@ -61,7 +55,7 @@ in {
}; };
settings = mkOption { settings = mkOption {
type = nvfModule; type = attrsOf anythingConcatLists;
default = {}; default = {};
description = "Attribute set of nvf preferences."; description = "Attribute set of nvf preferences.";
example = literalExpression '' example = literalExpression ''
@ -84,7 +78,7 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage; programs.nvf.finalPackage = neovimConfigured.neovim;
environment = { environment = {
variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim"); variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");

55
lib/types/custom.nix
View file

@ -1,8 +1,57 @@
{lib}: let {lib}: let
inherit (lib.options) mergeEqualOption; inherit (lib.options) showOption showFiles getFiles mergeOneOption mergeEqualOption;
inherit (lib.strings) isString stringLength match; inherit (lib.strings) isString isStringLike;
inherit (lib.types) listOf mkOptionType; inherit (lib.types) anything attrsOf listOf mkOptionType;
inherit (lib.nvim.types) anythingConcatLists;
inherit (builtins) typeOf isAttrs any head concatLists stringLength match;
in { in {
# HACK: Does this break anything in our case?
# A modified version of the nixpkgs anything type that concatenates lists
# This isn't the default because the order in which the lists are concatenated depends on the order in which the modules are imported,
# which makes it non-deterministic
anythingConcatLists =
anything
// {
merge = loc: defs: let
getType = value:
if isAttrs value && isStringLike value
then "stringCoercibleSet"
else typeOf value;
# Throw an error if not all defs have the same type
checkType = getType (head defs).value;
commonType =
if any (def: getType def.value != checkType) defs
then throw "The option `${showOption loc}' has conflicting option types in ${showFiles (getFiles defs)}"
else checkType;
mergeFunctions = {
# Recursively merge attribute sets
set = (attrsOf anythingConcatLists).merge;
# Overridden behavior for lists, that concatenates lists
list = _: defs: concatLists (map (e: e.value) defs);
# This means it's a package, only accept a single definition
stringCoercibleSet = mergeOneOption;
# This works by passing the argument to the functions,
# and merging their returns values instead
lambda = loc: defs: arg:
anythingConcatLists.merge
(loc ++ ["<function body>"])
(map (def: {
inherit (def) file;
value = def.value arg;
})
defs);
};
in
# Merge the defs with the correct function from above, if available
# otherwise only allow equal values
(mergeFunctions.${commonType} or mergeEqualOption) loc defs;
};
mergelessListOf = elemType: let mergelessListOf = elemType: let
super = listOf elemType; super = listOf elemType;
in in

2
lib/types/default.nix
View file

@ -11,5 +11,5 @@ in {
inherit (typesDag) dagOf; inherit (typesDag) dagOf;
inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType; inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType;
inherit (typesLanguage) diagnostics mkGrammarOption; inherit (typesLanguage) diagnostics mkGrammarOption;
inherit (customTypes) char hexColor mergelessListOf; inherit (customTypes) anythingConcatLists char hexColor mergelessListOf;
} }

105
modules/default.nix
View file

@ -9,8 +9,9 @@
extraModules ? [], extraModules ? [],
configuration ? {}, configuration ? {},
}: let }: let
inherit (lib.strings) toString; inherit (pkgs) vimPlugins;
inherit (lib.lists) concatLists; inherit (lib.strings) isString toString;
inherit (lib.lists) filter map concatLists;
# import modules.nix with `check`, `pkgs` and `lib` as arguments # import modules.nix with `check`, `pkgs` and `lib` as arguments
# check can be disabled while calling this file is called # check can be disabled while calling this file is called
@ -20,12 +21,7 @@
# evaluate the extended library with the modules # evaluate the extended library with the modules
# optionally with any additional modules passed by the user # optionally with any additional modules passed by the user
module = lib.evalModules { module = lib.evalModules {
specialArgs = specialArgs = extraSpecialArgs // {modulesPath = toString ./.;};
extraSpecialArgs
// {
inherit inputs;
modulesPath = toString ./.;
};
modules = concatLists [ modules = concatLists [
nvimModules nvimModules
modules modules
@ -40,11 +36,102 @@
extraModules)) extraModules))
]; ];
}; };
# alias to the internal configuration
vimOptions = module.config.vim;
noBuildPlug = {pname, ...} @ attrs: let
src = inputs."plugin-${attrs.pname}";
in
{
version = src.shortRev or src.shortDirtyRev or "dirty";
outPath = src;
passthru.vimPlugin = false;
}
// attrs;
# build a vim plugin with the given name and arguments
# if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
# instead
buildPlug = attrs: let
src = inputs."plugin-${attrs.pname}";
in
pkgs.vimUtils.buildVimPlugin (
{
version = src.shortRev or src.shortDirtyRev or "dirty";
inherit src;
}
// attrs
);
buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
pluginBuilders = {
nvim-treesitter = buildTreesitterPlug vimOptions.treesitter.grammars;
flutter-tools-patched = buildPlug {
pname = "flutter-tools";
patches = [../patches/flutter-tools.patch];
};
};
buildConfigPlugins = plugins:
map (
plug:
if (isString plug)
then pluginBuilders.${plug} or (noBuildPlug {pname = plug;})
else plug
) (filter (f: f != null) plugins);
# built (or "normalized") plugins that are modified
builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
builtOptPlugins = map (package: package // {optional = true;}) (buildConfigPlugins vimOptions.optPlugins);
# additional Lua and Python3 packages, mapped to their respective functions
# to conform to the format mnw expects. end user should
# only ever need to pass a list of packages, which are modified
# here
extraLuaPackages = ps: map (x: ps.${x}) vimOptions.luaPackages;
extraPython3Packages = ps: map (x: ps.${x}) vimOptions.python3Packages;
# Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
# generate a wrapped Neovim package.
neovim-wrapped = inputs.mnw.lib.wrap pkgs {
neovim = vimOptions.package;
plugins = builtStartPlugins ++ builtOptPlugins;
appName = "nvf";
extraBinPath = vimOptions.extraPackages;
initLua = vimOptions.builtLuaConfigRC;
luaFiles = vimOptions.extraLuaFiles;
inherit (vimOptions) viAlias vimAlias withRuby withNodeJs withPython3;
inherit extraLuaPackages extraPython3Packages;
};
dummyInit = pkgs.writeText "nvf-init.lua" vimOptions.builtLuaConfigRC;
# Additional helper scripts for printing and displaying nvf configuration
# in your commandline.
printConfig = pkgs.writers.writeDashBin "nvf-print-config" "cat ${dummyInit}";
printConfigPath = pkgs.writers.writeDashBin "nvf-print-config-path" "echo -n ${dummyInit}";
in { in {
inherit (module) options config; inherit (module) options config;
inherit (module._module.args) pkgs; inherit (module._module.args) pkgs;
# Expose wrapped neovim-package for userspace # Expose wrapped neovim-package for userspace
# or module consumption. # or module consumption.
neovim = module.config.vim.build.finalPackage; neovim = pkgs.symlinkJoin {
name = "nvf-with-helpers";
paths = [neovim-wrapped printConfig printConfigPath];
postBuild = "echo Helpers added";
# Allow evaluating vimOptions, i.e., config.vim from the packages' passthru
# attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
# will return the configuration in full.
passthru.neovimConfig = vimOptions;
meta =
neovim-wrapped.meta
// {
description = "Wrapped Neovim package with helper scripts to print the config (path)";
};
};
} }

1
modules/modules.nix
View file

@ -49,7 +49,6 @@
# using the configuration passed in `neovim` and `plugins` modules. # using the configuration passed in `neovim` and `plugins` modules.
wrapper = map (p: ./wrapper + "/${p}") [ wrapper = map (p: ./wrapper + "/${p}") [
"build" "build"
"environment"
"rc" "rc"
"warnings" "warnings"
"lazy" "lazy"

93
modules/neovim/init/basic.nix
View file

@ -5,7 +5,6 @@
}: let }: let
inherit (lib.options) mkOption mkEnableOption literalMD; inherit (lib.options) mkOption mkEnableOption literalMD;
inherit (lib.strings) optionalString; inherit (lib.strings) optionalString;
inherit (lib.attrsets) optionalAttrs;
inherit (lib.types) enum bool str int either; inherit (lib.types) enum bool str int either;
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.dag) entryAfter;
@ -95,55 +94,55 @@ in {
# Set options that were previously interpolated in 'luaConfigRC.basic' as vim.options (vim.o) # Set options that were previously interpolated in 'luaConfigRC.basic' as vim.options (vim.o)
# and 'vim.globals' (vim.g). Future options, if possible, should be added here instead of the # and 'vim.globals' (vim.g). Future options, if possible, should be added here instead of the
# luaConfigRC section below. # luaConfigRC section below.
options = pushDownDefault (lib.mergeAttrsList [ options = pushDownDefault {
{ # Options that are always set, with a lower priority
# Options that are always set, with a lower priority encoding = "utf-8";
encoding = "utf-8"; hidden = true;
hidden = true; expandtab = true;
expandtab = true;
# Junkfile Behaviour # Junkfile Behaviour
swapfile = !cfg.preventJunkFiles; swapfile = !cfg.preventJunkFiles;
backup = !cfg.preventJunkFiles; backup = !cfg.preventJunkFiles;
writebackup = !cfg.preventJunkFiles; writebackup = !cfg.preventJunkFiles;
} };
(optionalAttrs cfg.undoFile.enable { # Options that are more difficult to set through 'vim.options'. Fear not, though
undofile = true; # as the Lua DAG is still as powerful as it could be.
undodir = cfg.undoFile.path;
})
(optionalAttrs (cfg.bell == "none") {
errorbells = false;
visualbell = false;
})
(optionalAttrs (cfg.bell == "on") {
visualbell = false;
})
(optionalAttrs (cfg.bell == "visual") {
visualbell = false;
})
(optionalAttrs (cfg.lineNumberMode == "relative") {
relativenumber = true;
})
(optionalAttrs (cfg.lineNumberMode == "number") {
number = true;
})
(optionalAttrs (cfg.lineNumberMode == "relNumber") {
number = true;
relativenumber = true;
})
]);
# Options that are more difficult to set through 'vim.options'. Namely, appending values
# to pre-set Neovim options. Fear not, though as the Lua DAG is still as powerful as it
# could be.
luaConfigRC.basic = entryAfter ["globalsScript"] '' luaConfigRC.basic = entryAfter ["globalsScript"] ''
-- Settings that are set for everything
vim.opt.shortmess:append("c")
${optionalString cfg.undoFile.enable ''
vim.o.undofile = true
vim.o.undodir = ${toLuaObject cfg.undoFile.path}
''}
${optionalString (cfg.bell == "none") ''
vim.o.errorbells = false
vim.o.visualbell = false
''}
${optionalString (cfg.bell == "on") ''
vim.o.visualbell = false
''}
${optionalString (cfg.bell == "visual") ''
vim.o.errorbells = false
''}
${optionalString (cfg.lineNumberMode == "relative") ''
vim.o.relativenumber = true
''}
${optionalString (cfg.lineNumberMode == "number") ''
vim.o.number = true
''}
${optionalString (cfg.lineNumberMode == "relNumber") ''
vim.o.number = true
vim.o.relativenumber = true
''}
${optionalString cfg.useSystemClipboard '' ${optionalString cfg.useSystemClipboard ''
vim.opt.clipboard:append("unnamedplus") vim.opt.clipboard:append("unnamedplus")
''} ''}

14
modules/plugins/filetree/nvimtree/config.nix
View file

@ -1,7 +1,7 @@
{ {
options,
config, config,
lib, lib,
pkgs,
... ...
}: let }: let
inherit (lib.strings) optionalString; inherit (lib.strings) optionalString;
@ -11,7 +11,8 @@
inherit (lib.nvim.binds) pushDownDefault; inherit (lib.nvim.binds) pushDownDefault;
cfg = config.vim.filetree.nvimTree; cfg = config.vim.filetree.nvimTree;
inherit (options.vim.filetree.nvimTree) mappings; self = import ./nvimtree.nix {inherit pkgs lib;};
inherit (self.options.vim.filetree.nvimTree) mappings;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {
@ -76,9 +77,6 @@ in {
-- buffer is a real file on the disk -- buffer is a real file on the disk
local real_file = vim.fn.filereadable(data.file) == 1 local real_file = vim.fn.filereadable(data.file) == 1
-- buffer is a directory
local directory = vim.fn.isdirectory(data.file) == 1
-- buffer is a [No Name] -- buffer is a [No Name]
local no_name = data.file == "" and vim.bo[data.buf].buftype == "" local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
@ -86,7 +84,7 @@ in {
local filetype = vim.bo[data.buf].ft local filetype = vim.bo[data.buf].ft
-- only files please -- only files please
if not real_file and not directory and not no_name then if not real_file and not no_name then
return return
end end
@ -95,10 +93,6 @@ in {
return return
end end
-- cd if buffer is a directory
if directory then
vim.cmd.cd(data.file)
end
-- open the tree but don't focus it -- open the tree but don't focus it
require("nvim-tree.api").tree.toggle({ focus = false }) require("nvim-tree.api").tree.toggle({ focus = false })
end end

3
modules/plugins/git/gitsigns/config.nix
View file

@ -7,7 +7,6 @@
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault; inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault;
inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.git.gitsigns; cfg = config.vim.git.gitsigns;
@ -71,7 +70,7 @@ in {
}; };
pluginRC.gitsigns = entryAnywhere '' pluginRC.gitsigns = entryAnywhere ''
require('gitsigns').setup(${toLuaObject cfg.setupOpts}) require('gitsigns').setup{}
''; '';
}; };
} }

2
modules/plugins/git/gitsigns/gitsigns.nix
View file

@ -6,7 +6,6 @@
inherit (lib.options) mkEnableOption; inherit (lib.options) mkEnableOption;
inherit (lib.modules) mkRenamedOptionModule; inherit (lib.modules) mkRenamedOptionModule;
inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.nvim.types) mkPluginSetupOption;
in { in {
imports = [ imports = [
(mkRenamedOptionModule ["vim" "git" "gitsigns" "codeActions" "vim" "gitsigns" "codeActions"] ["vim" "git" "gitsigns" "codeActions" "enable"]) (mkRenamedOptionModule ["vim" "git" "gitsigns" "codeActions" "vim" "gitsigns" "codeActions"] ["vim" "git" "gitsigns" "codeActions" "enable"])
@ -14,7 +13,6 @@ in {
options.vim.git.gitsigns = { options.vim.git.gitsigns = {
enable = mkEnableOption "gitsigns" // {default = config.vim.git.enable;}; enable = mkEnableOption "gitsigns" // {default = config.vim.git.enable;};
setupOpts = mkPluginSetupOption "gitsigns" {};
codeActions.enable = mkEnableOption "gitsigns codeactions through null-ls"; codeActions.enable = mkEnableOption "gitsigns codeactions through null-ls";

2
modules/plugins/languages/default.nix
View file

@ -14,7 +14,6 @@ in {
./hcl.nix ./hcl.nix
./kotlin.nix ./kotlin.nix
./html.nix ./html.nix
./haskell.nix
./java.nix ./java.nix
./lua.nix ./lua.nix
./markdown.nix ./markdown.nix
@ -37,7 +36,6 @@ in {
./csharp.nix ./csharp.nix
./julia.nix ./julia.nix
./nu.nix ./nu.nix
./odin.nix
]; ];
options.vim.languages = { options.vim.languages = {

104
modules/plugins/languages/haskell.nix
View file

@ -1,104 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (builtins) isList;
inherit (lib.types) either package listOf str;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.strings) optionalString;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.dag) entryAfter;
inherit (lib.nvim.lua) expToLua;
inherit (pkgs) haskellPackages;
cfg = config.vim.languages.haskell;
in {
options.vim.languages.haskell = {
enable = mkEnableOption "Haskell support";
treesitter = {
enable = mkEnableOption "Treesitter support for Haskell" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "haskell";
};
lsp = {
enable = mkEnableOption "LSP support for Haskell" // {default = config.vim.languages.enableLSP;};
package = mkOption {
description = "Haskell LSP package or command to run the Haskell LSP";
example = ''[ (lib.getExe pkgs.haskellPackages.haskell-language-server) "--debug" ]'';
default = haskellPackages.haskell-language-server;
type = either package (listOf str);
};
};
dap = {
enable = mkEnableOption "DAP support for Haskell" // {default = config.vim.languages.enableDAP;};
package = mkOption {
description = "Haskell DAP package or command to run the Haskell DAP";
default = haskellPackages.haskell-debug-adapter;
type = either package (listOf str);
};
};
};
config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable {
vim.treesitter = {
enable = true;
grammars = [cfg.treesitter.package];
};
})
(mkIf (cfg.dap.enable || cfg.lsp.enable) {
vim = {
startPlugins = ["haskell-tools-nvim"];
luaConfigRC.haskell-tools-nvim =
entryAfter
["lsp-setup"]
''
vim.g.haskell_tools = {
${optionalString cfg.lsp.enable ''
-- LSP
tools = {
hover = {
enable = true,
},
},
hls = {
cmd = ${
if isList cfg.lsp.package
then expToLua cfg.lsp.package
else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper"}''
},
on_attach = function(client, bufnr, ht)
default_on_attach(client, bufnr, ht)
local opts = { noremap = true, silent = true, buffer = bufnr }
vim.keymap.set('n', '<localleader>cl', vim.lsp.codelens.run, opts)
vim.keymap.set('n', '<localleader>hs', ht.hoogle.hoogle_signature, opts)
vim.keymap.set('n', '<localleader>ea', ht.lsp.buf_eval_all, opts)
vim.keymap.set('n', '<localleader>rr', ht.repl.toggle, opts)
vim.keymap.set('n', '<localleader>rf', function()
ht.repl.toggle(vim.api.nvim_buf_get_name(0))
end, opts)
vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts)
end,
},
''}
${optionalString cfg.dap.enable ''
dap = {
cmd = ${
if isList cfg.dap.package
then expToLua cfg.dap.package
else ''{"${cfg.dap.package}/bin/haskell-debug-adapter"}''
},
},
''}
}
'';
};
})
]);
}

40
modules/plugins/languages/markdown.nix
View file

@ -4,14 +4,13 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames concatLists;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.lists) isList concatLists; inherit (lib.lists) isList;
inherit (lib.types) bool enum either package listOf str; inherit (lib.types) bool enum either package listOf str;
inherit (lib.nvim.lua) expToLua toLuaObject; inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.dag) entryAnywhere;
cfg = config.vim.languages.markdown; cfg = config.vim.languages.markdown;
defaultServer = "marksman"; defaultServer = "marksman";
@ -99,29 +98,6 @@ in {
description = "Extra filetypes to format with the Markdown formatter"; description = "Extra filetypes to format with the Markdown formatter";
}; };
}; };
extensions = {
render-markdown-nvim = {
enable =
mkEnableOption ""
// {
description = ''
[render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
Inline Markdown rendering with [render-markdown.nvim]
'';
};
setupOpts = mkPluginSetupOption "render-markdown" {
auto_override_publish_diagnostics = mkOption {
description = "Automatically override the publish_diagnostics handler";
type = bool;
default = true;
};
};
};
};
}; };
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
@ -139,13 +115,5 @@ in {
vim.lsp.null-ls.enable = true; vim.lsp.null-ls.enable = true;
vim.lsp.null-ls.sources.markdown-format = formats.${cfg.format.type}.nullConfig; vim.lsp.null-ls.sources.markdown-format = formats.${cfg.format.type}.nullConfig;
}) })
# Extensions
(mkIf cfg.extensions.render-markdown-nvim.enable {
vim.startPlugins = ["render-markdown-nvim"];
vim.pluginRC.render-markdown-nvim = entryAnywhere ''
require("render-markdown").setup(${toLuaObject cfg.extensions.render-markdown-nvim.setupOpts})
'';
})
]); ]);
} }

71
modules/plugins/languages/odin.nix
View file

@ -1,71 +0,0 @@
{
config,
pkgs,
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList;
inherit (lib.types) either listOf package str enum;
inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.types) mkGrammarOption;
defaultServer = "ols";
servers = {
ols = {
package = pkgs.ols;
lspConfig = ''
lspconfig.ols.setup {
capabilities = capabilities,
on_attach = default_on_attach,
cmd = ${
if isList cfg.lsp.package
then expToLua cfg.lsp.package
else "{'${cfg.lsp.package}/bin/ols'}"
}
}
'';
};
};
cfg = config.vim.languages.odin;
in {
options.vim.languages.odin = {
enable = mkEnableOption "Odin language support";
treesitter = {
enable = mkEnableOption "Odin treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "odin";
};
lsp = {
enable = mkEnableOption "Odin LSP support" // {default = config.vim.languages.enableLSP;};
server = mkOption {
type = enum (attrNames servers);
default = defaultServer;
description = "Odin LSP server to use";
};
package = mkOption {
description = "Ols package, or the command to run as a list of strings";
type = either package (listOf str);
default = pkgs.ols;
};
};
};
config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable {
vim.treesitter.enable = true;
vim.treesitter.grammars = [cfg.treesitter.package];
})
(mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true;
vim.lsp.lspconfig.sources.odin-lsp = servers.${cfg.lsp.server}.lspConfig;
})
]);
}

4
modules/plugins/languages/rust.nix
View file

@ -13,7 +13,7 @@
inherit (lib.types) bool package str listOf either enum; inherit (lib.types) bool package str listOf either enum;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.dag) entryAfter entryAnywhere; inherit (lib.nvim.dag) entryAnywhere;
cfg = config.vim.languages.rust; cfg = config.vim.languages.rust;
@ -127,7 +127,7 @@ in {
vim = { vim = {
startPlugins = ["rustaceanvim"]; startPlugins = ["rustaceanvim"];
pluginRC.rustaceanvim = entryAfter ["lsp-setup"] '' luaConfigRC.rustaceanvim = entryAnywhere ''
vim.g.rustaceanvim = { vim.g.rustaceanvim = {
${optionalString cfg.lsp.enable '' ${optionalString cfg.lsp.enable ''
-- LSP -- LSP

8
modules/plugins/languages/ts.nix
View file

@ -23,11 +23,8 @@
package = pkgs.typescript-language-server; package = pkgs.typescript-language-server;
lspConfig = '' lspConfig = ''
lspconfig.ts_ls.setup { lspconfig.ts_ls.setup {
capabilities = capabilities, capabilities = capabilities;
on_attach = function(client, bufnr) on_attach = attach_keymaps,
attach_keymaps(client, bufnr);
client.server_capabilities.documentFormattingProvider = false;
end,
cmd = ${ cmd = ${
if isList cfg.lsp.package if isList cfg.lsp.package
then expToLua cfg.lsp.package then expToLua cfg.lsp.package
@ -82,7 +79,6 @@
ls_sources, ls_sources,
null_ls.builtins.formatting.prettier.with({ null_ls.builtins.formatting.prettier.with({
command = "${cfg.format.package}/bin/prettier", command = "${cfg.format.package}/bin/prettier",
filetypes = { "typescript" },
}) })
) )
''; '';

20
modules/plugins/languages/zig.nix
View file

@ -6,7 +6,7 @@
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge mkDefault; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.lists) isList;
inherit (lib.types) either listOf package str enum; inherit (lib.types) either listOf package str enum;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
@ -57,25 +57,15 @@ in {
}; };
}; };
}; };
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {
vim.treesitter = { vim.treesitter.enable = true;
enable = true; vim.treesitter.grammars = [cfg.treesitter.package];
grammars = [cfg.treesitter.package];
};
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim = { vim.lsp.lspconfig.enable = true;
lsp.lspconfig = { vim.lsp.lspconfig.sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
enable = true;
sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
};
# nvf handles autosaving already
globals.zig_fmt_autosave = mkDefault 0;
};
}) })
]); ]);
} }

14
modules/plugins/runner/run-nvim/config.nix
View file

@ -20,9 +20,17 @@ in {
cmd = "Run"; cmd = "Run";
keys = [ keys = [
(mkKeymap "n" cfg.mappings.run "<cmd>Run<cr>" {desc = mappings.run.description;}) (mkKeymap "n" cfg.mappings.run "<cmd>Run<CR>" {desc = mappings.run.description;})
(mkKeymap "n" cfg.mappings.runOverride "<cmd>Run!<cr>" {desc = mappings.runOverride.description;}) (mkKeymap "n" cfg.mappings.runOverride "<cmd>Run!<CR>" {desc = mappings.runOverride.description;})
(mkKeymap "n" cfg.mappings.runCommand "<cmd>RunPrompt<cr>" {desc = mappings.run.description;}) (mkKeymap "n" cfg.mappings.runCommand ''
function()
local input = vim.fn.input("Run command: ")
if input ~= "" then require("run").run(input, false) end
end
'' {
desc = mappings.run.description;
lua = true;
})
]; ];
}; };

14
modules/plugins/ui/notifications/nvim-notify/config.nix
View file

@ -14,9 +14,17 @@ in {
startPlugins = ["nvim-notify"]; startPlugins = ["nvim-notify"];
pluginRC.nvim-notify = entryAnywhere '' pluginRC.nvim-notify = entryAnywhere ''
local notify = require("notify") require('notify').setup(${toLuaObject cfg.setupOpts})
notify.setup(${toLuaObject cfg.setupOpts})
vim.notify = notify.notify -- required to fix offset_encoding errors
local notify = vim.notify
vim.notify = function(msg, ...)
if msg:match("warning: multiple different client offset_encodings") then
return
end
notify(msg, ...)
end
''; '';
}; };
}; };

4
modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix
View file

@ -28,7 +28,7 @@ in {
}; };
stages = mkOption { stages = mkOption {
type = enum ["fade_in_slide_out" "fade" "slide" "static"]; type = enum ["fade_in_slide_out" "fade_in" "slide_out" "none"];
default = "fade_in_slide_out"; default = "fade_in_slide_out";
description = "The stages of the notification"; description = "The stages of the notification";
}; };
@ -41,7 +41,7 @@ in {
background_colour = mkOption { background_colour = mkOption {
type = str; type = str;
default = "NotifyBackground"; default = "#000000";
description = "The background colour of the notification"; description = "The background colour of the notification";
}; };

1
modules/plugins/utility/default.nix
View file

@ -1,6 +1,5 @@
{ {
imports = [ imports = [
./outline
./binds ./binds
./ccc ./ccc
./gestures ./gestures

14
modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix
View file

@ -1,14 +0,0 @@
{lib, ...}: let
inherit (lib.options) mkEnableOption;
inherit (lib.nvim.types) mkPluginSetupOption;
inherit (lib.nvim.binds) mkMappingOption;
in {
options.vim.utility.outline.aerial-nvim = {
enable = mkEnableOption "Aerial.nvim";
setupOpts = mkPluginSetupOption "aerial.nvim" {};
mappings = {
toggle = mkMappingOption "Toggle aerial window" "gO";
};
};
}

42
modules/plugins/utility/outline/aerial-nvim/config.nix
View file

@ -1,42 +0,0 @@
{
options,
config,
lib,
...
}: let
inherit (lib.modules) mkIf;
inherit (lib.nvim.binds) mkKeymap;
cfg = config.vim.utility.outline.aerial-nvim;
inherit (options.vim.utility.outline.aerial-nvim) mappings;
in {
config = mkIf cfg.enable {
vim = {
lazy.plugins.aerial-nvim = {
package = "aerial-nvim";
setupModule = "aerial";
inherit (cfg) setupOpts;
cmd = [
"AerialClose"
"AerialCloseAll"
"AerialGo"
"AerialInfo"
"AerialNavClose"
"AerialNavOpen"
"AerialNavToggle"
"AerialNext"
"AerialOpen"
"AerialOpenAll"
"AerialPrev"
"AerialToggle"
];
keys = [
(mkKeymap "n" cfg.mappings.toggle ":AerialToggle<CR>" {desc = mappings.toggle.description;})
];
};
};
};
}

6
modules/plugins/utility/outline/aerial-nvim/default.nix
View file

@ -1,6 +0,0 @@
{
imports = [
./aerial-nvim.nix
./config.nix
];
}

5
modules/plugins/utility/outline/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./aerial-nvim
];
}

4
modules/plugins/utility/preview/markdown-preview/config.nix
View file

@ -4,8 +4,8 @@
lib, lib,
... ...
}: let }: let
inherit (lib.strings) concatMapStringsSep;
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
cfg = config.vim.utility.preview.markdownPreview; cfg = config.vim.utility.preview.markdownPreview;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -15,7 +15,7 @@ in {
mkdp_auto_start = cfg.autoStart; mkdp_auto_start = cfg.autoStart;
mkdp_auto_close = cfg.autoClose; mkdp_auto_close = cfg.autoClose;
mkdp_refresh_slow = cfg.lazyRefresh; mkdp_refresh_slow = cfg.lazyRefresh;
mkdp_filetypes = cfg.filetypes; mkdp_filetypes = [(concatMapStringsSep ", " (x: "'" + x + "'") cfg.filetypes)];
mkdp_command_for_global = cfg.alwaysAllowPreview; mkdp_command_for_global = cfg.alwaysAllowPreview;
mkdp_open_to_the_world = cfg.broadcastServer; mkdp_open_to_the_world = cfg.broadcastServer;
mkdp_open_ip = cfg.customIP; mkdp_open_ip = cfg.customIP;

48
modules/plugins/utility/surround/config.nix
View file

@ -4,33 +4,51 @@
... ...
}: let }: let
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.utility.surround; cfg = config.vim.utility.surround;
mkLznKey = mode: key: { mkLznKey = mode: key: {
inherit mode key; inherit key mode;
}; };
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {
startPlugins = ["nvim-surround"];
pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})";
lazy.plugins.nvim-surround = { lazy.plugins.nvim-surround = {
package = "nvim-surround"; package = "nvim-surround";
setupModule = "nvim-surround"; setupModule = "nvim-surround";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
keys = [ keys =
(mkLznKey "i" cfg.setupOpts.keymaps.insert) [
(mkLznKey "i" cfg.setupOpts.keymaps.insert_line) (mkLznKey ["i"] cfg.setupOpts.keymaps.insert)
(mkLznKey "x" cfg.setupOpts.keymaps.visual) (mkLznKey ["i"] cfg.setupOpts.keymaps.insert_line)
(mkLznKey "x" cfg.setupOpts.keymaps.visual_line) (mkLznKey ["x"] cfg.setupOpts.keymaps.visual)
(mkLznKey "n" cfg.setupOpts.keymaps.normal) (mkLznKey ["x"] cfg.setupOpts.keymaps.visual_line)
(mkLznKey "n" cfg.setupOpts.keymaps.normal_cur) (mkLznKey ["n"] cfg.setupOpts.keymaps.normal)
(mkLznKey "n" cfg.setupOpts.keymaps.normal_line) (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur)
(mkLznKey "n" cfg.setupOpts.keymaps.normal_cur_line) (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_line)
(mkLznKey "n" cfg.setupOpts.keymaps.delete) (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur_line)
(mkLznKey "n" cfg.setupOpts.keymaps.change) (mkLznKey ["n"] cfg.setupOpts.keymaps.delete)
(mkLznKey "n" cfg.setupOpts.keymaps.change_line) (mkLznKey ["n"] cfg.setupOpts.keymaps.change)
]; (mkLznKey ["n"] cfg.setupOpts.keymaps.change_line)
]
++ map (mkLznKey ["n" "i" "v"]) [
"<Plug>(nvim-surround-insert)"
"<Plug>(nvim-surround-insert-line)"
"<Plug>(nvim-surround-normal)"
"<Plug>(nvim-surround-normal-cur)"
"<Plug>(nvim-surround-normal-line)"
"<Plug>(nvim-surround-normal-cur-line)"
"<Plug>(nvim-surround-visual)"
"<Plug>(nvim-surround-visual-line)"
"<Plug>(nvim-surround-delete)"
"<Plug>(nvim-surround-change)"
"<Plug>(nvim-surround-change-line)"
];
}; };
}; };
}; };

14
modules/plugins/utility/wakatime/config.nix
View file

@ -1,22 +1,18 @@
{ {
config, config,
pkgs,
lib, lib,
pkgs,
... ...
}: let }: let
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
inherit (lib.meta) getExe;
cfg = config.vim.utility.vim-wakatime; cfg = config.vim.utility.vim-wakatime;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim.startPlugins = [pkgs.vimPlugins.vim-wakatime];
startPlugins = [pkgs.vimPlugins.vim-wakatime];
# Wakatime configuration is stored as vim globals. vim.pluginRC.vim-wakatime = mkIf (cfg.cli-package != null) ''
globals = { vim.g.wakatime_CLIPath = "${cfg.cli-package}"
"wakatime_CLIPath" = mkIf (cfg.cli-package != null) "${getExe cfg.cli-package}"; '';
};
};
}; };
} }

2
modules/plugins/utility/wakatime/default.nix
View file

@ -1,4 +1,4 @@
{ _: {
imports = [ imports = [
./config.nix ./config.nix
./vim-wakatime.nix ./vim-wakatime.nix

14
modules/plugins/utility/wakatime/vim-wakatime.nix
View file

@ -1,24 +1,18 @@
{ {
pkgs,
lib, lib,
pkgs,
... ...
}: let }: let
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) nullOr package; inherit (lib.types) nullOr package;
in { in {
options.vim.utility.vim-wakatime = { options.vim.utility.vim-wakatime = {
enable = mkEnableOption '' enable = mkEnableOption "vim-wakatime: live code statistics";
automatic time tracking and metrics generated from your programming activity [vim-wakatime]
'';
cli-package = mkOption { cli-package = mkOption {
type = nullOr package; type = nullOr package;
default = pkgs.wakatime-cli; default = pkgs.wakatime;
example = null; description = "The package that should be used for wakatime-cli. Set as null to use the default path in `$XDG_DATA_HOME`";
description = ''
The package that should be used for wakatime-cli.
Set as null to use the default path in {env}`$XDG_DATA_HOME`
'';
}; };
}; };
} }

115
modules/wrapper/build/config.nix
View file

@ -1,116 +1,13 @@
{ {
inputs,
lib,
config, config,
pkgs, lib,
... ...
} }: let
: let inherit (lib.attrsets) attrValues;
inherit (pkgs) vimPlugins;
inherit (lib.strings) isString;
inherit (lib.lists) filter map;
inherit (builtins) path;
# alias to the internal configuration cfg = config.vim;
vimOptions = config.vim;
noBuildPlug = pname: let
input = inputs."plugin-${pname}";
version = input.shortRev or input.shortDirtyRev or "dirty";
in {
# vim.lazy.plugins relies on pname, so we only set that here
# version isn't needed for anything, but inherit it anyway for correctness
inherit pname version;
outPath = path {
name = "${pname}-0-unstable-${version}";
path = input.outPath;
};
passthru.vimPlugin = false;
};
# build a vim plugin with the given name and arguments
# if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
# instead
buildPlug = attrs: let
input = inputs."plugin-${attrs.pname}";
in
pkgs.vimUtils.buildVimPlugin (
{
version = input.shortRev or input.shortDirtyRev or "dirty";
src = input.outPath;
}
// attrs
);
buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
pluginBuilders = {
nvim-treesitter = buildTreesitterPlug vimOptions.treesitter.grammars;
flutter-tools-patched = buildPlug {
pname = "flutter-tools";
patches = [./patches/flutter-tools.patch];
};
};
buildConfigPlugins = plugins:
map (
plug:
if (isString plug)
then pluginBuilders.${plug} or (noBuildPlug plug)
else plug
) (filter (f: f != null) plugins);
# built (or "normalized") plugins that are modified
builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
builtOptPlugins = map (package: package // {optional = true;}) (buildConfigPlugins vimOptions.optPlugins);
# additional Lua and Python3 packages, mapped to their respective functions
# to conform to the format mnw expects. end user should
# only ever need to pass a list of packages, which are modified
# here
extraLuaPackages = ps: map (x: ps.${x}) vimOptions.luaPackages;
extraPython3Packages = ps: map (x: ps.${x}) vimOptions.python3Packages;
# Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
# generate a wrapped Neovim package.
neovim-wrapped = inputs.mnw.lib.wrap pkgs {
neovim = vimOptions.package;
plugins = builtStartPlugins ++ builtOptPlugins;
appName = "nvf";
extraBinPath = vimOptions.extraPackages;
initLua = vimOptions.builtLuaConfigRC;
luaFiles = vimOptions.extraLuaFiles;
inherit (vimOptions) viAlias vimAlias withRuby withNodeJs withPython3;
inherit extraLuaPackages extraPython3Packages;
};
dummyInit = pkgs.writeText "nvf-init.lua" vimOptions.builtLuaConfigRC;
# Additional helper scripts for printing and displaying nvf configuration
# in your commandline.
printConfig = pkgs.writers.writeDashBin "nvf-print-config" "cat ${dummyInit}";
printConfigPath = pkgs.writers.writeDashBin "nvf-print-config-path" "echo -n ${dummyInit}";
# Expose wrapped neovim-package for userspace
# or module consumption.
neovim = pkgs.symlinkJoin {
name = "nvf-with-helpers";
paths = [neovim-wrapped printConfig printConfigPath];
postBuild = "echo Helpers added";
# Allow evaluating vimOptions, i.e., config.vim from the packages' passthru
# attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
# will return the configuration in full.
passthru.neovimConfig = vimOptions;
meta =
neovim-wrapped.meta
// {
description = "Wrapped Neovim package with helper scripts to print the config (path)";
};
};
in { in {
config.vim.build = { config = {
finalPackage = neovim; vim.startPlugins = map (x: x.package) (attrValues cfg.extraPlugins);
}; };
} }

2
modules/wrapper/build/default.nix
View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
./options.nix
./config.nix ./config.nix
./options.nix
]; ];
} }

146
modules/wrapper/build/options.nix
View file

@ -1,12 +1,144 @@
{lib, ...}: let {
inherit (lib.types) package; pkgs,
inherit (lib.options) mkOption; lib,
...
}: let
inherit (lib.options) mkOption mkEnableOption literalMD;
inherit (lib.types) package bool str listOf attrsOf;
inherit (lib.nvim.types) pluginsOpt extraPluginType;
in { in {
options.vim.build = { options.vim = {
finalPackage = mkOption { package = mkOption {
type = package; type = package;
readOnly = true; default = pkgs.neovim-unwrapped;
description = "final output package"; description = ''
The neovim package to use for the wrapper. This
corresponds to the package that will be wrapped
with your plugins and settings.
::: {.warning}
You will need to use an unwrapped package for this
option to work as intended. Using an already wrapped
package here may yield undesirable results.
:::
'';
};
viAlias = mkOption {
type = bool;
default = true;
description = "Enable the `vi` alias for `nvim`";
};
vimAlias = mkOption {
type = bool;
default = true;
description = "Enable the `vim` alias for `nvim`";
};
startPlugins = pluginsOpt {
default = ["plenary-nvim"];
example = ''
[pkgs.vimPlugins.telescope-nvim]
'';
description = ''
List of plugins to load on startup. This is used
internally to add plugins to Neovim's runtime.
To add additional plugins to your configuration, consider
using the [{option}`vim.extraPlugins`](#opt-vim.extraPlugins)
option.
'';
};
optPlugins = pluginsOpt {
default = [];
example = ''
[pkgs.vimPlugins.vim-ghost]
'';
description = ''
List of plugins to optionally load on startup.
This option has the same type definition as {option}`vim.startPlugins`
and plugins in this list are appended to {option}`vim.startPlugins` by
the wrapper during the build process.
To avoid overriding packages and dependencies provided by startPlugins, you
are recommended to use this option or {option}`vim.extraPlugins` option.
'';
};
extraPlugins = mkOption {
type = attrsOf extraPluginType;
default = {};
description = ''
A list of plugins and their configurations that will be
set up after builtin plugins.
This option takes a special type that allows you to order
your custom plugins using nvf's modified DAG library.
'';
example = literalMD ''
```nix
with pkgs.vimPlugins; {
aerial = {
package = aerial-nvim;
setup = "require('aerial').setup {}";
};
harpoon = {
package = harpoon;
setup = "require('harpoon').setup {}";
after = ["aerial"]; # place harpoon configuration after aerial
};
}
```
'';
};
extraPackages = mkOption {
type = listOf package;
default = [];
example = ''[pkgs.fzf pkgs.ripgrep]'';
description = ''
List of additional packages to make available to the Neovim
wrapper.
'';
};
# this defaults to `true` in the wrapper
# and since we pass this value to the wrapper
# with an inherit, it should be `true` here as well
withRuby =
mkEnableOption ''
Ruby support in the Neovim wrapper.
''
// {
default = true;
};
withNodeJs = mkEnableOption ''
NodeJs support in the Neovim wrapper
'';
luaPackages = mkOption {
type = listOf str;
default = [];
example = ''["magick" "serpent"]'';
description = "List of lua packages to install";
};
withPython3 = mkEnableOption ''
Python3 support in the Neovim wrapper
'';
python3Packages = mkOption {
type = listOf str;
default = [];
example = ''["pynvim"]'';
description = "List of python packages to install";
}; };
}; };
} }

13
modules/wrapper/environment/config.nix
View file

@ -1,13 +0,0 @@
{
config,
lib,
...
}: let
inherit (lib.attrsets) attrValues;
cfg = config.vim;
in {
config = {
vim.startPlugins = map (x: x.package) (attrValues cfg.extraPlugins);
};
}

6
modules/wrapper/environment/default.nix
View file

@ -1,6 +0,0 @@
{
imports = [
./config.nix
./options.nix
];
}

144
modules/wrapper/environment/options.nix
View file

@ -1,144 +0,0 @@
{
pkgs,
lib,
...
}: let
inherit (lib.options) mkOption mkEnableOption literalMD;
inherit (lib.types) package bool str listOf attrsOf;
inherit (lib.nvim.types) pluginsOpt extraPluginType;
in {
options.vim = {
package = mkOption {
type = package;
default = pkgs.neovim-unwrapped;
description = ''
The neovim package to use for the wrapper. This
corresponds to the package that will be wrapped
with your plugins and settings.
::: {.warning}
You will need to use an unwrapped package for this
option to work as intended. Using an already wrapped
package here may yield undesirable results.
:::
'';
};
viAlias = mkOption {
type = bool;
default = true;
description = "Enable the `vi` alias for `nvim`";
};
vimAlias = mkOption {
type = bool;
default = true;
description = "Enable the `vim` alias for `nvim`";
};
startPlugins = pluginsOpt {
default = ["plenary-nvim"];
example = ''
[pkgs.vimPlugins.telescope-nvim]
'';
description = ''
List of plugins to load on startup. This is used
internally to add plugins to Neovim's runtime.
To add additional plugins to your configuration, consider
using the [{option}`vim.extraPlugins`](#opt-vim.extraPlugins)
option.
'';
};
optPlugins = pluginsOpt {
default = [];
example = ''
[pkgs.vimPlugins.vim-ghost]
'';
description = ''
List of plugins to optionally load on startup.
This option has the same type definition as {option}`vim.startPlugins`
and plugins in this list are appended to {option}`vim.startPlugins` by
the wrapper during the build process.
To avoid overriding packages and dependencies provided by startPlugins, you
are recommended to use this option or {option}`vim.extraPlugins` option.
'';
};
extraPlugins = mkOption {
type = attrsOf extraPluginType;
default = {};
description = ''
A list of plugins and their configurations that will be
set up after builtin plugins.
This option takes a special type that allows you to order
your custom plugins using nvf's modified DAG library.
'';
example = literalMD ''
```nix
with pkgs.vimPlugins; {
aerial = {
package = aerial-nvim;
setup = "require('aerial').setup {}";
};
harpoon = {
package = harpoon;
setup = "require('harpoon').setup {}";
after = ["aerial"]; # place harpoon configuration after aerial
};
}
```
'';
};
extraPackages = mkOption {
type = listOf package;
default = [];
example = ''[pkgs.fzf pkgs.ripgrep]'';
description = ''
List of additional packages to make available to the Neovim
wrapper.
'';
};
# this defaults to `true` in the wrapper
# and since we pass this value to the wrapper
# with an inherit, it should be `true` here as well
withRuby =
mkEnableOption ''
Ruby support in the Neovim wrapper.
''
// {
default = true;
};
withNodeJs = mkEnableOption ''
NodeJs support in the Neovim wrapper
'';
luaPackages = mkOption {
type = listOf str;
default = [];
example = ''["magick" "serpent"]'';
description = "List of lua packages to install";
};
withPython3 = mkEnableOption ''
Python3 support in the Neovim wrapper
'';
python3Packages = mkOption {
type = listOf str;
default = [];
example = ''["pynvim"]'';
description = "List of python packages to install";
};
};
}

1
modules/wrapper/lazy/config.nix
View file

@ -76,7 +76,6 @@
else else
mkLuaInline '' mkLuaInline ''
function() function()
${optionalString (spec.beforeSetup != null) spec.beforeSetup}
${ ${
optionalString (spec.setupModule != null) optionalString (spec.setupModule != null)
"require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})" "require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"

9
modules/wrapper/lazy/lazy.nix
View file

@ -74,15 +74,6 @@
''; '';
}; };
beforeSetup = mkOption {
type = nullOr lines;
default = null;
description = ''
Lua code to run after the plugin is loaded, but before the setup
function is called.
'';
};
setupModule = mkOption { setupModule = mkOption {
type = nullOr str; type = nullOr str;
default = null; default = null;

48
modules/wrapper/rc/options.nix
View file

@ -143,14 +143,16 @@ in {
example = {"some_variable" = 42;}; example = {"some_variable" = 42;};
description = '' description = ''
A freeform attribute set containing global variable values for setting vim An attribute set containing global variable values
variables as early as possible. If populated, this option will set vim variables for storing vim variables as early as possible. If
in the built {option}`luaConfigRC` as the first item. populated, this option will set vim variables in the
built luaConfigRC as the first item.
::: {.note} ::: {.note}
`{foo = "bar";}` will set `vim.g.foo` to "bar", where the type of `bar` in the `{foo = "bar";}` will set `vim.g.foo` to "bar", where
resulting Lua value will be inferred from the type of the value in the the type of `bar` in the resulting Lua value will be
`{name = value;}` pair passed to the option. inferred from the type of the value in the `{name = value;}`
pair passed to the option.
::: :::
''; '';
}; };
@ -237,39 +239,21 @@ in {
else x; else x;
description = "Show the sign column"; description = "Show the sign column";
}; };
tabstop = mkOption {
type = int;
default = 8; # Neovim default
description = ''
Number of spaces that a `<Tab>` in the file counts for. Also see
the {command}`:retab` command, and the {option}`softtabstop` option.
'';
};
shiftwidth = mkOption {
type = int;
default = 8; # Neovim default
description = ''
Number of spaces to use for each step of (auto)indent. Used for
{option}`cindent`, `>>`, `<<`, etc.
When zero the {option}`tabstop` value will be used.
'';
};
}; };
}; };
example = {visualbell = true;}; example = {visualbell = true;};
description = '' description = ''
A freeform attribute set containing vim options to be set as early as possible. An attribute set containing vim options to be set
If populated, this option will set vim options in the built {option}`luaConfigRC` as early as possible. If populated, this option will
after `basic` and before `pluginConfigs` DAG entries. set vim options in the built luaConfigRC after `basic`
and before `pluginConfigs` DAG entries.
::: {.note} ::: {.note}
`{foo = "bar";}` will set `vim.o.foo` to "bar", where the type of `bar` in the `{foo = "bar";}` will set `vim.o.foo` to "bar", where
resulting Lua value will be inferred from the type of the value in the the type of `bar` in the resulting Lua value will be
`{name = value;}` pair passed to the option. inferred from the type of the value in the`{name = value;}`
pair passed to the option.
::: :::
''; '';
}; };

0
modules/wrapper/build/patches/flutter-tools.patch → patches/flutter-tools.patch
View file