From 6c4ddc7718fd143d9886289168cf2d4102672642 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Thu, 9 Feb 2023 08:56:34 +0100
Subject: [PATCH] Put custom languages module into init.el

---
 .emacs.d/init.el                      | 25 ++++++++++++++++++++-
 .emacs.d/modules/tobmacs-languages.el | 31 ---------------------------
 2 files changed, 24 insertions(+), 32 deletions(-)
 delete mode 100644 .emacs.d/modules/tobmacs-languages.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 05dddcb..e96795f 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -41,6 +41,17 @@
 
 ;; -----------------------------------------------------------------
 
+(use-package cider
+  :defer t)
+
+(use-package clj-refactor
+  :hook clojure-mode)
+
+(use-package clojure-mode
+  :config
+  (use-package flycheck-clj-kondo)
+  (require 'flycheck-clj-kondo))
+
 (use-package consult
   :bind
   (("C-x b" . consult-buffer)
@@ -49,7 +60,8 @@
    ("C-x p b" . consult-project-buffer)
    ("M-y" . consult-yank-pop)
    ("M-g g" . consult-goto-line)
-   ("M-g M-g" . consult-goto-line))
+   ("M-g M-g" . consult-goto-line)
+   ("M-i" . consult-imenu))
   :hook
   (completion-list-mode . consult-preview-at-point-mode))
 
@@ -108,6 +120,10 @@
            :line-spacing 0.2)))
   (fontaine-set-preset 'regular))
 
+(use-package lsp-mode
+  :hook (swift-mode . lsp)
+  :commands lsp)
+
 (use-package marginalia
   :init
   (marginalia-mode))
@@ -136,6 +152,13 @@
   :init
   (savehist-mode))
 
+(use-package lsp-sourcekit
+  :after lsp-mode
+  :config
+  (setq lsp-sourcekit-executable "/Library/Developer/CommandLineTools/usr/bin/sourcekit-lsp"))
+
+(use-package swift-mode)
+
 (use-package vertico
   :init
   (vertico-mode)
diff --git a/.emacs.d/modules/tobmacs-languages.el b/.emacs.d/modules/tobmacs-languages.el
deleted file mode 100644
index d2c4341..0000000
--- a/.emacs.d/modules/tobmacs-languages.el
+++ /dev/null
@@ -1,31 +0,0 @@
-;; Clojure
-
-(use-package clojure-mode
-  :config
-  (use-package flycheck-clj-kondo)
-  (require 'flycheck-clj-kondo))
-
-(use-package cider
-  :defer t)
-
-(use-package clj-refactor
-  :init
-  (add-hook 'clojure-mode-hook 'clj-refactor-mode))
-
-;; LSP
-
-(use-package lsp-mode
-  :hook (swift-mode . lsp)
-  :commands lsp)
-
-;; Swift
-
-(use-package swift-mode)
-
-(use-package lsp-sourcekit
-  :after lsp-mode
-  :config
-  (setq lsp-sourcekit-executable "/Library/Developer/CommandLineTools/usr/bin/sourcekit-lsp"))
-  
-
-(provide 'tobmacs-languages)