From 4453d5c9dd3e759120804f5ae0a5aa3cfb756f8d Mon Sep 17 00:00:00 2001
From: Frothy <76622149+FrothyMarrow@users.noreply.github.com>
Date: Fri, 24 Nov 2023 12:05:19 +0300
Subject: [PATCH] visuals/indent-blankline: rename scope.showCurrContext to
 scope.enabled

---
 configuration.nix           |  2 +-
 modules/visuals/config.nix  |  2 +-
 modules/visuals/visuals.nix | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 6c2cb26..f45cb0a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -90,7 +90,7 @@ inputs: let
           fillChar = null;
           eolChar = null;
           scope = {
-            showCurrContext = true;
+            enabled = true;
           };
         };
 
diff --git a/modules/visuals/config.nix b/modules/visuals/config.nix
index 17ed23e..7e4a83b 100644
--- a/modules/visuals/config.nix
+++ b/modules/visuals/config.nix
@@ -33,7 +33,7 @@ in {
           },
 
           scope = {
-            enabled = ${boolToString cfg.indentBlankline.scope.showCurrContext},
+            enabled = ${boolToString cfg.indentBlankline.scope.enabled},
             show_end = ${boolToString cfg.indentBlankline.scope.showEndOfLine}
           },
         }
diff --git a/modules/visuals/visuals.nix b/modules/visuals/visuals.nix
index fe1e0f8..08dc1c3 100644
--- a/modules/visuals/visuals.nix
+++ b/modules/visuals/visuals.nix
@@ -8,7 +8,7 @@
   cfg = config.vim.visuals;
 in {
   imports = [
-    (mkRenamedOptionModule ["vim" "visuals" "indentBlankline" "showCurrContext"] ["vim" "visuals" "indentBlankline" "scope" "showCurrContext"])
+    (mkRenamedOptionModule ["vim" "visuals" "indentBlankline" "showCurrContext"] ["vim" "visuals" "indentBlankline" "scope" "enabled"])
     (mkRenamedOptionModule ["vim" "visuals" "indentBlankline" "showEndOfLine"] ["vim" "visuals" "indentBlankline" "scope" "showEndOfLine"])
     (mkRemovedOptionModule ["vim" "visuals" "indentBlankline" "useTreesitter"] "`vim.visuals.indentBlankline.useTreesitter` has been removed upstream and can safely be removed from your configuration.")
   ];
@@ -115,6 +115,13 @@ in {
       };
 
       scope = {
+        enabled = mkOption {
+          description = "Highlight current scope from treesitter";
+          type = types.bool;
+          default = config.vim.treesitter.enable;
+          defaultText = literalExpression "config.vim.treesitter.enable";
+        };
+
         showEndOfLine = mkOption {
           description = ''
             Displays the end of line character set by [](#opt-vim.visuals.indentBlankline.eolChar) instead of the
@@ -124,13 +131,6 @@ in {
           default = cfg.indentBlankline.eolChar != null;
           defaultText = literalExpression "config.vim.visuals.indentBlankline.eolChar != null";
         };
-
-        showCurrContext = mkOption {
-          description = "Highlight current context from treesitter";
-          type = types.bool;
-          default = config.vim.treesitter.enable;
-          defaultText = literalExpression "config.vim.treesitter.enable";
-        };
       };
     };