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" name: "🐛 Bug Report"
description: "Submit a bug report to help us improve nvf" description: "Submit a bug report to help us improve"
title: "<short description of the bug>" #title: "[Bug] "
labels: [bug] labels: [bug]
body: body:
- type: checkboxes - type: checkboxes
id: no-duplicate-issues
attributes: attributes:
label: I have confirmed that this is a bug related to nvf label: "⚠️ Please verify that this bug has NOT been reported before."
description: >- description: "Search in the issues sections by clicking [HERE](https://github.com/notashelf/neovim-flake/issues?q=)"
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.
options: options:
- required: true - label: "I checked all existing issues and didn't find a similar issue"
label: >- required: true
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 - type: textarea
attributes: id: description
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: validations:
required: true required: false
- type: dropdown
attributes: attributes:
label: Installation Method label: "Description"
description: "How was nvf installed?" description: "You could also upload screenshots, if necessary"
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.
validations:
required: true
- type: textarea - type: textarea
id: steps-to-reproduce 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: validations:
required: true 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 - type: textarea
id: expected-behavior id: expected-behavior
validations:
required: true
attributes: attributes:
label: Expected behavior label: "👀 Expected behavior"
description: "What did you think would or should happen?" description: "What did you think would or should happen?"
placeholder: "..." placeholder: "..."
validations:
required: true
- type: textarea - type: textarea
id: actual-behavior id: actual-behavior
attributes:
label: Actual Behavior
description: "What actually happen?"
placeholder: "..."
validations: validations:
required: true required: true
attributes:
label: "😓 Actual Behavior"
description: "What actually happen?"
placeholder: "..."
- type: input - type: input
id: nix-metadata id: nix-metadata
attributes: attributes:
@ -98,32 +50,11 @@ body:
placeholder: '[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"' placeholder: '[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"'
validations: validations:
required: true 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 - type: textarea
id: logs id: logs
attributes: attributes:
render: bash
label: "📝 Relevant log output" label: "📝 Relevant log output"
description: >- description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. render: bash
> [!TIP]
> You can get your nvf configuration with `nvf-print-config` and attach it by using a service like termbin.com
validations: validations:
required: true required: true

View file

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

View file

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

View file

@ -3,7 +3,6 @@
in { in {
imports = [ imports = [
./gitsigns ./gitsigns
./hunk-nvim
./vim-fugitive ./vim-fugitive
./git-conflict ./git-conflict
./gitlinker-nvim ./gitlinker-nvim
@ -15,9 +14,7 @@ in {
git integration suite. git integration suite.
Enabling this option will enable the following plugins: Enabling this option will enable the following plugins:
* gitsigns * gitsigns
* hunk-nvim
* vim-fugitive * vim-fugitive
* git-conflict * git-conflict
* gitlinker-nvim * 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 = { 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 { write_to_disk = mkOption {
type = bool; type = bool;
default = false; default = false;

View file

@ -246,10 +246,10 @@ in {
transparent = { transparent = {
enabled = ${boolToString transparent}, enabled = ${boolToString transparent},
}, },
${optionalString (palette != null) ''palette = "${palette}",''} ${optionalString (!isNull palette) ''palette = "${palette}",''}
${optionalString (variant != null) ''variant = "${variant}",''} ${optionalString (!isNull variant) ''variant = "${variant}",''}
} }
${optionalString (background != null) ''vim.opt.background = "${background}"''} ${optionalString (!isNull background) ''vim.opt.background = "${background}"''}
vim.cmd.colorscheme "solarized" vim.cmd.colorscheme "solarized"
''; '';
styles = let styles = let
@ -281,23 +281,4 @@ in {
vim.cmd.colorscheme("solarized-osaka") 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; inherit (lib.nvim.dag) entryAnywhere;
cfg = config.vim.binds.whichKey; 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 { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {

View file

@ -442,22 +442,6 @@
"url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/eeb2b5a2e99e1646861a104f108c5818dd3973dc.tar.gz", "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/eeb2b5a2e99e1646861a104f108c5818dd3973dc.tar.gz",
"hash": "1l0xjis8jp5mf3v42f9xsjmwpjskf6zk6brpr8l39sp1bjn9z4x7" "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": { "fastaction-nvim": {
"type": "Git", "type": "Git",
"repository": { "repository": {
@ -692,22 +676,6 @@
"url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz", "url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
"hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa" "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": { "hydra-nvim": {
"type": "GitRelease", "type": "GitRelease",
"repository": { "repository": {