From 3b9d66f9620f3a06d76cd832872f7dae30904462 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Mon, 13 Feb 2023 08:58:27 +0100
Subject: [PATCH] Put editor module in init.el

---
 .emacs.d/init.el                   | 68 +++++++++++++++++++++++++++---
 .emacs.d/modules/tobmacs-editor.el | 58 -------------------------
 2 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 .emacs.d/modules/tobmacs-editor.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e809a98..da58e59 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,7 +1,7 @@
 (add-hook 'emacs-startup-hook
-	  (lambda ()
-	    (message "tobmacs loaded in %s."
-		     (emacs-init-time))))
+          (lambda ()
+            (message "tobmacs loaded in %s."
+                     (emacs-init-time))))
 
 (set-default-coding-systems 'utf-8)
 (customize-set-variable 'visible-bell 1)
@@ -41,6 +41,11 @@
 
 ;; -----------------------------------------------------------------
 
+
+(use-package avy
+  :bind
+  ("M-j" . 'avy-goto-char-timer))
+
 (use-package cider
   :defer t)
 
@@ -73,6 +78,16 @@
   :init
   (global-corfu-mode))
 
+(use-package dired
+  :ensure nil
+  :init
+  (setq dired-dwim-target t))
+
+(use-package dumb-jump
+  :config
+  (add-hook 'xref-backend-functions #'dumb-jump-xref-activate)
+  (setq xref-show-definitions-function #'xref-show-definitions-completing-read))
+
 (use-package ef-themes
   :config
   (setq ef-themes-headings
@@ -85,6 +100,44 @@
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'ef-winter :no-confirm))
 
+(use-package emacs
+  :config
+  (global-auto-revert-mode)
+  (minibuffer-electric-default-mode)
+  (electric-pair-mode)
+
+  (setq
+   auto-save-file-name-transforms `((".*" ,temporary-file-directory t))
+   backup-directory-alist `((".*" . ,temporary-file-directory))
+   coding-system-for-read 'utf-8
+   coding-system-for-write 'utf-8
+   create-lockfiles nil
+   default-process-coding-system '(utf-8-unix . utf-8-unix)
+   delete-by-moving-to-trash t
+   isearch-allow-motion t
+   locale-coding-system 'utf-8
+   next-line-add-newlines t
+   sentence-end-double-space nil
+   tab-bar-new-tab-choice "*scratch*"
+   tab-bar-show nil
+   user-full-name "Tobias Ostner"
+   user-mail-address "tobias.ostner@gmail.com")
+
+  (setq-default indent-tabs-mode nil)
+
+  (set-charset-priority 'unicode)
+  (set-terminal-coding-system 'utf-8)
+  (set-keyboard-coding-system 'utf-8)
+  (set-selection-coding-system 'utf-8)
+  (prefer-coding-system 'utf-8)
+
+  (when (fboundp 'mac-auto-operator-composition-mode)
+    (mac-auto-operator-composition-mode)))
+
+(use-package flycheck
+  :init
+  (global-flycheck-mode))
+
 (use-package fontaine
   :config
   (setq fontaine-presets
@@ -157,6 +210,13 @@
   :init
   (global-org-modern-mode))
 
+(use-package parinfer-rust-mode
+  :hook (emacs-lisp-mode clojure-mode)
+  :init
+  (setq parinfer-rust-library (expand-file-name
+                               "parinfer-rust/parinfer-rust-darwin.so"
+                               user-emacs-directory)))
+
 (use-package rainbow-delimiters
   :hook
   ((emacs-lisp-mode . rainbow-delimiters-mode)
@@ -182,5 +242,3 @@
   :config
   (setq vertico-cycle t))
 
-(require 'tobmacs-editor)
-
diff --git a/.emacs.d/modules/tobmacs-editor.el b/.emacs.d/modules/tobmacs-editor.el
deleted file mode 100644
index 2588767..0000000
--- a/.emacs.d/modules/tobmacs-editor.el
+++ /dev/null
@@ -1,58 +0,0 @@
-(setq-default indent-tabs-mode nil)
-
-(add-hook 'prog-mode-hook 'mac-auto-operator-composition-mode)
-
-(use-package emacs
-  :config
-  (global-auto-revert-mode)
-  (minibuffer-electric-default-mode 1)
-  
-  (setq
-   auto-save-file-name-transforms `((".*" ,temporary-file-directory t))
-   backup-directory-alist `((".*" . ,temporary-file-directory))
-   coding-system-for-read 'utf-8
-   coding-system-for-write 'utf-8
-   create-lockfiles nil
-   default-process-coding-system '(utf-8-unix . utf-8-unix)
-   delete-by-moving-to-trash t
-   isearch-allow-motion t
-   locale-coding-system 'utf-8
-   next-line-add-newlines t
-   sentence-end-double-space nil
-   tab-bar-new-tab-choice "*scratch*"
-   tab-bar-show nil
-   user-full-name "Tobias Ostner"
-   user-mail-address "tobias.ostner@gmail.com")
-
-  (set-charset-priority 'unicode)
-  (set-terminal-coding-system 'utf-8)
-  (set-keyboard-coding-system 'utf-8)
-  (set-selection-coding-system 'utf-8)
-  (prefer-coding-system 'utf-8))
-                              
-(use-package parinfer-rust-mode
-  :hook (emacs-lisp-mode clojure-mode)
-  :init
-  (setq parinfer-rust-library (expand-file-name
-                               "parinfer-rust/parinfer-rust-darwin.so"
-                               user-emacs-directory)))
-
-(use-package electric
-  :hook swift-mode)
-
-(use-package flycheck
-  :init
-  (global-flycheck-mode))
-
-(use-package avy
-  :bind
-  ("M-j" . 'avy-goto-char-timer))
-
-(use-package dumb-jump
-  :config
-  (add-hook 'xref-backend-functions #'dumb-jump-xref-activate)
-  (setq xref-show-definitions-function #'xref-show-definitions-completing-read))
-
-(provide 'tobmacs-editor)
-
-