From 3c1f89984ca6314d9c941e2b955d3b1997fbec6a Mon Sep 17 00:00:00 2001 From: Nowaaru Date: Wed, 6 Nov 2024 16:32:40 -0700 Subject: [PATCH 1/5] utility/precognition: add description to disabled_fts oops --- modules/plugins/utility/motion/precognition/precognition.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/plugins/utility/motion/precognition/precognition.nix b/modules/plugins/utility/motion/precognition/precognition.nix index b387d7f9..6d4bdd91 100644 --- a/modules/plugins/utility/motion/precognition/precognition.nix +++ b/modules/plugins/utility/motion/precognition/precognition.nix @@ -59,6 +59,7 @@ in { disabled_fts = mkOption { type = listOf str; + description = "Filetypes that automatically disable 'precognition.'"; default = ["startify"]; example = literalExpression ''["startify"]''; }; From c20bfdd6dcf1a9f71e1e363ea96dbae0ed854574 Mon Sep 17 00:00:00 2001 From: Nowaaru Date: Wed, 6 Nov 2024 22:44:37 -0700 Subject: [PATCH 2/5] utility/precognition: manual format --- modules/plugins/utility/motion/precognition/config.nix | 4 +--- modules/plugins/utility/motion/precognition/precognition.nix | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/plugins/utility/motion/precognition/config.nix b/modules/plugins/utility/motion/precognition/config.nix index 6535e33e..1db56258 100644 --- a/modules/plugins/utility/motion/precognition/config.nix +++ b/modules/plugins/utility/motion/precognition/config.nix @@ -10,9 +10,7 @@ in { config = mkIf cfg.enable { - vim.startPlugins = [ - "precognition-nvim" - ]; + vim.startPlugins = [ "precognition-nvim" ]; vim.luaConfigRC.precognition = lib.nvim.dag.entryAnywhere '' require('precognition').setup(${lib.nvim.lua.toLuaObject cfg.setupOpts}) diff --git a/modules/plugins/utility/motion/precognition/precognition.nix b/modules/plugins/utility/motion/precognition/precognition.nix index 6d4bdd91..9f14e907 100644 --- a/modules/plugins/utility/motion/precognition/precognition.nix +++ b/modules/plugins/utility/motion/precognition/precognition.nix @@ -54,8 +54,9 @@ in { hints = mkHintType "What motions display and at what priority."; - gutterHints = - mkHintType "What motions display and at what priority. Only appears in gutters."; + gutterHints = mkHintType '' + What motions display and at what priority. Only appears in gutters + ''; disabled_fts = mkOption { type = listOf str; From f013656dab1da458bad2a6eeb04ca959f5f38b48 Mon Sep 17 00:00:00 2001 From: Nowaaru Date: Wed, 6 Nov 2024 22:45:02 -0700 Subject: [PATCH 3/5] utility/precognition: remove periods at the end of descriptions --- .../utility/motion/precognition/precognition.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/plugins/utility/motion/precognition/precognition.nix b/modules/plugins/utility/motion/precognition/precognition.nix index 9f14e907..25fedd8e 100644 --- a/modules/plugins/utility/motion/precognition/precognition.nix +++ b/modules/plugins/utility/motion/precognition/precognition.nix @@ -11,11 +11,11 @@ options = { text = mkOption { type = str; - description = "The easier-to-read depiction of the motion."; + description = "The easier-to-read depiction of the motion"; }; prio = mkOption { type = int; - description = "The priority of the hint."; + description = "The priority of the hint"; example = 10; default = 1; }; @@ -29,13 +29,13 @@ in { setupOpts = mkPluginSetupOption "precognition.nvim" { startVisible = mkOption { type = bool; - description = "Whether to start 'precognition' automatically."; + description = "Whether to start 'precognition' automatically"; default = true; }; showBlankVirtLine = mkOption { type = bool; - description = "Whether to show a blank virtual line when no movements are shown."; + description = "Whether to show a blank virtual line when no movements are shown"; default = true; }; @@ -48,11 +48,11 @@ in { { foreground = "#0000FF"; background = "#000000"; }; ''; description = '' - The highlight for the virtual text. + The highlight for the virtual text ''; }; - hints = mkHintType "What motions display and at what priority."; + hints = mkHintType "What motions display and at what priority"; gutterHints = mkHintType '' What motions display and at what priority. Only appears in gutters @@ -60,7 +60,8 @@ in { disabled_fts = mkOption { type = listOf str; - description = "Filetypes that automatically disable 'precognition.'"; + description = "Filetypes that automatically disable 'precognition'"; + default = ["startify"]; example = literalExpression ''["startify"]''; }; From 80ca761639c732dde68b780ce9161bfa1da80d80 Mon Sep 17 00:00:00 2001 From: Nowaaru Date: Wed, 6 Nov 2024 22:46:34 -0700 Subject: [PATCH 4/5] utility/precognition: fix configuration.nix entry oops lol --- configuration.nix | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/configuration.nix b/configuration.nix index 29179ee9..c3e5722f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -165,29 +165,7 @@ isMaximal: { motion = { hop.enable = true; leap.enable = true; - - precognition = { - enable = true; - setupOpts = { - startVisible = true; - showBlankVirtLine = true; - - # highlightColor - automatically set by theme - disabled_fts = ["startify" "alpha" "dashboard"]; - gutterHints = { - gg = { - text = "gg"; - prio = 2; - }; - }; - hints = { - Caret = { - text = "^"; - prio = 10; - }; - }; - }; - }; + precognition.enable = isMaximal; }; images = { From 18e27eb0bbb8e7bcc40f876331f6165786f5cbdf Mon Sep 17 00:00:00 2001 From: Nowaaru Date: Wed, 6 Nov 2024 22:47:44 -0700 Subject: [PATCH 5/5] utility/precognition: format --- modules/plugins/utility/motion/precognition/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/utility/motion/precognition/config.nix b/modules/plugins/utility/motion/precognition/config.nix index 1db56258..bfeed8f6 100644 --- a/modules/plugins/utility/motion/precognition/config.nix +++ b/modules/plugins/utility/motion/precognition/config.nix @@ -10,7 +10,7 @@ in { config = mkIf cfg.enable { - vim.startPlugins = [ "precognition-nvim" ]; + vim.startPlugins = ["precognition-nvim"]; vim.luaConfigRC.precognition = lib.nvim.dag.entryAnywhere '' require('precognition').setup(${lib.nvim.lua.toLuaObject cfg.setupOpts})