From 32b9694840fc96a81b5e7964f23a73f6a1406e70 Mon Sep 17 00:00:00 2001 From: haskex Date: Fri, 16 May 2025 11:44:02 -0300 Subject: [PATCH 1/4] 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 2/4] 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 1643b5262b65f90fe020172ef231bf2f36b58048 Mon Sep 17 00:00:00 2001 From: haskex Date: Sat, 17 May 2025 12:04:44 -0300 Subject: [PATCH 3/4] 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 4/4] 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