From ea55488f042d06585b9beae7c11cbd005727d9f2 Mon Sep 17 00:00:00 2001 From: Cool-Game-Dev Date: Thu, 14 Aug 2025 08:52:25 -0500 Subject: [PATCH] binds/qmk: Rename to `vim.utility.qmk` Move the `vim.binds.qmk` module to `vim.utility.qmk`. --- configuration.nix | 2 +- docs/release-notes/rl-0.8.md | 2 +- modules/plugins/utility/binds/default.nix | 1 - modules/plugins/utility/default.nix | 1 + modules/plugins/utility/{binds => }/qmk/config.nix | 2 +- modules/plugins/utility/{binds => }/qmk/default.nix | 0 modules/plugins/utility/{binds => }/qmk/qmk.nix | 3 +-- 7 files changed, 5 insertions(+), 6 deletions(-) rename modules/plugins/utility/{binds => }/qmk/config.nix (94%) rename modules/plugins/utility/{binds => }/qmk/default.nix (100%) rename modules/plugins/utility/{binds => }/qmk/qmk.nix (97%) diff --git a/configuration.nix b/configuration.nix index 6a489430..46980482 100644 --- a/configuration.nix +++ b/configuration.nix @@ -158,7 +158,6 @@ isMaximal: { whichKey.enable = true; cheatsheet.enable = true; hardtime-nvim.enable = isMaximal; - qmk.enable = false; # requires hardware specific options }; telescope.enable = true; @@ -193,6 +192,7 @@ isMaximal: { vim-wakatime.enable = false; diffview-nvim.enable = true; yanky-nvim.enable = false; + qmk.enable = false; # requires hardware specific options icon-picker.enable = isMaximal; surround.enable = isMaximal; leetcode-nvim.enable = isMaximal; diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index cdf8b059..c5640ead 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -485,4 +485,4 @@ - Add just support under `vim.languages.just` using [just-lsp]. - Add [roslyn-ls] to the `vim.languages.csharp` module. - Add JSON support under `vim.languages.json` using [jsonls] and [jsonfmt]. -- Add QMK support under `vim.binds.qmk` via [qmk.nvim]. +- Add QMK support under `vim.utility.qmk` via [qmk.nvim]. diff --git a/modules/plugins/utility/binds/default.nix b/modules/plugins/utility/binds/default.nix index cd755ac8..43666cc9 100644 --- a/modules/plugins/utility/binds/default.nix +++ b/modules/plugins/utility/binds/default.nix @@ -3,6 +3,5 @@ _: { ./which-key ./cheatsheet ./hardtime - ./qmk ]; } diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix index 8069b6c1..13c69268 100644 --- a/modules/plugins/utility/default.nix +++ b/modules/plugins/utility/default.nix @@ -18,6 +18,7 @@ ./oil-nvim ./outline ./preview + ./qmk ./sleuth ./smart-splits ./snacks-nvim diff --git a/modules/plugins/utility/binds/qmk/config.nix b/modules/plugins/utility/qmk/config.nix similarity index 94% rename from modules/plugins/utility/binds/qmk/config.nix rename to modules/plugins/utility/qmk/config.nix index 1f1ec258..bd43e2a8 100644 --- a/modules/plugins/utility/binds/qmk/config.nix +++ b/modules/plugins/utility/qmk/config.nix @@ -7,7 +7,7 @@ inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.dag) entryAfter; - cfg = config.vim.binds.qmk; + cfg = config.vim.utility.qmk; in { config = mkIf cfg.enable { vim = { diff --git a/modules/plugins/utility/binds/qmk/default.nix b/modules/plugins/utility/qmk/default.nix similarity index 100% rename from modules/plugins/utility/binds/qmk/default.nix rename to modules/plugins/utility/qmk/default.nix diff --git a/modules/plugins/utility/binds/qmk/qmk.nix b/modules/plugins/utility/qmk/qmk.nix similarity index 97% rename from modules/plugins/utility/binds/qmk/qmk.nix rename to modules/plugins/utility/qmk/qmk.nix index f76aff90..85553dc2 100644 --- a/modules/plugins/utility/binds/qmk/qmk.nix +++ b/modules/plugins/utility/qmk/qmk.nix @@ -1,5 +1,4 @@ { - config, lib, ... }: let @@ -7,7 +6,7 @@ inherit (lib.types) attrsOf enum lines str; inherit (lib.nvim.types) mkPluginSetupOption; in { - options.vim.binds.qmk = { + options.vim.utility.qmk = { enable = mkEnableOption "QMK and ZMK keymaps in nvim"; setupOpts = mkPluginSetupOption "qmk.nvim" {