From 7ee9d506aa948b9322e7fa12c524c28a2f9c62ba Mon Sep 17 00:00:00 2001
From: eriedaberrie <eriedaberrie@gmail.com>
Date: Sat, 21 Jan 2023 17:31:58 -0800
Subject: [PATCH] Switch to catppuccin mocha

---
 early-init.el |  2 +-
 init.el       | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/early-init.el b/early-init.el
index ec24f50..c14842b 100644
--- a/early-init.el
+++ b/early-init.el
@@ -16,7 +16,7 @@
 
 ;; Set frame parameters early
 (setq default-frame-alist '((font . "JetbrainsMono Nerd Font-10.5")
-                            (alpha-background . 0.94)
+                            (alpha-background . 0.84)
                             (tool-bar-lines . 0)
                             (menu-bar-lines . 0)
                             (vertical-scroll-bars . nil)))
diff --git a/init.el b/init.el
index 6416e2e..67058a5 100644
--- a/init.el
+++ b/init.el
@@ -126,10 +126,6 @@
 
 (use-package ace-window
   :bind ("C-c w" . ace-window)
-  :custom-face
-  (aw-leading-char-face ((t (:foreground "#181926" :background "#ed8796" ; crust, red
-                                         :weight bold))))
-  (aw-background-face ((t (:foreground "#8087a2"))))                     ; overlay1
   :custom
   (aw-keys '(?a ?w ?e ?f ?g ?h ?j ?k ?l ?p))
   (aw-dispatch-always t)
@@ -138,7 +134,15 @@
   (dolist (c aw-dispatch-alist)
     (cond ((eq (car c) ?j) (setcar c ?J))
           ((eq (car c) ?v) (setcar c ?s) (setcar (nthcdr 2 c) "Split Window"))
-          ((eq (car c) ?b) (setcar c ?v) (setcar (nthcdr 2 c) "Vertical Split")))))
+          ((eq (car c) ?b) (setcar c ?v) (setcar (nthcdr 2 c) "Vertical Split"))))
+  (with-eval-after-load 'catppuccin-theme
+    (face-spec-set 'aw-leading-char-face `((t (:foreground
+					                           ,(catppuccin-get-color 'crust)
+					                           :background
+					                           ,(catppuccin-get-color 'red)
+					                           :weight bold))))
+    (face-spec-set 'aw-background-face `((t (:foreground
+					                         ,(catppuccin-get-color 'overlay1)))))))
 
 (use-package goggles
   :hook ((prog-mode text-mode) . goggles-mode)
@@ -405,8 +409,9 @@
 
 (use-package gruvbox-theme)
 (use-package catppuccin-theme
+  :demand t
   :custom
-  (catppuccin-flavor 'macchiato))
+  (catppuccin-flavor 'mocha))
 
 (defun load-theme-with-solaire ()
   (load-theme 'catppuccin t)
@@ -471,6 +476,9 @@
               fill-column 80)
 (add-hook 'python-mode-hook (lambda () (setq tab-width 4)))
 
+(column-number-mode)
+(size-indication-mode)
+
 (global-hl-line-mode)
 (defun my-inhibit-hl-line-mode ()
   (setq-local global-hl-line-mode nil))