From 2150dd77e20f84eafd1689dc4d165a0a3b4462eb Mon Sep 17 00:00:00 2001
From: BardofSprites <89086143+BardofSprites@users.noreply.github.com>
Date: Mon, 30 Sep 2024 22:58:22 -0400
Subject: use-packageify

---
 bard-emacs-modules/bard-emacs-eshell.el | 21 ++++++++++-----
 bard-emacs-modules/bard-emacs-prog.el   | 45 ++++++++++-----------------------
 2 files changed, 28 insertions(+), 38 deletions(-)

(limited to 'bard-emacs-modules')

diff --git a/bard-emacs-modules/bard-emacs-eshell.el b/bard-emacs-modules/bard-emacs-eshell.el
index 36af151..e934922 100644
--- a/bard-emacs-modules/bard-emacs-eshell.el
+++ b/bard-emacs-modules/bard-emacs-eshell.el
@@ -1,5 +1,9 @@
 (use-package eshell
+  :ensure nil
+  :bind
+  (("C-z e" . eshell-switcher))
   :config
+  (require 'bard-eshell)
   ;; (setq eshell-banner-message "Time for another recreational programming session.\n\n")
   (setq eshell-banner-message
         '(format "%s %s\n %s\n"
@@ -23,12 +27,15 @@
 	      (defalias (car alias) (cdr alias)))
         bard/eshell-aliases))
 
-(define-key global-map (kbd "C-z e") #'eshell-switcher)
-(with-eval-after-load "esh-mode"
-  (define-key eshell-mode-map (kbd "C-c f") #'bard/eshell-find-file-at-point)
-  (define-key eshell-mode-map (kbd "C-c h") #'prot-eshell-narrow-output-highlight-regexp)
-  (define-key eshell-mode-map (kbd "C-c d") #'prot-eshell-complete-recent-dir)
-  (define-key eshell-mode-map (kbd "M-k") #'eshell-kill-input)
-  (define-key eshell-mode-map (kbd "C-c C-e") #'prot-eshell-export))
+(use-package eshell
+  :ensure nil
+  :after esh-mode
+  :bind
+  (:map eshell-mode-map
+        ("C-c C-e" . prot-eshell-export)
+        ("M-k"     . eshell-kill-input)
+        ("C-c C-d"   . prot-eshell-complete-recent-dir)
+        ("C-c C-h"   . prot-eshell-narrow-output-highlight-regexp)
+        ("C-c C-f"   . bard/eshell-find-file-at-point)))
 
 (provide 'bard-emacs-eshell)
diff --git a/bard-emacs-modules/bard-emacs-prog.el b/bard-emacs-modules/bard-emacs-prog.el
index 6e4fcf3..face65a 100644
--- a/bard-emacs-modules/bard-emacs-prog.el
+++ b/bard-emacs-modules/bard-emacs-prog.el
@@ -1,33 +1,18 @@
-;; Input methods
-(use-package emacs
-  :bind
-  (("<f10>" . toggle-input-method)))
-
-(use-package prog-mode
-  :hook
-  ((prog-mode . display-line-numbers-mode)
-   (prog-mode . whitespace-mode)
-   (prog-mode . hl-todo-mode)))
-
 (use-package haskell-mode
+  :ensure t
   :hook
   ((haskell-mode . interactive-haskell-mode)
    (haskell-mode . haskell-doc-mode)
    (haskell-mode . haskell-indent-mode))
-  :bind
-  (:map haskell-mode-map ("C-`" . complete)))
+  :config
+  (setq haskell-interactive-popup-errors nil))
 
 ;; CPP Mode
-(use-package prog-mode
+(use-package emacs
   :config
   (setq-default c-basic-offset 4))
 
-;;; Haskell
-
-;; disable ghci popups
-(use-package haskell-mode
-  :config
-  (setq haskell-interactive-popup-errors nil))
+;; Haskell
 
 (use-package emacs
   :config
@@ -39,8 +24,9 @@
     (setenv "PATH" (concat bard/ghcup-path ":" (getenv "PATH")))
     (add-to-list 'exec-path bard/ghcup-path)))
 
-;;; Lisp
+;; Lisp
 (use-package clojure-mode
+  :ensure t
   :bind
   (:map clojure-mode-map
 	    ("C-<tab>" . cider-switch-to-repl-buffer))
@@ -48,6 +34,7 @@
   (clojure-mode . paredit-mode))
 
 (use-package cider
+  :ensure t
   :bind
   (:map cider-repl-mode-map
 	("C-<tab>" . cider-switch-to-last-clojure-buffer)))
@@ -81,9 +68,6 @@
   (:map c++-mode-map
         ("C-c C-c" . project-compile)))
 
-(use-package haskell-mode
-  :ensure t)
-
 (use-package flycheck
   :ensure t
   :init
@@ -98,14 +82,14 @@
 		(ggtags-mode 1)))))
 
 ;; Version control
-(use-package magit
-  :ensure t
-  :bind
-  ("C-c g" . magit))
+(define-key global-map (kbd "C-c g") #'magit-status)
+(setq magit-repository-directories
+        '(("~/Code"          . 1)
+          ("~/Repositories"  . 1)
+          ("~/dotfiles-stow" . 0)))
 
 (use-package ada-mode
-  :after dired
-  :load-path "~/.emacs.d/old-ada/"
+  :load-path "~/.emacs.d/old-ada"
   :bind
   (:map ada-mode-map
 	("C-j" . dired-jump)))
@@ -119,4 +103,3 @@
   (add-hook 'prog-mode-hook 'diff-hl-mode))
 
 (provide 'bard-emacs-prog)
-;;; bard-emacs-prog.el ends here
-- 
cgit v1.2.3