From ae3340f2d1ea173cf8946d5657c25fb20f25bea6 Mon Sep 17 00:00:00 2001 From: tomasguinzburg Date: Fri, 17 Jan 2025 09:54:51 +0100 Subject: [PATCH 1/4] feat: add nord theme added nord theme from github.com/gbprod/nord.nvim fixed a typo --- docs/release-notes/rl-0.8.md | 2 ++ flake.lock | 17 +++++++++++++++++ flake.nix | 7 ++++++- .../statusline/lualine/supported_themes.nix | 1 + modules/plugins/theme/supported-themes.nix | 10 ++++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index edb3e7b3..465bf5c9 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -62,8 +62,10 @@ [tomasguinzburg](https://github.com/tomasguinzburg): [solargraph]: https://github.com/castwide/solargraph +[gbprod/nord.nvim]: https://github.com/gbprod/nord.nvim - Add Ruby support under `vim.languages.ruby` using [solargraph]. +- Add `nord` theme from [gbprod/nord.nvim]. [thamenato](https://github.com/thamenato): diff --git a/flake.lock b/flake.lock index da38b967..918b0ce1 100644 --- a/flake.lock +++ b/flake.lock @@ -1097,6 +1097,22 @@ "type": "github" } }, + "plugin-nord": { + "flake": false, + "locked": { + "lastModified": 1737019140, + "narHash": "sha256-ZhDS7Y90DKp+jkUqcoQRf/zHy4DVgSDQXrnl3sBYJXs=", + "owner": "gbprod", + "repo": "nord.nvim", + "rev": "b0f3ed242fd8e5bafa7231367821d46c6c835dd8", + "type": "github" + }, + "original": { + "owner": "gbprod", + "repo": "nord.nvim", + "type": "github" + } + }, "plugin-nui-nvim": { "flake": false, "locked": { @@ -2142,6 +2158,7 @@ "plugin-new-file-template-nvim": "plugin-new-file-template-nvim", "plugin-noice-nvim": "plugin-noice-nvim", "plugin-none-ls": "plugin-none-ls", + "plugin-nord": "plugin-nord", "plugin-nui-nvim": "plugin-nui-nvim", "plugin-nvim-autopairs": "plugin-nvim-autopairs", "plugin-nvim-bufferline-lua": "plugin-nvim-bufferline-lua", diff --git a/flake.nix b/flake.nix index 89690cad..02ceb667 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ self, ... } @ inputs: let - # call the extedended library with `inputs` + # call the extended library with `inputs` # inputs is used to get the original standard library, and to pass inputs to the plugin autodiscovery function lib = import ./lib/stdlib-extended.nix inputs; in @@ -419,6 +419,11 @@ flake = false; }; + plugin-nord = { + url = "github:gbprod/nord.nvim"; + flake = false; + }; + # Rust crates plugin-crates-nvim = { url = "github:Saecki/crates.nvim"; diff --git a/modules/plugins/statusline/lualine/supported_themes.nix b/modules/plugins/statusline/lualine/supported_themes.nix index b00fe82b..3528b24f 100644 --- a/modules/plugins/statusline/lualine/supported_themes.nix +++ b/modules/plugins/statusline/lualine/supported_themes.nix @@ -4,4 +4,5 @@ "catppuccin" "oxocarbon" "gruvbox" + "nord" ] diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix index e185eb0d..cf72024a 100644 --- a/modules/plugins/theme/supported-themes.nix +++ b/modules/plugins/theme/supported-themes.nix @@ -177,4 +177,14 @@ in { ''; styles = ["main" "moon" "dawn"]; }; + nord = { + setup = {transparent ? false, ...}: '' + require("nord").setup({ + transparent = ${boolToString transparent}, + search = "vscode", -- [vim|vscode] + }) + + vim.cmd.colorscheme("nord") + ''; + }; } From e7649d1ec546b4dad1c1ef7a1e3f28b4a9b4551e Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 18 Jan 2025 20:45:47 +0300 Subject: [PATCH 2/4] meta: remove stale donation links --- .github/FUNDING.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 739d2d2c..97a82378 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1 @@ github: NotAShelf -ko_fi: NotAShelf -liberapay: NotAShelf - From 420082852636b812c9e9c6bdd4b6ecdc072030b6 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 18 Jan 2025 20:19:08 +0300 Subject: [PATCH 3/4] languages/nix: remove hardcoded indentation options --- modules/plugins/languages/nix.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 1120633c..4056a415 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -187,17 +187,6 @@ in { ''; } ]; - vim.pluginRC.nix = '' - vim.api.nvim_create_autocmd("FileType", { - pattern = "nix", - callback = function(opts) - local bo = vim.bo[opts.buf] - bo.tabstop = 2 - bo.shiftwidth = 2 - bo.softtabstop = 2 - end - }) - ''; } (mkIf cfg.treesitter.enable { From 7d0c56d74cd1ecbc5e01d14d81941708619e1aed Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 18 Jan 2025 20:20:15 +0300 Subject: [PATCH 4/4] docs: update v0.8 release notes --- docs/release-notes/rl-0.8.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 465bf5c9..e854eebc 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -26,6 +26,11 @@ - Deprecate rnix-lsp as it has been abandoned and archived upstream. +- Hardcoded indentation values for the Nix language module have been removed. To + replicate previous behaviour, you must either consolidate Nix indentation in + your Editorconfig configuration, or use an autocommand to set indentation + values for buffers with the Nix filetype. + [amadaluzia](https://github.com/amadaluzia): [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim