tweaking use-package and adding ediff

README.org

@@ -7,7 +7,7 @@ Date: Sat, 27 Apr 2024 22:36:33 -0500
 - [[#init][Init]]
   - [[#startup-performance][Startup Performance]]
   - [[#set-basic-ui-config][Set basic UI config]]
-  - [[#lets-bootstrap-straightel][Let's bootstrap straight.el]]
+  - [[#package-management][Package Management]]
   - [[#other-ui][Other UI]]
   - [[#fix-nixos][Fix NixOS]]
   - [[#spell-check][Spell Check]]
@@ -40,6 +40,7 @@ Date: Sat, 27 Apr 2024 22:36:33 -0500
   - [[#window-management][Window Management]]
   - [[#help][Help]]
   - [[#format][Format]]
+  - [[#ediff][Ediff]]
   - [[#languages][Languages]]
   - [[#direnv][direnv]]
   - [[#file-management][File Management]]
@@ -227,7 +228,7 @@ This is to make sure Emacs doesn't add a newline in files that I don't want it t
 (setq require-final-newline nil)
 #+end_src
 
-** Let's bootstrap straight.el
+** Package Management
 :PROPERTIES:
 :ID:       20230524T150405.435338
 :END:
@@ -272,11 +273,12 @@ In order to make sure I can use melpa packages without straight...
 Now, let's turn on =use-package=.
 #+begin_src emacs-lisp
 (eval-when-compile (require 'use-package))
-#+end_src
-
-#+begin_src emacs-lisp
 (setq use-package-verbose t)
 (defalias 'yes-or-no-p 'y-or-n-p)
+
+;; (use-package use-package
+;;   :config
+;;   (add-to-list 'use-package-keywords :bind+ t))
 #+end_src
 
 Now let's make sure our package archives includes the newer org.
@@ -1181,6 +1183,9 @@ Part of this config includes some special capture templates for my work as a you
     (interactive)
     (chris/org-cycle-hide-drawers 'subtree))
   
+  :bind
+  (:map evil-normal-state-map
+   ("SPC g s" . org-sort-entries))
   :general
   (chris/leader-keys
     :states 'normal
@@ -3534,6 +3539,15 @@ Since I like to make my window manager handle a lot of the window management, I
   :defer t)
 #+end_src
 
+** Ediff
+Let's make it so that ediff will do alot of things betterer.
+#+begin_src emacs-lisp
+(use-package ediff
+  :commands (ediff ediff3 vc-ediff)
+  :custom
+  (ediff-window-setup-function 'ediff-setup-windows-plain))
+#+end_src
+
 ** Languages
 Before getting into languages, often times compilation of things use ansi-colors, so in order to make sure those characters get rendered properly, here we make sure that those colors work ok.
 

init.el

@@ -107,10 +107,13 @@
 (package-initialize)
 
 (eval-when-compile (require 'use-package))
-
 (setq use-package-verbose t)
 (defalias 'yes-or-no-p 'y-or-n-p)
 
+;; (use-package use-package
+;;   :config
+;;   (add-to-list 'use-package-keywords :bind+ t))
+
   (use-package command-log-mode
     :commands command-log-mode)
 
@@ -879,6 +882,9 @@ much faster. The hope is to also make this a faster version of imenu."
     (interactive)
     (chris/org-cycle-hide-drawers 'subtree))
   
+  :bind
+  (:map evil-normal-state-map
+   ("SPC g s" . org-sort-entries))
   :general
   (chris/leader-keys
     :states 'normal
@@ -2587,6 +2593,11 @@ current buffer's, reload dir-locals."
   (setq format-all-formatters '("Emacs Lisp" emacs-lisp))
   :defer t)
 
+(use-package ediff
+  :commands (ediff ediff3 vc-ediff)
+  :custom
+  (ediff-window-setup-function 'ediff-setup-windows-plain))
+
 (defvar read-symbol-positions-list nil)
 (add-to-list 'comint-output-filter-functions 'ansi-color-process-output)
 (add-hook 'comint-mode-hook 'ansi-color-for-comint-mode-on)