From 8392c9dcf6bfd0686bac275216e06bfddd60472d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 11 Mar 2019 12:39:38 -0400
Subject: [PATCH] Add new :ui indent-guides module

Replaces old highlight-indentation-mode with new highlight-indent-guides
plugin.
---
 core/packages.el                         |  1 -
 init.example.el                          |  1 +
 modules/config/default/+evil-bindings.el |  3 +--
 modules/ui/indent-guides/config.el       | 13 +++++++++++++
 modules/ui/indent-guides/packages.el     |  4 ++++
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 modules/ui/indent-guides/config.el
 create mode 100644 modules/ui/indent-guides/packages.el

diff --git a/core/packages.el b/core/packages.el
index d2f34a5ee..e13d240d2 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -11,7 +11,6 @@
 ;; core-ui.el
 (package! all-the-icons)
 (package! hide-mode-line)
-(package! highlight-indentation)
 (package! highlight-numbers)
 (package! highlight-escape-sequences
   :recipe (:fetcher github :repo "hlissner/highlight-escape-sequences"))
diff --git a/init.example.el b/init.example.el
index 79782f582..b20b54386 100644
--- a/init.example.el
+++ b/init.example.el
@@ -25,6 +25,7 @@
        evil-goggles      ; display visual hints when editing in evil
        ;;fci               ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE tags
+       indent-guides     ; highlighted indent columns
        modeline          ; snazzy, Atom-inspired modeline, plus API
        nav-flash         ; blink the current line after jumping
        ;;neotree           ; a project drawer, like NERDTree for vim
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index d4f6267b7..03512a7ad 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -739,8 +739,7 @@
         :desc "Flycheck"                     "f" #'flycheck-mode
         :desc "Line numbers"                 "l" #'doom/toggle-line-numbers
         :desc "Frame fullscreen"             "F" #'toggle-frame-fullscreen
-        :desc "Indent guides"                "i" #'highlight-indentation-mode
-        :desc "Indent guides (column)"       "I" #'highlight-indentation-current-column-mode
+        :desc "Indent guides"                "i" #'highlight-indent-guides-mode
         :desc "Impatient mode"               "h" #'+impatient-mode/toggle
         :desc "Big mode"                     "b" #'doom-big-font-mode
         :desc "Evil goggles"                 "g" #'evil-goggles-mode
diff --git a/modules/ui/indent-guides/config.el b/modules/ui/indent-guides/config.el
new file mode 100644
index 000000000..bb7d4c776
--- /dev/null
+++ b/modules/ui/indent-guides/config.el
@@ -0,0 +1,13 @@
+;;; ui/indent-guides/config.el -*- lexical-binding: t; -*-
+
+(def-package! highlight-indent-guides
+  :hook ((prog-mode text-mode conf-mode) . highlight-indent-guides-mode)
+  :config
+  (setq highlight-indent-guides-method 'character
+        highlight-indent-guides-responsive 'top)
+
+  ;; Don't display first level of indentation
+  (defun +indent-guides-for-all-but-first-column (level responsive display)
+    (unless (< level 1)
+      (highlight-indent-guides--highlighter-default level responsive display)))
+  (setq highlight-indent-guides-highlighter-function #'+indent-guides-for-all-but-first-column))
diff --git a/modules/ui/indent-guides/packages.el b/modules/ui/indent-guides/packages.el
new file mode 100644
index 000000000..210c00e9d
--- /dev/null
+++ b/modules/ui/indent-guides/packages.el
@@ -0,0 +1,4 @@
+;; -*- no-byte-compile: t; -*-
+;;; ui/indent-guides/packages.el
+
+(package! highlight-indent-guides)