Compare commits

..

No commits in common. "b89ed914055ce246493eaf8cc33553ad25b9a64f" and "6b841d4b9725ff30dc87b8f1f8f6cf5d144751b9" have entirely different histories.

12 changed files with 48 additions and 211 deletions

View file

@ -1,95 +1,47 @@
name: "🐛 Bug Report"
description: "Submit a bug report to help us improve nvf"
title: "<short description of the bug>"
description: "Submit a bug report to help us improve"
#title: "[Bug] "
labels: [bug]
body:
- type: checkboxes
id: no-duplicate-issues
attributes:
label: I have confirmed that this is a bug related to nvf
description: >-
If you are unsure whether this is a bug, a packaging issue, or user error that is *not*
stemming from nvf, please consider creating a [discussion](https://github.com/notashelf/nvf/discussions)
post instead. Invalid bug reports will be closed without an explanation.
label: "⚠️ Please verify that this bug has NOT been reported before."
description: "Search in the issues sections by clicking [HERE](https://github.com/notashelf/neovim-flake/issues?q=)"
options:
- required: true
label: >-
This is a bug, and not an user error or a support request. I understand that my issue
will be closed if it is not a bug in nvf.
- required: true
label: >-
I have checked the [issues tab](https://github.com/notashelf/nvf/issues?q=is%3Aissue)
and confirmed that my issue has not yet been reported. I understand that my issue will
be closed if it is a duplicate.
- type: textarea
attributes:
label: Description
placeholder: "Describe the issue here..."
description: >-
Describe the issue in detail, with steps you have taken included. If applicable, please include
a minimal reproducible example, relevant Nix logs, comparisons with alternative commands and
screenshots. Do note that **logs** are preferred over screenshots.
validations:
- label: "I checked all existing issues and didn't find a similar issue"
required: true
- type: dropdown
attributes:
label: Installation Method
description: "How was nvf installed?"
options:
- NixOS Module (`nixosModules.default`)
- Home Manager Module (`homeManagerModules.default`)
- Standalone (flake outputs, `nix profile install`, etc.)
- Other
validations:
required: true
- type: textarea
attributes:
label: Installation Method (Other)
description: "If you have selected 'Other' in the previous section, please describe your installation method"
placeholder: >-
I installed nvf from...
- type: textarea
attributes:
label: nvf Version
description: "Which version of nvf are you using? If added as a flake input, write 'master'"
placeholder: >-
For example, v0.8 if consuming nvf from a tagged release.
id: description
validations:
required: true
required: false
attributes:
label: "Description"
description: "You could also upload screenshots, if necessary"
- type: textarea
id: steps-to-reproduce
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through the problem, step by step"
placeholder: >-
1. Do this
2. Do that
3. Observe
validations:
required: true
attributes:
label: "👟 Reproduction steps"
description: "How do you trigger this bug? Please walk us through the problem, step by step"
placeholder: "..."
- type: textarea
id: expected-behavior
validations:
required: true
attributes:
label: Expected behavior
label: "👀 Expected behavior"
description: "What did you think would or should happen?"
placeholder: "..."
validations:
required: true
- type: textarea
id: actual-behavior
attributes:
label: Actual Behavior
description: "What actually happen?"
placeholder: "..."
validations:
required: true
attributes:
label: "😓 Actual Behavior"
description: "What actually happen?"
placeholder: "..."
- type: input
id: nix-metadata
attributes:
@ -98,32 +50,11 @@ body:
placeholder: '[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"'
validations:
required: true
- type: textarea
attributes:
label: System Information
description: "Output of `nix-info --markdown`"
render: bash
placeholder: |-
'[user@system:~]$ nix-shell -p nix-info --run "nix-info --markdown"
- system:
- host os:
- multi-user?:
- sandbox:
- version:
- nixpkgs:
validations:
required: true
- type: textarea
id: logs
attributes:
render: bash
label: "📝 Relevant log output"
description: >-
Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
> [!TIP]
> You can get your nvf configuration with `nvf-print-config` and attach it by using a service like termbin.com
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: bash
validations:
required: true

View file

@ -36,7 +36,6 @@
[yazi.nvim]: https://github.com/mikavilpas/yazi.nvim
[snacks.nvim]: https://github.com/folke/snacks.nvim
[oil.nvim]: https://github.com/stevearc/oil.nvim
[hunk.nvim]: https://github.com/julienvincent/hunk.nvim
- Add [typst-preview.nvim] under
`languages.typst.extensions.typst-preview-nvim`.
@ -105,8 +104,6 @@
relevant packages in a simple UI.
- This deprecates `vim.useSystemClipboard` as well, see breaking changes
section above for migration options.
- Add [hunk.nvim], Neovim plugin & tool for splitting diffs in Neovim. Available
as `vim.git.hunk-nvim`
[amadaluzia](https://github.com/amadaluzia):
@ -385,10 +382,7 @@
[poz](https://poz.pet):
[everforest]: https://github.com/sainnhe/everforest
- Fix gitsigns null-ls issue.
- Add [everforest] theme support.
[Haskex](https://github.com/haskex):
@ -446,21 +440,19 @@
[neogit]: https://github.com/NeogitOrg/neogit
- Add [solarized.nvim] theme with support for multiple variants
- Add [smart-splits.nvim] for navigating between Neovim windows and terminal
multiplexer panes. Available at `vim.utility.smart-splits`.
- Restore vim-dirtytalk plugin and fix ordering with spellcheck in generated
config.
- Add [smart-splits.nvim] for navigating between Neovim windows and terminal multiplexer panes.
Available at `vim.utility.smart-splits`.
- Restore vim-dirtytalk plugin and fix ordering with spellcheck in generated config.
- Fix lualine separator options
- Add [neogit], an interactive and powerful Git interface for Neovim, inspired
by Magit
- Add [neogit], an interactive and powerful Git interface for Neovim, inspired by Magit
- Allow deregistering which-key binds or groups by setting them to `null`
[justDeeevin](https://github.com/justDeeevin):
[supermaven-nvim]: https://github.com/supermaven-inc/supermaven-nvim
- Add [supermaven-nvim] plugin in `vim.assistant.supermaven-nvim` with `enable`
and `setupOpts`
- Add [supermaven-nvim] plugin in `vim.assistant.supermaven-nvim` with `enable` and
`setupOpts`
[trueNAHO](https://github.com/trueNAHO):
@ -468,10 +460,9 @@
download size.
- `flake-utils`'s `systems` inputs follows nvf's `systems` input to transitively
leverage the pattern introduced in commit
[fc8206e7a61d ("flake: utilize
nix-systems for overridable flake systems")](https://github.com/NotAShelf/nvf/commit/fc8206e7a61d7eb02006f9010e62ebdb3336d0d2).
leverage the pattern introduced in commit [fc8206e7a61d ("flake: utilize
nix-systems for overridable flake systems")](
https://github.com/NotAShelf/nvf/commit/fc8206e7a61d7eb02006f9010e62ebdb3336d0d2).
[soliprem](https://github.com/soliprem):
- fix broken `neorg` grammars

View file

@ -88,7 +88,7 @@
in {
options.vim = {
diagnostics = {
enable = mkEnableOption "diagnostics module for Neovim";
enable = mkEnableOption "diagostics module for Neovim";
config = mkOption {
type = diagnosticsSubmodule;
default = {};

View file

@ -3,7 +3,6 @@
in {
imports = [
./gitsigns
./hunk-nvim
./vim-fugitive
./git-conflict
./gitlinker-nvim
@ -15,9 +14,7 @@ in {
git integration suite.
Enabling this option will enable the following plugins:
* gitsigns
* hunk-nvim
* vim-fugitive
* git-conflict
* gitlinker-nvim

View file

@ -1,21 +0,0 @@
{
config,
lib,
...
}: let
inherit (lib.modules) mkIf;
cfg = config.vim.git.hunk-nvim;
in {
config = mkIf cfg.enable {
vim = {
lazy.plugins = {
"hunk-nvim" = {
package = "hunk-nvim";
setupModule = "gitlinker";
inherit (cfg) setupOpts;
};
};
};
};
}

View file

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

View file

@ -1,13 +0,0 @@
{
config,
lib,
...
}: let
inherit (lib.options) mkEnableOption;
inherit (lib.nvim.types) mkPluginSetupOption;
in {
options.vim.git.hunk-nvim = {
enable = mkEnableOption "tool for splitting diffs in Neovim [hunk-nvim]" // {default = config.vim.git.enable;};
setupOpts = mkPluginSetupOption "hunk-nvim" {};
};
}

View file

@ -25,6 +25,15 @@ in {
};
};
buffers = {
set_filetype = mkOption {
type = bool;
default = false;
description = ''
if set to true, the filetype of the otterbuffers will be set. Other wide only
the autocommand of lspconfig that attaches the language server will be
executed without setting the filetype
'';
};
write_to_disk = mkOption {
type = bool;
default = false;

View file

@ -246,10 +246,10 @@ in {
transparent = {
enabled = ${boolToString transparent},
},
${optionalString (palette != null) ''palette = "${palette}",''}
${optionalString (variant != null) ''variant = "${variant}",''}
${optionalString (!isNull palette) ''palette = "${palette}",''}
${optionalString (!isNull variant) ''variant = "${variant}",''}
}
${optionalString (background != null) ''vim.opt.background = "${background}"''}
${optionalString (!isNull background) ''vim.opt.background = "${background}"''}
vim.cmd.colorscheme "solarized"
'';
styles = let
@ -281,23 +281,4 @@ in {
vim.cmd.colorscheme("solarized-osaka")
'';
};
everforest = {
setup = {
style ? "medium",
transparent ? false,
...
}: ''
vim.g.everforest_background = "${style}"
vim.g.everforest_transparent_background = ${
if transparent
then "1"
else "0"
}
vim.cmd.colorscheme("everforest")
'';
styles = ["hard" "medium" "soft"];
};
}

View file

@ -10,7 +10,7 @@
inherit (lib.nvim.dag) entryAnywhere;
cfg = config.vim.binds.whichKey;
register = mapAttrsToList (n: v: lib.lists.optional (v != null) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register;
register = mapAttrsToList (n: v: lib.lists.optional (! isNull v) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register;
in {
config = mkIf cfg.enable {
vim = {

View file

@ -442,22 +442,6 @@
"url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/eeb2b5a2e99e1646861a104f108c5818dd3973dc.tar.gz",
"hash": "1l0xjis8jp5mf3v42f9xsjmwpjskf6zk6brpr8l39sp1bjn9z4x7"
},
"everforest": {
"type": "GitRelease",
"repository": {
"type": "GitHub",
"owner": "sainnhe",
"repo": "everforest"
},
"pre_releases": false,
"version_upper_bound": null,
"release_prefix": null,
"submodules": false,
"version": "v0.3.0",
"revision": "1e625639362661972821e83d8bbe528b8981a05f",
"url": "https://api.github.com/repos/sainnhe/everforest/tarball/v0.3.0",
"hash": "18h7mwr9lpsdsdi90vn4nc868g50li27xvylrs2srppfjr7kvl7w"
},
"fastaction-nvim": {
"type": "Git",
"repository": {
@ -692,22 +676,6 @@
"url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
"hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
},
"hunk-nvim": {
"type": "GitRelease",
"repository": {
"type": "GitHub",
"owner": "julienvincent",
"repo": "hunk.nvim"
},
"pre_releases": false,
"version_upper_bound": null,
"release_prefix": null,
"submodules": false,
"version": "v1.8.0",
"revision": "1e0a4d719c780bb8b0690a54915601508ced321e",
"url": "https://api.github.com/repos/julienvincent/hunk.nvim/tarball/v1.8.0",
"hash": "036cwnswx36m048mvlwa8rr9baclf7lrgjlq065pb4w13c4drbmx"
},
"hydra-nvim": {
"type": "GitRelease",
"repository": {