From faa81c40a3651c7e3397046d4889897df01ee7a6 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Wed, 1 Feb 2023 09:14:19 +0100
Subject: [PATCH] Put completion module in init.el

---
 .emacs.d/init.el                       | 29 ++++++++++++++++++++++++--
 .emacs.d/modules/tobmacs-completion.el | 27 ------------------------
 2 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 .emacs.d/modules/tobmacs-completion.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8a9b292..ddb375a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -41,6 +41,13 @@
 
 ;; -----------------------------------------------------------------
 
+(use-package corfu
+  :custom
+  (corfu-cycle t)
+  (corfu-preselect-first nil)
+  (corfu-auto t)
+  :init
+  (global-corfu-mode))
 
 (use-package ef-themes
   :config
@@ -88,7 +95,11 @@
            :italic-slant italic
            :line-spacing 0.2)))
   (fontaine-set-preset 'regular))
- 
+
+(use-package marginalia
+  :init
+  (marginalia-mode))
+
 (use-package modus-themes
   :config
   (setq modus-themes-variable-pitch-headings t
@@ -99,12 +110,26 @@
         modus-themes-completions 'opinionated
         modus-themes-mode-line '(accented borderless)))
 
+(use-package orderless
+  :custom
+  (completion-styles '(orderless basic))
+  (completion-category-overrides '((file (styles basic partial-completion)))))
+ 
 (use-package rainbow-delimiters
   :hook
   ((emacs-lisp-mode . rainbow-delimiters-mode)
    (clojure-mode . rainbow-delimiters-mode)))
 
-(require 'tobmacs-completion)
+(use-package savehist
+  :init
+  (savehist-mode))
+
+(use-package vertico
+  :init
+  (vertico-mode)
+  :config
+  (setq vertico-cycle t))
+
 (require 'tobmacs-editor)
 (require 'tobmacs-languages)
 (require 'tobmacs-org)
diff --git a/.emacs.d/modules/tobmacs-completion.el b/.emacs.d/modules/tobmacs-completion.el
deleted file mode 100644
index 6219fac..0000000
--- a/.emacs.d/modules/tobmacs-completion.el
+++ /dev/null
@@ -1,27 +0,0 @@
-(use-package vertico
-  :init
-  (vertico-mode))
-
-(use-package savehist
-  :init
-  (savehist-mode))
-
-(use-package orderless
-  :custom
-  (completion-styles '(orderless basic))
-  (completion-category-overrides '((file (styles basic partial-completion)))))
-
-(use-package marginalia
-  :init
-  (marginalia-mode))
-
-(use-package corfu
-  :custom
-  (corfu-cycle t)
-  (corfu-preselect-first nil)
-  (corfu-auto t)
-  :init
-  (global-corfu-mode))
-
-
-(provide 'tobmacs-completion)