2 files changed, 146 insertions, 145 deletions

diff --git a/arkta/arkta-cosmetic.el b/arkta/arkta-cosmetic.el
new file mode 100644
index 0000000..0960798
--- /dev/null
+++ b/arkta/arkta-cosmetic.el
@@ -0,0 +1,145 @@
+;; -*- lexical-binding: t -*-
+;; Copyright © 2018-2025  Uko Koknevics
+
+(use-package ansi-color
+  :hook (compilation-filter . ansi-color-compilation-filter)
+  :custom
+  (ansi-color-for-compilation-mode t))
+
+(use-package centaur-tabs
+  :straight t
+  :demand t
+  :init
+  (defun arkta/disable-centaur-tabs-mode ()
+    (centaur-tabs-local-mode +1))
+  :hook (dashboard-mode . arkta/disable-centaur-tabs-mode)
+  :bind (("C-x <C-right>" . centaur-tabs-forward)
+         ("C-x <right>"   . centaur-tabs-forward)
+         ("C-x <C-left>"  . centaur-tabs-backward)
+         ("C-x <left>"    . centaur-tabs-backward))
+  :custom
+  (centaur-tabs-style "alternate")
+  (centaur-tabs-height 35)
+  (centaur-tabs-icon-type 'nerd-icons)
+  (centaur-tabs-set-icons t)
+  (centaur-tabs-gray-out-icons 'buffer)
+  (centaur-tabs-set-bar 'over)
+  (centaur-tabs-set-close-button nil)
+  (centaur-tabs-set-modified-marker t)
+  (centaur-tabs-modified-marker "●")
+  (centaur-tabs-cycle-scope 'tabs)
+  :config
+  (centaur-tabs-mode +1))
+
+(use-package display-fill-column-indicator
+  :straight '(display-fill-column-indicator :type built-in)
+  :demand t
+  :init
+  (defun arkta/disable-dfci ()
+    (display-fill-column-indicator-mode -1))
+  :hook (dashboard-mode . arkta/disable-dfci)
+  :config
+  (global-display-fill-column-indicator-mode +1))
+
+(use-package display-line-numbers
+  :straight '(display-line-numbers :type built-in)
+  :demand t
+  :init
+  (defun arkta/disable-dln ()
+    (display-line-numbers-mode -1))
+  :hook ((dashboard-mode help-mode) . arkta/disable-dln)
+  :config
+  (global-display-line-numbers-mode +1))
+
+(use-package doom-modeline
+  :straight t
+  :custom
+  (doom-modeline-bar-width 4)
+  (doom-modeline-battery t)
+  (doom-modeline-buffer-file-true-name t)
+  (doom-modeline-height 25)
+  (doom-modeline-hud t)
+  (doom-modeline-hud-min-height 6)
+  (doom-modeline-icon t)
+  (doom-modeline-percent-position nil)
+  (doom-modeline-project-detection 'project)
+  (doom-modeline-total-line-number t)
+  :config
+  (doom-modeline-mode +1))
+
+(use-package emojify
+  :straight t
+  :config
+  (global-emojify-mode +1))
+
+(use-package faces
+  :straight '(faces :type built-in)
+  :custom-face
+  (default ((t (:weight medium
+                :slant normal
+                :width normal
+                :font "Input Mono"
+                :height 130)))))
+
+(use-package git-gutter
+  :straight t
+  :config
+  (global-git-gutter-mode +1))
+
+(use-package hl-line
+  :straight '(hl-line :type built-in)
+  :config
+  (global-hl-line-mode +1))
+
+(use-package hl-todo
+  :straight t
+  :config
+  (global-hl-todo-mode +1))
+
+(use-package modus-themes
+  :straight t
+  :config
+  (load-theme 'modus-operandi))
+
+(use-package nerd-icons
+  :straight t
+  :init
+  (defun arkta/nerd-icons-maybe-install-fonts ()
+    (when (and (display-graphic-p)
+               (not (find-font (font-spec :family nerd-icons-font-family))))
+      ;; TODO: Maybe also reinstall them every month or so
+      (nerd-icons-install-fonts t)))
+  :hook ((after-init server-after-make-frame) . arkta/nerd-icons-maybe-install-fonts))
+
+(use-package rainbow-mode
+  :straight t
+  :init
+  (defun arkta/enable-rainbow ()
+    (rainbow-mode +1))
+  :hook (prog-mode . arkta/enable-rainbow))
+
+(use-package scroll-bar
+  :straight '(scroll-bar :type built-in)
+  :defer t
+  :config
+  (scroll-bar-mode -1))
+
+(use-package solaire-mode
+  :straight t
+  :config
+  (solaire-global-mode +1))
+
+(use-package time
+  :straight '(time :type built-in)
+  :custom
+  (display-time-default-load-average nil)
+  :config
+  (display-time-mode +1))
+
+(use-package tool-bar
+  :straight '(tool-bar :type built-in)
+  :defer t
+  :config
+  (tool-bar-mode -1))
+
+(provide 'arkta-cosmetic)
diff --git a/init.el b/init.el
index d4f3269..05184e0 100644
--- a/init.el
+++ b/init.el
@@ -198,6 +198,7 @@
 
 ;; HIC SVNT DRACONES
 
+(require 'arkta-cosmetic)
 (require 'arkta-project)
 
 (use-package ace-window
@@ -210,11 +211,6 @@
   :config
   (amx-mode +1))
 
-(use-package ansi-color
-  :hook (compilation-filter . ansi-color-compilation-filter)
-  :custom
-  (ansi-color-for-compilation-mode t))
-
 (use-package c-ts-mode
   :after treesit
   :straight '(c-ts-mode :type built-in)
@@ -236,31 +232,6 @@
                               ((parent-is "field_declaration_list") parent-bol c-ts-mode-indent-offset)
                               ,@(alist-get 'linux (c-ts-mode--indent-styles 'c))))))
 
-(use-package centaur-tabs
-  :straight t
-  :demand t
-  :init
-  (defun arkta/disable-centaur-tabs-mode ()
-    (centaur-tabs-local-mode +1))
-  :hook (dashboard-mode . arkta/disable-centaur-tabs-mode)
-  :bind (("C-x <C-right>" . centaur-tabs-forward)
-         ("C-x <right>"   . centaur-tabs-forward)
-         ("C-x <C-left>"  . centaur-tabs-backward)
-         ("C-x <left>"    . centaur-tabs-backward))
-  :custom
-  (centaur-tabs-style "alternate")
-  (centaur-tabs-height 35)
-  (centaur-tabs-icon-type 'nerd-icons)
-  (centaur-tabs-set-icons t)
-  (centaur-tabs-gray-out-icons 'buffer)
-  (centaur-tabs-set-bar 'over)
-  (centaur-tabs-set-close-button nil)
-  (centaur-tabs-set-modified-marker t)
-  (centaur-tabs-modified-marker "●")
-  (centaur-tabs-cycle-scope 'tabs)
-  :config
-  (centaur-tabs-mode +1))
-
 (use-package cmake-ts-mode
   :after treesit
   :straight '(cmake-ts-mode :type built-in)
@@ -331,47 +302,11 @@
   :config
   (dashboard-setup-startup-hook))
 
-(use-package display-fill-column-indicator
-  :straight '(display-fill-column-indicator :type built-in)
-  :demand t
-  :init
-  (defun arkta/disable-dfci ()
-    (display-fill-column-indicator-mode -1))
-  :hook (dashboard-mode . arkta/disable-dfci)
-  :config
-  (global-display-fill-column-indicator-mode +1))
-
-(use-package display-line-numbers
-  :straight '(display-line-numbers :type built-in)
-  :demand t
-  :init
-  (defun arkta/disable-dln ()
-    (display-line-numbers-mode -1))
-  :hook ((dashboard-mode help-mode) . arkta/disable-dln)
-  :config
-  (global-display-line-numbers-mode +1))
-
 (use-package dockerfile-ts-mode
   :after treesit
   :straight '(dockerfile-ts-mode :type built-in)
   :mode "Dockerfile\\'")
 
-(use-package doom-modeline
-  :straight t
-  :custom
-  (doom-modeline-bar-width 4)
-  (doom-modeline-battery t)
-  (doom-modeline-buffer-file-true-name t)
-  (doom-modeline-height 25)
-  (doom-modeline-hud t)
-  (doom-modeline-hud-min-height 6)
-  (doom-modeline-icon t)
-  (doom-modeline-percent-position nil)
-  (doom-modeline-project-detection 'project)
-  (doom-modeline-total-line-number t)
-  :config
-  (doom-modeline-mode +1))
-
 (use-package ebuild-mode
   :straight t
   :mode ("\\.ebuild\\'"
@@ -408,11 +343,6 @@
     (add-hook 'before-save-hook #'elixir-format nil t))
   :hook (elixir-mode . arkta/elixir-setup))
 
-(use-package emojify
-  :straight t
-  :config
-  (global-emojify-mode +1))
-
 (use-package elpher
   :straight t
   :commands (elpher)
@@ -423,15 +353,6 @@
   ;; This actually has to be hooked to after-init to be one of the first minor modes enabled
   :hook (after-init . envrc-global-mode))
 
-(use-package faces
-  :straight '(faces :type built-in)
-  :custom-face
-  (default ((t (:weight medium
-                :slant normal
-                :width normal
-                :font "Input Mono"
-                :height 130)))))
-
 (use-package gcmh
   :straight t
   :custom
@@ -445,11 +366,6 @@
   :straight t
   :mode "\\.gd\\'")
 
-(use-package git-gutter
-  :straight t
-  :config
-  (global-git-gutter-mode +1))
-
 (use-package go-ts-mode
   :after treesit
   :straight '(go-ts-mode :type built-in)
@@ -471,16 +387,6 @@
   :straight t
   :mode "\\.hs\\'")
 
-(use-package hl-line
-  :straight '(hl-line :type built-in)
-  :config
-  (global-hl-line-mode +1))
-
-(use-package hl-todo
-  :straight t
-  :config
-  (global-hl-todo-mode +1))
-
 (use-package ibuffer
   :straight '(ibuffer :type built-in)
   :bind (("C-x C-b" . ibuffer)
@@ -545,11 +451,6 @@
   :straight t
   :mode ("\\.md\\'" . gfm-mode))
 
-(use-package modus-themes
-  :straight t
-  :config
-  (load-theme 'modus-operandi))
-
 (use-package nasm-mode
   :straight t
   :mode ("\\.asm\\'"
@@ -559,16 +460,6 @@
     (set-tab-width 4))
   :hook (nasm-mode . arkta/nasm-setup))
 
-(use-package nerd-icons
-  :straight t
-  :init
-  (defun arkta/nerd-icons-maybe-install-fonts ()
-    (when (and (display-graphic-p)
-               (not (find-font (font-spec :family nerd-icons-font-family))))
-      ;; TODO: Maybe also reinstall them every month or so
-      (nerd-icons-install-fonts t)))
-  :hook ((after-init server-after-make-frame) . arkta/nerd-icons-maybe-install-fonts))
-
 (use-package nix-mode
   :straight t
   :mode "\\.nix\\'")
@@ -609,17 +500,6 @@
   :straight '(python :type built-in)
   :mode ("\\.py\\'" . python-ts-mode))
 
-(use-package rainbow-delimiters
-  :straight t
-  :hook ((emacs-lisp-mode lisp-mode scheme-mode) . rainbow-delimiters-mode))
-
-(use-package rainbow-mode
-  :straight t
-  :init
-  (defun arkta/enable-rainbow ()
-    (rainbow-mode +1))
-  :hook (prog-mode . arkta/enable-rainbow))
-
 (use-package ruby-ts-mode
   :after treesit
   :straight '(ruby-ts-mode :type built-in)
@@ -641,12 +521,6 @@
   :config
   (put 'module 'scheme-indent-function 2))
 
-(use-package scroll-bar
-  :straight '(scroll-bar :type built-in)
-  :defer t
-  :config
-  (scroll-bar-mode -1))
-
 (use-package server
   :config
   (setq server-socket-dir (expand-file-name local-dir "server")))
@@ -672,11 +546,6 @@
                               :repo "MatthewFluet/company-mlton")
     :hook (sml-mode . company-mlton-init)))
 
-(use-package solaire-mode
-  :straight t
-  :config
-  (solaire-global-mode +1))
-
 (use-package svelte-mode
   :straight t
   :mode ("\\.svelte\\'" "\\.svx\\'"))
@@ -688,24 +557,11 @@
          ("C-s" . swiper-isearch)
          ("C-r" . swiper-isearch-backward)))
 
-(use-package time
-  :straight '(time :type built-in)
-  :custom
-  (display-time-default-load-average nil)
-  :config
-  (display-time-mode +1))
-
 (use-package toml-ts-mode
   :after treesit
   :straight '(toml-ts-mode :type built-in)
   :mode "\\.toml\\'")
 
-(use-package tool-bar
-  :straight '(tool-bar :type built-in)
-  :defer t
-  :config
-  (tool-bar-mode -1))
-
 (use-package treemacs
   :straight t
   :commands (treemacs treemacs-select-window)