From ccb38d300fa1438079a30618bfc0d73665f1f38d Mon Sep 17 00:00:00 2001
From: MitchMarq42 <dr.m.perseos@gmail.com>
Date: Wed, 14 Dec 2022 22:33:02 -0900
Subject: [PATCH] Prune old Straight declarations

---
 lisp/mitch-packages.el | 63 ++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 39 deletions(-)

diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 213a468..2e20ced 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -66,7 +66,6 @@
 
 ;; Keybinding manager
 (elpaca-use-package general
-  ;; :straight t
   :config (mitch/general-config))
 
 ;; (elpaca-use-package use-package-ensure-system-package)
@@ -103,26 +102,21 @@
   :init (evil-mode t)
   :config (mitch/evil-config))
 (elpaca-use-package evil-collection
-  ;; :straight t
   :after evil
   :diminish evil-collection-unimpaired-mode
   :config (evil-collection-init))
 (elpaca-use-package evil-commentary
-  ;; :straight t
   :diminish 'evil-commentary-mode
   :config (evil-commentary-mode)
   :hook (prog-mode . evil-commentary-mode))
 (elpaca-use-package evil-surround
-  ;; :straight t
   :diminish 'global-evil-surround-mode
   :hook (prog-mode . evil-surround-mode)
   :config (global-evil-surround-mode 1))
 (elpaca-use-package evil-matchit
-  ;; :straight t
   :diminish 'evil-matchit-mode
   :config (global-evil-matchit-mode 1))
 (elpaca-use-package evil-terminal-cursor-changer
-  ;; :straight t
   :after evil
   :diminish
   :if (not (display-graphic-p))
@@ -139,8 +133,9 @@
   :after evil
   :if (< (string-to-number emacs-version) 28)
   :diminish)
-(elpaca-use-package (altcaps :host github :repo "protesilaos/altcaps")
-  ;; :straight (:type git :host github :repo "protesilaos/altcaps")
+(elpaca-use-package (altcaps
+		     :host github
+		     :repo "protesilaos/altcaps")
   :general (general-define-key
 	    :states 'visual
 	    "`" 'altcaps-region))
@@ -189,10 +184,9 @@ This is taken from a website that I can't remember at the moment."
 (elpaca-use-package eshell-syntax-highlighting
   :after eshell
   :hook (eshell-mode . eshell-syntax-highlighting-mode))
-(elpaca-use-package (eshell-dat :repo "https://git.mitchmarq42.xyz/mitch/eshell-dat")
-  :after eshell
-  ;; :straight (:type git :repo "https://git.mitchmarq42.xyz/mitch/eshell-dat")
-  )
+(elpaca-use-package (eshell-dat
+		     :repo "https://git.mitchmarq42.xyz/mitch/eshell-dat")
+  :after eshell)
 (elpaca-use-package eshell-prompt-extras
   :after eshell
   :custom
@@ -581,10 +575,9 @@ See https://emacs.stackexchange.com/questions/2538/how-to-define-additional-mode
 ;;   (org-appear-autoentities t)
 ;;   (org-appear-autokeywords t)
 ;;   (org-appear-autosubmarkers t))
-(elpaca-use-package (org-pretty-table :host github :repo "Fuco1/org-pretty-table")
-  ;; :straight (:type git
-  ;; 		   :host github
-  ;; 		   :repo "Fuco1/org-pretty-table")
+(elpaca-use-package (org-pretty-table
+		     :host github
+		     :repo "Fuco1/org-pretty-table")
   :diminish
   :hook (org-mode . org-pretty-table-mode))
 (elpaca-use-package ox-hugo
@@ -773,17 +766,13 @@ Return nil if DIR is not in a hugo project at all."
 (elpaca-use-package pcmpl-args
   :after eshell)
 
-(elpaca-use-package (popon :type git
-			   :repo "https://codeberg.org/akib/emacs-popon")
-  ;; :straight
-  ;; (:type git
-  ;; 	 :repo "https://codeberg.org/akib/emacs-popon")
+(elpaca-use-package (popon
+		     :type git
+		     :repo "https://codeberg.org/akib/emacs-popon")
   :if (not (display-graphic-p)))
-(elpaca-use-package (corfu-terminal :type git
-				    :repo "https://codeberg.org/akib/emacs-corfu-terminal")
-  ;; :straight
-  ;; (:type git
-  ;; 	 :repo "https://codeberg.org/akib/emacs-corfu-terminal")
+(elpaca-use-package (corfu-terminal
+		     :type git
+		     :repo "https://codeberg.org/akib/emacs-corfu-terminal")
   :after popon
   :init (unless
 	    (display-graphic-p)
@@ -825,17 +814,13 @@ Return nil if DIR is not in a hugo project at all."
 	    :states 'normal
 	    "RET" 'hkey-either))
 
-(elpaca-use-package (dconf-mode :type git :repo "https://git.mitchmarq42.xyz/mitch/dconf-mode.el")
-  ;; :straight
-  ;; (:type git
-  ;; 	 :repo "https://git.mitchmarq42.xyz/mitch/dconf-mode.el")
-  )
+(elpaca-use-package (dconf-mode
+		     :type git
+		     :repo "https://git.mitchmarq42.xyz/mitch/dconf-mode.el"))
 
-(elpaca-use-package (info-variable-pitch :host github
-	 :repo "kisaragi-hiu/info-variable-pitch")
-  ;; :straight
-  ;; (:type git :host github
-  ;; 	 :repo "kisaragi-hiu/info-variable-pitch")
+(elpaca-use-package (info-variable-pitch
+		     :host github
+		     :repo "kisaragi-hiu/info-variable-pitch")
   :config
   (add-hook 'Info-mode-hook #'info-variable-pitch-mode))
 
@@ -904,14 +889,14 @@ Return nil if DIR is not in a hugo project at all."
   :config (require 'dwim-shell-commands)
   :commands dwim-shell-commands-kill-process)
 
-(elpaca-use-package (youtube-sub-extractor :host github :repo "agzam/youtube-sub-extractor.el")
-  ;; :straight (:type git :host github :repo "agzam/youtube-sub-extractor.el")
+(elpaca-use-package (youtube-sub-extractor
+		     :host github
+		     :repo "agzam/youtube-sub-extractor.el")
   :custom (youtube-sub-extractor-timestamps 'left-margin)
   :commands youtube-sub-extractor-extract-subs)
 
 ;; Cheat sheet
 (elpaca-use-package (cheat-sh :host github :repo "davep/cheat-sh.el")
-  ;; :straight (:type git :host github :repo "davep/cheat-sh.el")
   :commands cheat-sh)
 
 (provide 'mitch-packages)