diff --git a/configuration.nix b/configuration.nix index dee5001f..6e3175ef 100644 --- a/configuration.nix +++ b/configuration.nix @@ -199,7 +199,6 @@ 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 1f10476f..cf12a6a3 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -347,8 +347,6 @@ - Fix default telescope ignore list entry for '.git/' to properly match - Add [gitlinker.nvim] plugin to `vim.git.gitlinker-nvim` - Add [nvim-treesitter-textobjects] plugin to `vim.treesitter.textobjects` -- Default to disabling Conform for Rust if rust-analyzer is used - - To force using Conform, set `languages.rust.format.enable = true`. [rrvsh](https://github.com/rrvsh): @@ -401,9 +399,3 @@ [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/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix index 09c54ae6..677f7d3b 100644 --- a/modules/plugins/languages/rust.nix +++ b/modules/plugins/languages/rust.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.options) mkOption mkEnableOption literalMD; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.strings) optionalString; inherit (lib.trivial) boolToString; inherit (lib.lists) isList; @@ -68,14 +68,7 @@ in { }; format = { - enable = - mkEnableOption "Rust formatting" - // { - default = !cfg.lsp.enable && config.vim.languages.enableFormat; - defaultText = literalMD '' - Disabled if Rust LSP is enabled, otherwise follows {option}`vim.languages.enableFormat` - ''; - }; + enable = mkEnableOption "Rust formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "Rust formatter to use"; diff --git a/modules/plugins/utility/binds/hardtime/config.nix b/modules/plugins/utility/binds/hardtime/config.nix index 66b1f063..e8c315ef 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/default.nix b/modules/plugins/utility/images/default.nix index 1f398aa8..5b876e0a 100644 --- a/modules/plugins/utility/images/default.nix +++ b/modules/plugins/utility/images/default.nix @@ -1,6 +1,5 @@ { imports = [ ./image-nvim - ./img-clip ]; } diff --git a/modules/plugins/utility/images/img-clip/config.nix b/modules/plugins/utility/images/img-clip/config.nix deleted file mode 100644 index cadd815f..00000000 --- a/modules/plugins/utility/images/img-clip/config.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - 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 deleted file mode 100644 index 70c15604..00000000 --- a/modules/plugins/utility/images/img-clip/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - 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 deleted file mode 100644 index ce07feae..00000000 --- a/modules/plugins/utility/images/img-clip/img-clip.nix +++ /dev/null @@ -1,11 +0,0 @@ -{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" {}; - }; -} diff --git a/npins/sources.json b/npins/sources.json index 940a7466..a014244c 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -705,19 +705,6 @@ "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": { @@ -882,7 +869,6 @@ "repo": "markview.nvim" }, "branch": "main", - "submodules": false, "revision": "6c92a6455e97c954a4a419265a032fedd69846f6", "url": "https://github.com/OXY2DEV/markview.nvim/archive/6c92a6455e97c954a4a419265a032fedd69846f6.tar.gz", "hash": "01sw4iscnciyifpba4cwjb6fs95wrkk60xvqq67b8d5j8yb5449a"