Compare commits

...

8 commits

Author SHA1 Message Date
6f1293053c
docs: update v0.8 release notes
Some checks failed
Check for typos in the source tree / check-typos (push) Has been cancelled
2025-01-10 10:45:34 +03:00
8448a6ca0f
wrapper/rc: change vim.options.mouse to a string type
As the mouse option in neovim allows combining those values.
2025-01-10 10:36:01 +03:00
raf
dab409685d
Merge branch 'main' into more-option-stuff 2025-01-10 10:08:34 +03:00
Artur Manuel
ea056532bc
languages/haskell: specify lsp flag (#540)
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Set up binary cache / cachix (maximal) (push) Waiting to run
Set up binary cache / cachix (nix) (push) Waiting to run
Validate flake & check formatting / Validate Flake (push) Waiting to run
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Build and deploy documentation / Check latest commit (push) Waiting to run
Build and deploy documentation / publish (push) Blocked by required conditions
Check for typos in the source tree / check-typos (push) Waiting to run
Co-authored-by: Artur Manuel <balkenix@outlook.com>
2025-01-09 15:28:13 +03:00
Ching Pei Yang
a26cdd2d25
ui/nvim-ufo: init (#537)
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Set up binary cache / cachix (maximal) (push) Waiting to run
Set up binary cache / cachix (nix) (push) Waiting to run
Validate flake & check documentation / Validate Flake Documentation (docs) (push) Waiting to run
Validate flake & check documentation / Validate Flake Documentation (docs-html) (push) Waiting to run
Validate flake & check documentation / Validate Flake Documentation (docs-json) (push) Waiting to run
Validate flake & check documentation / Validate Flake Documentation (docs-manpages) (push) Waiting to run
Validate flake & check documentation / Validate hyperlinks in documentation sources (push) Waiting to run
Validate flake & check formatting / Validate Flake (push) Waiting to run
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Build and deploy documentation / Check latest commit (push) Waiting to run
Build and deploy documentation / publish (push) Blocked by required conditions
Check for typos in the source tree / check-typos (push) Waiting to run
* flake: add nvim-ufo

* ui/nvim-ufo: init

* docs: update relase notes
2025-01-09 07:56:51 +00:00
raf
ab49ba443d
Merge pull request #539 from NotAShelf/flutter-fix
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Set up binary cache / cachix (maximal) (push) Waiting to run
Set up binary cache / cachix (nix) (push) Waiting to run
Validate flake & check formatting / Validate Flake (push) Waiting to run
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Build and deploy documentation / Check latest commit (push) Waiting to run
Build and deploy documentation / publish (push) Blocked by required conditions
Check for typos in the source tree / check-typos (push) Waiting to run
wrapper/build: disable failing require hook checks for flutter-tools
2025-01-08 21:45:23 +03:00
7dbe7a08b3
wrapper/build: disable failing require hook checks for flutter-tools 2025-01-08 21:13:09 +03:00
aa7b55fa49
docs: liberapay URL for @horriblename
Some checks failed
Check for typos in the source tree / check-typos (push) Has been cancelled
2025-01-07 06:10:15 +03:00
13 changed files with 131 additions and 21 deletions

28
.github/README.md vendored
View file

@ -210,12 +210,16 @@ features.
Alongside myself, nvf is developed by those talented folk: Alongside myself, nvf is developed by those talented folk:
- [**@horriblename**](https://github.com/horriblename) - For actively - [**@horriblename**](https://github.com/horriblename)
implementing planned features and quality of life updates. ([Liberapay](https://liberapay.com/horriblename/))- For actively implementing
planned features and quality of life updates.
- [**@Diniamo**](https://github.com/Diniamo) - [**@Diniamo**](https://github.com/Diniamo)
([Liberapay](https://en.liberapay.com/diniamo/)) - For actively submitting ([Liberapay](https://en.liberapay.com/diniamo/)) - For actively submitting
pull requests, issues and assistance with maintenance of nvf. pull requests, issues and assistance with maintenance of nvf.
Please do remember to extend your thanks (financially or otherwise) if this
project has been helpful to you.
### Contributors ### Contributors
[mnw]: https://github.com/gerg-l/mnw [mnw]: https://github.com/gerg-l/mnw
@ -245,17 +249,17 @@ This configuration borrows from and is based on a few other configurations,
including: including:
- [@jordanisaacs's](https://github.com/jordanisaacs) - [@jordanisaacs's](https://github.com/jordanisaacs)
[neovim-flake](https://github.com/jordanisaacs/neovim-flake) that this flake [**neovim-flake**](https://github.com/jordanisaacs/neovim-flake) that this
is originally based on. flake is originally based on.
- [@sioodmy's](https://github.com/sioodmy)
[dotfiles](https://github.com/sioodmy/dotfiles) that inspired the design
choices for UI and plugin defaults.
- [@wiltaylor's](https://github.com/wiltaylor) - [@wiltaylor's](https://github.com/wiltaylor)
[neovim-flake](https://github.com/wiltaylor/neovim-flake) for plugin and [neovim-flake](https://github.com/wiltaylor/neovim-flake) for plugin and
design ideas. design ideas.
- [@gvolpe's](https://github.com/gvolpe) - [@gvolpe's](https://github.com/gvolpe)
[neovim-flake](https://github.com/gvolpe/neovim-flake) for plugin, design and [neovim-flake](https://github.com/gvolpe/neovim-flake) for plugin, design and
nix concepts. nix concepts.
- [@sioodmy's](https://github.com/sioodmy)
[dotfiles](https://github.com/sioodmy/dotfiles) that inspired the design
choices for UI and plugin defaults.
I am grateful for their previous work and inspiration, and I wholeheartedly I am grateful for their previous work and inspiration, and I wholeheartedly
recommend checking their work out. recommend checking their work out.
@ -263,12 +267,12 @@ recommend checking their work out.
## License ## License
Following the license of the Following the license of
[original neovim-flake](https://github.com/jordanisaacs/neovim-flake), nvf has [the original neovim-flake](https://github.com/jordanisaacs/neovim-flake), nvf
been made available under the [**MIT License**](LICENSE). However, all assets has been made available under the [**MIT License**](LICENSE). However, all
and documentation are published under the assets and documentation are published under the
[**CC BY License**](https://github.com/NotAShelf/nvf/blob/main/.github/assets/LICENSE) [**CC BY License**](https://github.com/NotAShelf/nvf/blob/main/.github/assets/LICENSE)
under explicit permission by the artist. under explicit permission by the author or authors.
<h6 align="center">Yes, this includes the logo work too. Stop taking artwork that is not yours!</h6> <h6 align="center">Yes, this includes the logo work too. Stop taking artwork that is not yours!</h6>

View file

@ -334,9 +334,6 @@ The changes are, in no particular order:
`vim.options` as default values. Some are left as they don't have a direct `vim.options` as default values. Some are left as they don't have a direct
equivalent, but expect a switch eventually. equivalent, but expect a switch eventually.
- Deprecated `vim.enableEditorconfig` in favor of
[](#opt-vim.globals.editorconfig).
[ppenguin](https://github.com/ppenguin): [ppenguin](https://github.com/ppenguin):
- Telescope: - Telescope:

View file

@ -16,6 +16,14 @@
- Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table - Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
in gitsigns configuration. in gitsigns configuration.
- [](#opt-vim.options.mouse) no longer compares values to an enum of available
mouse modes. This means you can provide any string without the module system
warning you that it is invalid. Do keep in mind that this value is no longer
checked, so you will be responsible for ensuring its validity.
- Deprecated `vim.enableEditorconfig` in favor of
[](#opt-vim.globals.editorconfig).
[amadaluzia](https://github.com/amadaluzia): [amadaluzia](https://github.com/amadaluzia):
[haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
@ -32,5 +40,7 @@
[horriblename](https://github.com/horriblename): [horriblename](https://github.com/horriblename):
[aerial.nvim](https://github.com/stevearc/aerial.nvim) [aerial.nvim](https://github.com/stevearc/aerial.nvim)
[nvim-ufo](https://github.com/kevinhwang91/nvim-ufo)
- Add [aerial.nvim] - Add [aerial.nvim]
- Add [nvim-ufo]

34
flake.lock generated
View file

@ -1518,6 +1518,22 @@
"type": "github" "type": "github"
} }
}, },
"plugin-nvim-ufo": {
"flake": false,
"locked": {
"lastModified": 1735147722,
"narHash": "sha256-etyfm4KpwjYN+kkotOMl0LgbQniILmqMqab4acMtTlw=",
"owner": "kevinhwang91",
"repo": "nvim-ufo",
"rev": "32cb247b893a384f1888b9cd737264159ecf183c",
"type": "github"
},
"original": {
"owner": "kevinhwang91",
"repo": "nvim-ufo",
"type": "github"
}
},
"plugin-nvim-web-devicons": { "plugin-nvim-web-devicons": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1694,6 +1710,22 @@
"type": "github" "type": "github"
} }
}, },
"plugin-promise-async": {
"flake": false,
"locked": {
"lastModified": 1722813441,
"narHash": "sha256-9eM66brPjiFlY64vmBetRYrKnpDyN7+/URMm4GsGimA=",
"owner": "kevinhwang91",
"repo": "promise-async",
"rev": "119e8961014c9bfaf1487bf3c2a393d254f337e2",
"type": "github"
},
"original": {
"owner": "kevinhwang91",
"repo": "promise-async",
"type": "github"
}
},
"plugin-registers": { "plugin-registers": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -2191,6 +2223,7 @@
"plugin-nvim-tree-lua": "plugin-nvim-tree-lua", "plugin-nvim-tree-lua": "plugin-nvim-tree-lua",
"plugin-nvim-treesitter-context": "plugin-nvim-treesitter-context", "plugin-nvim-treesitter-context": "plugin-nvim-treesitter-context",
"plugin-nvim-ts-autotag": "plugin-nvim-ts-autotag", "plugin-nvim-ts-autotag": "plugin-nvim-ts-autotag",
"plugin-nvim-ufo": "plugin-nvim-ufo",
"plugin-nvim-web-devicons": "plugin-nvim-web-devicons", "plugin-nvim-web-devicons": "plugin-nvim-web-devicons",
"plugin-obsidian-nvim": "plugin-obsidian-nvim", "plugin-obsidian-nvim": "plugin-obsidian-nvim",
"plugin-omnisharp-extended": "plugin-omnisharp-extended", "plugin-omnisharp-extended": "plugin-omnisharp-extended",
@ -2202,6 +2235,7 @@
"plugin-plenary-nvim": "plugin-plenary-nvim", "plugin-plenary-nvim": "plugin-plenary-nvim",
"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-promise-async": "plugin-promise-async",
"plugin-registers": "plugin-registers", "plugin-registers": "plugin-registers",
"plugin-render-markdown-nvim": "plugin-render-markdown-nvim", "plugin-render-markdown-nvim": "plugin-render-markdown-nvim",
"plugin-rose-pine": "plugin-rose-pine", "plugin-rose-pine": "plugin-rose-pine",

View file

@ -720,6 +720,16 @@
flake = false; flake = false;
}; };
plugin-promise-async = {
url = "github:kevinhwang91/promise-async";
flake = false;
};
plugin-nvim-ufo = {
url = "github:kevinhwang91/nvim-ufo";
flake = false;
};
plugin-new-file-template-nvim = { plugin-new-file-template-nvim = {
# (required by new-file-template.nvim) # (required by new-file-template.nvim)
url = "github:otavioschwanck/new-file-template.nvim"; url = "github:otavioschwanck/new-file-template.nvim";

View file

@ -130,7 +130,6 @@ in {
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.lspconfig.enable = true;
vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig; vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
}) })

View file

@ -71,7 +71,7 @@ in {
cmd = ${ cmd = ${
if isList cfg.lsp.package if isList cfg.lsp.package
then expToLua cfg.lsp.package then expToLua cfg.lsp.package
else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper"}'' else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper", "--lsp"}''
}, },
on_attach = function(client, bufnr, ht) on_attach = function(client, bufnr, ht)
default_on_attach(client, bufnr, ht) default_on_attach(client, bufnr, ht)

View file

@ -2,6 +2,7 @@
imports = [ imports = [
./noice ./noice
./modes ./modes
./nvim-ufo
./notifications ./notifications
./smartcolumn ./smartcolumn
./colorizer ./colorizer

View file

@ -0,0 +1,20 @@
{
lib,
config,
...
}: let
inherit (lib.modules) mkIf;
cfg = config.vim.ui.nvim-ufo;
in {
config = mkIf cfg.enable {
vim = {
startPlugins = ["promise-async"];
lazy.plugins.nvim-ufo = {
package = "nvim-ufo";
setupModule = "ufo";
inherit (cfg) setupOpts;
};
};
};
}

View file

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

View file

@ -0,0 +1,9 @@
{lib, ...}: let
inherit (lib.options) mkEnableOption;
inherit (lib.nvim.types) mkPluginSetupOption;
in {
options.vim.ui.nvim-ufo = {
enable = mkEnableOption "nvim-ufo";
setupOpts = mkPluginSetupOption "nvim-ufo" {};
};
}

View file

@ -49,6 +49,17 @@
flutter-tools-patched = buildPlug { flutter-tools-patched = buildPlug {
pname = "flutter-tools"; pname = "flutter-tools";
patches = [./patches/flutter-tools.patch]; patches = [./patches/flutter-tools.patch];
# Disable failing require check hook checks
nvimSkipModule = [
"flutter-tools.devices"
"flutter-tools.dap"
"flutter-tools.runners.job_runner"
"flutter-tools.decorations"
"flutter-tools.commands"
"flutter-tools.executable"
"flutter-tools.dev_tools"
];
}; };
}; };

View file

@ -167,16 +167,25 @@ in {
}; };
mouse = mkOption { mouse = mkOption {
type = enum ["a" "n" "v" "i" "c"]; type = str;
default = "a"; default = "nvi";
example = "a";
description = '' description = ''
Set modes for mouse support. Set modes for mouse support.
* a - all
* n - normal * n - normal
* v - visual * v - visual
* i - insert * i - insert
* c - command * c - command-line
* h - all modes when editing a help file
* a - all modes
* r - for hit-enter and more-prompt prompt
[neovim documentation]: https://neovim.io/doc/user/options.html#'mouse'"
This option takes a string to ensure proper conversion to the corresponding Lua type.
As such, we do not check the value passed to this option. Please ensure that any value
that is set here is a valid value as per [neovim documentation].
''; '';
}; };