From 90f745edbffce482f70c94537ef8a216f1e20935 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Thu, 21 Oct 2021 09:54:47 -0700
Subject: [PATCH] DOOM: Switch to VMOCE stack for completion

---
 doom/config.el |  5 +++--
 doom/init.el   | 18 +++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/doom/config.el b/doom/config.el
index f28060c..c41b4c9 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -56,7 +56,7 @@
 ;; Spacemacs-like SPC SPC -> M-x behavior
 (map! :leader
       :desc "M-x"
-      "SPC" #'counsel-M-x)
+      "SPC" #'execute-extended-command)
 
 (defun first-executable (candidates)
   (seq-find #'executable-find candidates))
@@ -103,8 +103,9 @@
 (defun display-ansi-colors ()
   (interactive)
   (format-decode-buffer 'ansi-colors))
-(add-hook 'find-file-hooks 'tty-format-guess)
+(add-hook 'find-file-hook 'tty-format-guess)
 (add-to-list 'auto-mode-alist '("\\.log\\'" . display-ansi-colors))
+(add-to-list 'auto-mode-alist '("\\.log\\.out\\'" . display-ansi-colors))
 
 
 ;; Here are some additional functions/macros that could help you configure Doom:
diff --git a/doom/init.el b/doom/init.el
index 108c1be..66cd24b 100644
--- a/doom/init.el
+++ b/doom/init.el
@@ -20,26 +20,20 @@
 
        :completion
        company           ; the ultimate code completion backend
-       ;;helm              ; the *other* search engine for love and life
-       ;;ido               ; the other *other* search engine...
-       (ivy +prescient) ; a search engine for love and life
+       vertico  ; vertico+marginalia+orderless+consult+embark
 
        :ui
-       ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
-       doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
        ;;fill-column       ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
-       ;;hydra
-       ;;indent-guides     ; highlighted indent columns
+       hydra
+       (ligatures +fira)
        modeline          ; snazzy, Atom-inspired modeline, plus API
        nav-flash         ; blink the current line after jumping
-       ;;neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
-       ;;pretty-code       ; replace bits of code with pretty symbols
-       ;;tabs              ; an tab bar for Emacs
        treemacs          ; a project drawer, like neotree but cooler
        ;;unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
@@ -63,7 +57,7 @@
        ;;word-wrap         ; soft wrapping with language-aware indent
 
        :emacs
-       dired             ; making dired pretty [functional]
+       (dired +ranger)             ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
        ;;ibuffer         ; interactive buffer management
        vc                ; version-control and Emacs, sitting in a tree
@@ -142,6 +136,8 @@
         ;;+jupyter        ; ipython/jupyter support for babel
         ;;+pandoc          ; export-with-pandoc support
         ;;+pomodoro        ; be fruitful with the tomato technique
+        +pretty    ;; Disable if performance issues
+        +roam2
         +present)        ; using org-mode for presentations
        ;;perl              ; write code no one else can comprehend
        php               ; perl's insecure younger brother