From 232e4a06f3227be7e4625e43267f5ef0d5d85ced Mon Sep 17 00:00:00 2001 From: Yoni FIRROLONI Date: Wed, 3 Dec 2025 20:41:51 +1300 Subject: [PATCH 1/4] codewindow: allow opening on setup codewindow: allow opening on setup --- .../plugins/minimap/codewindow/codewindow.nix | 19 ++++++++++++++++++- modules/plugins/minimap/codewindow/config.nix | 6 +++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/modules/plugins/minimap/codewindow/codewindow.nix b/modules/plugins/minimap/codewindow/codewindow.nix index 381e3102..19b63914 100644 --- a/modules/plugins/minimap/codewindow/codewindow.nix +++ b/modules/plugins/minimap/codewindow/codewindow.nix @@ -1,9 +1,12 @@ {lib, ...}: let - inherit (lib.options) mkEnableOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.nvim.binds) mkMappingOption; + inherit (lib.nvim.types) mkPluginSetupOption; + inherit (lib.types) bool str listOf; in { options.vim.minimap.codewindow = { enable = mkEnableOption "codewindow plugin for minimap view"; + openByDefault = mkEnableOption "codewindow plugin opening automatically"; mappings = { open = mkMappingOption "Open minimap [codewindow]" "mo"; @@ -11,5 +14,19 @@ in { toggle = mkMappingOption "Toggle minimap [codewindow]" "mm"; toggleFocus = mkMappingOption "Toggle minimap focus [codewindow]" "mf"; }; + + setupOpts = mkPluginSetupOption "codewindow" { + auto_enable = mkOption { + description = "Open automatically"; + type = bool; + default = true; + }; + + exclude_filetypes = mkOption { + description = "Excluded files types"; + type = listOf str; + default = ["NvimTree" "orgagenda" "Alpha"]; + }; + }; }; } diff --git a/modules/plugins/minimap/codewindow/config.nix b/modules/plugins/minimap/codewindow/config.nix index a853514a..b0542f8d 100644 --- a/modules/plugins/minimap/codewindow/config.nix +++ b/modules/plugins/minimap/codewindow/config.nix @@ -33,9 +33,9 @@ in { pluginRC.codewindow = entryAnywhere '' local codewindow = require('codewindow') - codewindow.setup({ - exclude_filetypes = { 'NvimTree', 'orgagenda', 'Alpha'}, - }) + codewindow.setup( + ${lib.nvim.lua.toLuaObject cfg.setupOpts} + ) ''; }; }; From 61634e9ed191d6e008ca29b752b68fff0b695f50 Mon Sep 17 00:00:00 2001 From: Yoni FIRROLONI Date: Mon, 8 Dec 2025 09:36:50 +1300 Subject: [PATCH 2/4] release notes: add line codewindow: allow opening on setup --- docs/release-notes/rl-0.8.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 96819a48..9a28286b 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -520,3 +520,6 @@ [JudahZF](https://github.com/JudahZF): - Added gitFiles mapping option to telescope +[vagahbond](https://github.com/vagahbond): + +- moved [codewindow](https://github.com/gorbit99/codewindow.nvim) to setupOpts From 84a4dd7d348c1cf09875e6e9888452d120cd2ea5 Mon Sep 17 00:00:00 2001 From: Yoni FIRROLONI Date: Mon, 8 Dec 2025 11:18:21 +1300 Subject: [PATCH 3/4] codewindow: clean --- docs/release-notes/rl-0.8.md | 4 +++- .../plugins/minimap/codewindow/codewindow.nix | 18 ++---------------- modules/plugins/minimap/codewindow/config.nix | 4 +--- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 9a28286b..e90ba553 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -515,11 +515,13 @@ [neocodeium]: https://github.com/monkoose/neocodeium -- Add [neocodeium] plugin in `vim.assistant.neocodeium` with `enable`, `setupOpts` and `keymaps` +- Add [neocodeium] plugin in `vim.assistant.neocodeium` with `enable`, + `setupOpts` and `keymaps` [JudahZF](https://github.com/JudahZF): - Added gitFiles mapping option to telescope + [vagahbond](https://github.com/vagahbond): - moved [codewindow](https://github.com/gorbit99/codewindow.nvim) to setupOpts diff --git a/modules/plugins/minimap/codewindow/codewindow.nix b/modules/plugins/minimap/codewindow/codewindow.nix index 19b63914..9ad48c9f 100644 --- a/modules/plugins/minimap/codewindow/codewindow.nix +++ b/modules/plugins/minimap/codewindow/codewindow.nix @@ -1,12 +1,10 @@ {lib, ...}: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; - inherit (lib.types) bool str listOf; in { options.vim.minimap.codewindow = { enable = mkEnableOption "codewindow plugin for minimap view"; - openByDefault = mkEnableOption "codewindow plugin opening automatically"; mappings = { open = mkMappingOption "Open minimap [codewindow]" "mo"; @@ -15,18 +13,6 @@ in { toggleFocus = mkMappingOption "Toggle minimap focus [codewindow]" "mf"; }; - setupOpts = mkPluginSetupOption "codewindow" { - auto_enable = mkOption { - description = "Open automatically"; - type = bool; - default = true; - }; - - exclude_filetypes = mkOption { - description = "Excluded files types"; - type = listOf str; - default = ["NvimTree" "orgagenda" "Alpha"]; - }; - }; + setupOpts = mkPluginSetupOption "codewindow" {}; }; } diff --git a/modules/plugins/minimap/codewindow/config.nix b/modules/plugins/minimap/codewindow/config.nix index b0542f8d..78f46fa6 100644 --- a/modules/plugins/minimap/codewindow/config.nix +++ b/modules/plugins/minimap/codewindow/config.nix @@ -33,9 +33,7 @@ in { pluginRC.codewindow = entryAnywhere '' local codewindow = require('codewindow') - codewindow.setup( - ${lib.nvim.lua.toLuaObject cfg.setupOpts} - ) + codewindow.setup(${cfg.setupOpts}) ''; }; }; From d55680f4d29bcc606b3d96b4e2a8d4487d44bfae Mon Sep 17 00:00:00 2001 From: Yoni FIRROLONI Date: Thu, 11 Dec 2025 22:21:50 +1300 Subject: [PATCH 4/4] buildfix: fix rafs wrong code suggestion --- modules/plugins/minimap/codewindow/config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/plugins/minimap/codewindow/config.nix b/modules/plugins/minimap/codewindow/config.nix index 78f46fa6..5c7b38fe 100644 --- a/modules/plugins/minimap/codewindow/config.nix +++ b/modules/plugins/minimap/codewindow/config.nix @@ -5,6 +5,7 @@ }: let inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding pushDownDefault; cfg = config.vim.minimap.codewindow; @@ -33,7 +34,7 @@ in { pluginRC.codewindow = entryAnywhere '' local codewindow = require('codewindow') - codewindow.setup(${cfg.setupOpts}) + codewindow.setup(${toLuaObject cfg.setupOpts}) ''; }; };