From 2e99a2101082a6ab8292699fdbe51a01dcc396eb Mon Sep 17 00:00:00 2001 From: Frothy <76622149+FrothyMarrow@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:05:56 -0400 Subject: [PATCH 1/2] ui/smartcolumn: change `custom_colorcolumn` type to expected type string --- configuration.nix | 8 ++++---- modules/plugins/ui/smartcolumn/smartcolumn.nix | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1d81459..b0e6132 100644 --- a/configuration.nix +++ b/configuration.nix @@ -222,10 +222,10 @@ inputs: let enable = true; setupOpts.custom_colorcolumn = { # this is a freeform module, it's `buftype = int;` for configuring column position - nix = 110; - ruby = 120; - java = 130; - go = [90 130]; + nix = "110"; + ruby = "120"; + java = "130"; + go = ["90" "130"]; }; }; }; diff --git a/modules/plugins/ui/smartcolumn/smartcolumn.nix b/modules/plugins/ui/smartcolumn/smartcolumn.nix index 37d7a94..48bf549 100644 --- a/modules/plugins/ui/smartcolumn/smartcolumn.nix +++ b/modules/plugins/ui/smartcolumn/smartcolumn.nix @@ -31,15 +31,15 @@ in { custom_colorcolumn = mkOption { description = "The position at which smart column should be displayed for each individual buffer type"; - type = attrsOf (either int (listOf int)); + type = attrsOf (either str (listOf str)); default = {}; example = literalExpression '' vim.ui.smartcolumn.setupOpts.custom_colorcolumn = { - nix = 110; - ruby = 120; - java = 130; - go = [90 130]; + nix = "110"; + ruby = "120"; + java = "130"; + go = ["90" "130"]; }; ''; }; From 216cb34cafde41f6fc2fe63fe4112999c2142af9 Mon Sep 17 00:00:00 2001 From: Frothy <76622149+FrothyMarrow@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:14:07 -0400 Subject: [PATCH 2/2] docs: add entry for changed `smartcolumn.setupOpts.custom_colorcolumn` type --- docs/release-notes/rl-0.7.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index 2ce8aa5..0034cf2 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -12,13 +12,18 @@ Release notes for release 0.7 [frothymarrow](https://github.com/frothymarrow): - Modified type for - [](#opt-vim.visuals.fidget-nvim.setupOpts.progress.display.overrides) from - `anything` to a `submodule` for better type checking. + [vim.visuals.fidget-nvim.setupOpts.progress.display.overrides](#opt-vim.visuals.fidget-nvim.setupOpts.progress.display.overrides) + from `anything` to a `submodule` for better type checking. + - Fix null `vim.lsp.mappings` generating an error and not being filtered out. + - Add basic transparency support for `oxocarbon` theme by setting the highlight group for `Normal`, `NormalFloat`, `LineNr`, `SignColumn` and optionally `NvimTreeNormal` to `none`. +- Fix [vim.ui.smartcolumn.setupOpts.custom_colorcolumn](#opt-vim.ui.smartcolumn.setupOpts.custom_colorcolumn) + using the wrong type `int` instead of the expected type `string`. + [horriblename](https://github.com/horriblename): - Fix broken treesitter-context keybinds in visual mode @@ -37,7 +42,7 @@ Release notes for release 0.7 - Add rustfmt as the default formatter for Rust -[NotAShelf](https://github.com/notashelf) +[NotAShelf](https://github.com/notashelf): - Add `deno fmt` as the default Markdown formatter. This will be enabled automatically if you have autoformatting enabled, but can be disabled manually