Switch back to catppuccin theme

Move nerd-icons into own source block / heading

Remove some excess space

config/ui.org

@@ -3,7 +3,6 @@
 #+email: evie@xenia.me.uk
 #+filetags: :emacs:config:org:
 #+property: header-args:emacs-lisp :tangle yes :mkdirp yes :results output silent
-
 #+begin_src emacs-lisp
   (setq use-dialog-box nil
         truncate-lines nil
@@ -41,15 +40,30 @@
                      other-window))
     (advice-add command :after #'pulse-line))
 #+end_src
-
 * Theme, font and nerd-icons
 #+begin_src emacs-lisp
   (add-to-list 'initial-frame-alist '(width  . 120))
   (add-to-list 'initial-frame-alist '(height . 80))
-
+#+end_src
+** catppuccin-theme
+#+begin_src emacs-lisp
+  (use-package catppuccin-theme
+    :ensure t
+    :demand
+    :custom
+    (catppuccin-flavour 'mocha)
+    (catppuccin-italic-blockquotes t)
+    (catppuccin-italic-comments t)
+    (catppuccin-italic-variables t)
+    :config
+    (load-theme 'catppuccin t))
+#+end_src
+** modus-vivendi-tinted
+Removed in favour of [[https://github.com/catppuccin/emacs][Catppuccin (emacs)]] theme, keeping here for the config options though in case I want to use it again for anything.
+#+begin_src emacs-lisp
   ;; Theme
   (use-package modus-themes
-    :ensure t
+    :disabled t
     :custom
     (modus-themes-disable-other-themes t)
     (modus-themes-to-toggle '(modus-operandi-tinted modus-vivendi-tinted))
@@ -66,8 +80,9 @@
                              (t . (1.1))))
     :config
     (modus-themes-load-theme 'modus-vivendi-tinted))
-
+#+end_src
-  ;; Nerd-Icons modes
+** nerd-icons
+#+begin_src emacs-lisp
   (use-package nerd-icons
     :ensure t
     :diminish
@@ -99,7 +114,6 @@
 
   (keymap-global-set "C-c i n" #'nerd-icons-insert)
 #+end_src
-
 ** Font ligatures
 #+begin_src emacs-lisp
   (use-package ligature
@@ -116,7 +130,6 @@
        "/*" "*/" "+++" "<!--" "<!---"))
     (global-ligature-mode +1))
 #+end_src
-
 ** Whitespace mode
 #+begin_src emacs-lisp
   (use-package whitespace
@@ -133,7 +146,6 @@
                          auto-cleanup)))
 #+end_src
 * Window management
-
 ** windmove
 #+begin_src emacs-lisp
   (use-package windmove
@@ -154,8 +166,6 @@
            ("C-c w C-l" . windmove-display-right)
            ("C-c w L" . windmove-swap-states-right)))
 #+end_src
-
-
 ** winner
 #+begin_src emacs-lisp
   (use-package winner
@@ -167,7 +177,6 @@
     :config
     (winner-mode))
 #+end_src
-
 ** ediff
 #+begin_src emacs-lisp :tangle yes
   (use-package ediff
@@ -264,7 +273,6 @@
     :diminish
     :config (zone-when-idle (* 60 60))) ; 1 hour
 #+end_src
-
 * Git status in fringe
 #+begin_src emacs-lisp
   (use-package diff-hl