From 3dcd8c796e66c76576b32e95b4ad659e844a362a Mon Sep 17 00:00:00 2001 From: haskex Date: Wed, 14 May 2025 22:01:05 -0300 Subject: [PATCH 1/9] themes/solarized-osaka: init --- modules/plugins/theme/supported-themes.nix | 13 +++++++++++++ npins/sources.json | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix index 2b427871..9c5e380c 100644 --- a/modules/plugins/theme/supported-themes.nix +++ b/modules/plugins/theme/supported-themes.nix @@ -212,4 +212,17 @@ in { ''; styles = ["dark" "light" "dark_dimmed" "dark_default" "light_default" "dark_high_contrast" "light_high_contrast" "dark_colorblind" "light_colorblind" "dark_tritanopia" "light_tritanopia"]; }; + solarized-osaka = { + setup = {transparent ? false, ...}: '' + require("solarized-osaka").setup({ + transparent = ${boolToString transparent}, + styles = { + comments = { italic = false }, + keywords = { italic = false }, + } + }) + + vim.cmd.colorscheme("solarized-osaka") + ''; + }; } diff --git a/npins/sources.json b/npins/sources.json index 6f74e256..5b2245d0 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -2225,6 +2225,19 @@ "url": "https://api.github.com/repos/folke/snacks.nvim/tarball/v2.22.0", "hash": "1hbm4fnw51qdp0nz83fcxbvnxjq2k57a37w6dp0wz6wkcx7cwxw9" }, + "solarized-osaka": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "craftzdog", + "repo": "solarized-osaka.nvim" + }, + "branch": "main", + "submodules": false, + "revision": "f796014c14b1910e08d42cc2077fef34f08e0295", + "url": "https://github.com/craftzdog/solarized-osaka.nvim/archive/f796014c14b1910e08d42cc2077fef34f08e0295.tar.gz", + "hash": "0jy2hk4fc210jih30ybvisr9pliya1s3nazw4d131vh5k4p1xqi6" + }, "sqls-nvim": { "type": "Git", "repository": { From fde3dfbabdecbb2638c38336e3f5b57536d995e9 Mon Sep 17 00:00:00 2001 From: haskex Date: Thu, 15 May 2025 10:07:31 -0300 Subject: [PATCH 2/9] Adding changelog, and test again --- docs/release-notes/rl-0.8.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index f55b847c..17f024b4 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -392,3 +392,9 @@ - Add `rubylsp` option in `vim.languages.ruby.lsp.server` to use shopify's ruby-lsp language server + +[Haskex](https://github.com/haskex): + +[solarized-osaka.nvim]: https://github.com/craftzdog/solarized-osaka.nvim + +- Add [solarized-osaka.nvim] theme From d8ac181663820771484fe6a6e7d2e17994060f6f Mon Sep 17 00:00:00 2001 From: Horu <73709188+HigherOrderLogic@users.noreply.github.com> Date: Fri, 16 May 2025 18:38:53 +1000 Subject: [PATCH 3/9] docs: fix info block --- docs/manual/try-it-out.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/try-it-out.md b/docs/manual/try-it-out.md index 8714be80..5f326b15 100644 --- a/docs/manual/try-it-out.md +++ b/docs/manual/try-it-out.md @@ -28,7 +28,7 @@ $ nix run github:notashelf/nvf#maximal ### Available Configurations {#sec-available-configs} -:::{.info} +::: {.info} The below configurations are provided for demonstration purposes, and are **not** designed to be installed as is. You may From 32b9694840fc96a81b5e7964f23a73f6a1406e70 Mon Sep 17 00:00:00 2001 From: haskex Date: Fri, 16 May 2025 11:44:02 -0300 Subject: [PATCH 4/9] utility/img-clip: init --- .../plugins/utility/binds/hardtime/config.nix | 2 +- .../utility/images/img-clip/config.nix | 23 +++++++++++++++++++ .../utility/images/img-clip/default.nix | 6 +++++ .../utility/images/img-clip/img-clip.nix | 11 +++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 modules/plugins/utility/images/img-clip/config.nix create mode 100644 modules/plugins/utility/images/img-clip/default.nix create mode 100644 modules/plugins/utility/images/img-clip/img-clip.nix diff --git a/modules/plugins/utility/binds/hardtime/config.nix b/modules/plugins/utility/binds/hardtime/config.nix index e8c315ef..66b1f063 100644 --- a/modules/plugins/utility/binds/hardtime/config.nix +++ b/modules/plugins/utility/binds/hardtime/config.nix @@ -14,7 +14,7 @@ in { startPlugins = ["hardtime-nvim"]; pluginRC.hardtime = entryAnywhere '' - require("hardtime").setup (${toLuaObject cfg.setupOpts}) + require("hardtime").setup(${toLuaObject cfg.setupOpts}) ''; }; }; diff --git a/modules/plugins/utility/images/img-clip/config.nix b/modules/plugins/utility/images/img-clip/config.nix new file mode 100644 index 00000000..cadd815f --- /dev/null +++ b/modules/plugins/utility/images/img-clip/config.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.utility.images.img-clip; +in { + config = mkIf cfg.enable { + vim = { + startPlugins = [ + "img-clip" + ]; + + pluginRC.image-nvim = entryAnywhere '' + require("img-clip").setup(${toLuaObject cfg.setupOpts}) + ''; + }; + }; +} diff --git a/modules/plugins/utility/images/img-clip/default.nix b/modules/plugins/utility/images/img-clip/default.nix new file mode 100644 index 00000000..70c15604 --- /dev/null +++ b/modules/plugins/utility/images/img-clip/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./config.nix + ./img-clip.nix + ]; +} diff --git a/modules/plugins/utility/images/img-clip/img-clip.nix b/modules/plugins/utility/images/img-clip/img-clip.nix new file mode 100644 index 00000000..ce07feae --- /dev/null +++ b/modules/plugins/utility/images/img-clip/img-clip.nix @@ -0,0 +1,11 @@ +{lib, ...}: let + inherit (lib.options) mkEnableOption; + + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.utility.images.img-clip = { + enable = mkEnableOption "img-clip to paste images into any markup language"; + + setupOpts = mkPluginSetupOption "img-clip" {}; + }; +} From 62cd4154a24e385db9c0e1e3dfeb8cfb2c75834c Mon Sep 17 00:00:00 2001 From: haskex Date: Fri, 16 May 2025 19:42:21 -0300 Subject: [PATCH 5/9] Tested and able to merge --- configuration.nix | 1 + docs/release-notes/rl-0.8.md | 8 ++++++++ modules/plugins/utility/images/default.nix | 1 + npins/sources.json | 14 ++++++++++++++ 4 files changed, 24 insertions(+) diff --git a/configuration.nix b/configuration.nix index 6e3175ef..dee5001f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -199,6 +199,7 @@ isMaximal: { }; images = { image-nvim.enable = false; + img-clip.enable = isMaximal; }; }; diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index f55b847c..e635ebce 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -392,3 +392,11 @@ - Add `rubylsp` option in `vim.languages.ruby.lsp.server` to use shopify's ruby-lsp language server + +[Haskex](https://github.com/haskex): + +[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim + +- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and + `setupOpts` +- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix diff --git a/modules/plugins/utility/images/default.nix b/modules/plugins/utility/images/default.nix index 5b876e0a..1f398aa8 100644 --- a/modules/plugins/utility/images/default.nix +++ b/modules/plugins/utility/images/default.nix @@ -1,5 +1,6 @@ { imports = [ ./image-nvim + ./img-clip ]; } diff --git a/npins/sources.json b/npins/sources.json index d4c0aa14..c4aef85e 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -705,6 +705,19 @@ "url": "https://github.com/3rd/image.nvim/archive/4c51d6202628b3b51e368152c053c3fb5c5f76f2.tar.gz", "hash": "16s1wsy9k72qiqzvwij67j2jzwgi6ggl6lhx9p6lfw8dpps3ayxg" }, + "img-clip": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "hakonharnes", + "repo": "img-clip.nvim" + }, + "branch": "main", + "submodules": false, + "revision": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d", + "url": "https://github.com/hakonharnes/img-clip.nvim/archive/08a02e14c8c0d42fa7a92c30a98fd04d6993b35d.tar.gz", + "hash": "0ani8z5pkvqmmalzcgyj27rfhqs76ivmpq79xn8rsdyy5a5fy979" + }, "indent-blankline-nvim": { "type": "Git", "repository": { @@ -869,6 +882,7 @@ "repo": "markview.nvim" }, "branch": "main", + "submodules": false, "revision": "6c92a6455e97c954a4a419265a032fedd69846f6", "url": "https://github.com/OXY2DEV/markview.nvim/archive/6c92a6455e97c954a4a419265a032fedd69846f6.tar.gz", "hash": "01sw4iscnciyifpba4cwjb6fs95wrkk60xvqq67b8d5j8yb5449a" From a0905ee428cf75c94e97ef80ea79d1d16f2c8968 Mon Sep 17 00:00:00 2001 From: rice-cracker-dev Date: Sat, 17 May 2025 11:46:43 +0700 Subject: [PATCH 6/9] basic: deprecate scrollOffset --- modules/extra/deprecations.nix | 2 +- modules/neovim/init/basic.nix | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix index 91d8ef28..0a5733ab 100644 --- a/modules/extra/deprecations.nix +++ b/modules/extra/deprecations.nix @@ -18,7 +18,7 @@ showSignColumn = "signcolumn"; # 2025-02-07 - scrollOff = "scrolloff"; + scrollOffset = "scrolloff"; }; in { imports = concatLists [ diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix index 195ef5e7..2f3934ae 100644 --- a/modules/neovim/init/basic.nix +++ b/modules/neovim/init/basic.nix @@ -6,11 +6,10 @@ inherit (lib.options) mkOption mkEnableOption literalMD; inherit (lib.strings) optionalString; inherit (lib.attrsets) optionalAttrs; - inherit (lib.types) enum bool str int either; + inherit (lib.types) enum bool str either; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.binds) pushDownDefault; - inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.types) luaInline; cfg = config.vim; @@ -22,12 +21,6 @@ in { description = "Hide search highlight so it doesn't stay highlighted"; }; - scrollOffset = mkOption { - type = int; - default = 8; - description = "Start scrolling this number of lines from the top or bottom of the page."; - }; - syntaxHighlighting = mkOption { type = bool; default = !config.vim.treesitter.highlight.enable; From 6d1b7ec094e7d3ce935f8c9e66c9b15d0b4d77f6 Mon Sep 17 00:00:00 2001 From: rice-cracker-dev Date: Sat, 17 May 2025 11:53:39 +0700 Subject: [PATCH 7/9] docs: deprecate vim.scrollOffset --- docs/release-notes/rl-0.8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 17f024b4..cf12a6a3 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -308,6 +308,7 @@ `vim.diagnostics.nvim-lint.linters.*.required_files`. - Add global function `nvf_lint` under `vim.diagnostics.nvim-lint.lint_function`. +- Deprecate `vim.scrollOffset` in favor of `vim.options.scrolloff`. [Sc3l3t0n](https://github.com/Sc3l3t0n): From 1643b5262b65f90fe020172ef231bf2f36b58048 Mon Sep 17 00:00:00 2001 From: haskex Date: Sat, 17 May 2025 12:04:44 -0300 Subject: [PATCH 8/9] Fixing conflits --- docs/release-notes/rl-0.8.md | 8 -------- temp | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 temp diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index e635ebce..f55b847c 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -392,11 +392,3 @@ - Add `rubylsp` option in `vim.languages.ruby.lsp.server` to use shopify's ruby-lsp language server - -[Haskex](https://github.com/haskex): - -[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim - -- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and - `setupOpts` -- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix diff --git a/temp b/temp new file mode 100644 index 00000000..0f6ab5b6 --- /dev/null +++ b/temp @@ -0,0 +1,7 @@ +[Haskex](https://github.com/haskex): + +[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim + +- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and + `setupOpts` +- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix From 23e40da9a4d0eb5c4b15f60e8910da742e827be1 Mon Sep 17 00:00:00 2001 From: haskex Date: Sat, 17 May 2025 12:08:24 -0300 Subject: [PATCH 9/9] remove temp file and add changelog --- docs/release-notes/rl-0.8.md | 6 ++++++ temp | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 temp diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index cf12a6a3..09698657 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -399,3 +399,9 @@ [solarized-osaka.nvim]: https://github.com/craftzdog/solarized-osaka.nvim - Add [solarized-osaka.nvim] theme + +[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim + +- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and + `setupOpts` +- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix diff --git a/temp b/temp deleted file mode 100644 index 0f6ab5b6..00000000 --- a/temp +++ /dev/null @@ -1,7 +0,0 @@ -[Haskex](https://github.com/haskex): - -[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim - -- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and - `setupOpts` -- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix