From 8c7fc2ddb59045644db86026fc6e2f8328d48133 Mon Sep 17 00:00:00 2001
From: mir <mirmarq428@gmail.com>
Date: Tue, 23 Jan 2024 21:31:07 -0900
Subject: [PATCH] move simple packages into init.el

---
 init.el              | 10 ++++++++++
 lisp/mir-packages.el | 21 ---------------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/init.el b/init.el
index 0f3c214..80def73 100644
--- a/init.el
+++ b/init.el
@@ -304,6 +304,16 @@ If the current window occupies the whole frame, split it."
 ;;           (list '+elpaca-unload-eldoc 'elpaca--activate-package)))
 ;; (elpaca eldoc :build (+elpaca-eldoc-build-steps))
 
+(elpaca compat)
+(elpaca marginalia (marginalia-mode))
+(elpaca gcmh (gcmh-mode))
+(elpaca page-break-lines
+  (add-hook 'emacs-lisp-mode-hook #'page-break-lines-mode))
+(elpaca rainbow-mode
+  (add-hook 'prog-mode-hook #'rainbow-mode))
+(elpaca powershell
+  (add-to-list 'auto-mode-alist '("\\.ps1\\'" . powershell-mode)))
+
 (elpaca elpaca-use-package
   (elpaca-use-package-mode)
   (setq elpaca-use-package-by-default t))
diff --git a/lisp/mir-packages.el b/lisp/mir-packages.el
index 5bf18d8..8d5a6a1 100644
--- a/lisp/mir-packages.el
+++ b/lisp/mir-packages.el
@@ -8,8 +8,6 @@
 
 ;; (use-package no-littering) ;a bad start, and we need more
 
-(use-package compat)
-
 ;; diminish
 (use-package diminish
   :config (diminish 'visual-line-mode))
@@ -20,10 +18,6 @@
   :custom (default-input-method "japanese")
   :config (require 'mir-keybinds))
 (elpaca-wait)
-(use-package gcmh
-  :diminish
-  :init (gcmh-mode))
-
 (use-package eldoc-box
   :after eldoc
   :diminish (eldoc-mode eldoc-box-hover-at-point-mode)
@@ -262,8 +256,6 @@ behaviour.  Delete the frame after that command has exited"
   (general-define-key
    [remap switch-to-buffer] 'consult-buffer))
 ;; Minibuffer generic stuff
-(use-package marginalia
-  :init (marginalia-mode))
 (use-package orderless
   :custom
   (completion-styles '(orderless partial-completion basic))
@@ -402,10 +394,6 @@ targets."
   (load-theme 'airline-ravenpower t)
   :init (load-theme 'sv t))
 
-(use-package page-break-lines
-  :diminish
-  :hook (emacs-lisp-mode . page-break-lines-mode))
-
 ;; parentheses settingses
 (elpaca (paredit :depth nil)
   (use-package paredit
@@ -550,15 +538,6 @@ Return nil if DIR is not in a hugo project at all."
   :custom (rainbow-delimiters-max-face-count 2)
   :hook (prog-mode . rainbow-delimiters-mode))
 
-;; Hex colors
-(use-package rainbow-mode
-  :diminish
-  :hook (prog-mode . rainbow-mode))
-
-;; Nobody loves a good language
-(use-package powershell
-  :mode ("\\.ps1\\'" . powershell-mode))
-
 ;; c sharp; see https://www.reddit.com/r/emacs/comments/k8tnzg/help_setting_up_c_lsp_omnisharproslyn/
 ;; (there is nothing here because I'm not using c sharp...)