From d7d4eaed0966aa69c90f443d9fdac7dd33c7a695 Mon Sep 17 00:00:00 2001
From: Joseph Ferano <joseph@ferano.io>
Date: Mon, 22 Aug 2022 15:12:45 +0700
Subject: [PATCH] Bankrupt: Few fixes, adding restclient

---
 .emacs.bankruptcy/init.org | 27 ++++++++++++++++++++-------
 .emacs.vanilla/init.el     |  4 +++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.emacs.bankruptcy/init.org b/.emacs.bankruptcy/init.org
index 4435c89..d11fff0 100644
--- a/.emacs.bankruptcy/init.org
+++ b/.emacs.bankruptcy/init.org
@@ -120,6 +120,8 @@ literate file.
 
 #+begin_src emacs-lisp
 (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
+(load custom-file t)
+
 #+end_src
 
 This avoids those annoying *#backup#* files that get added and eventually slow down loading the file again.
@@ -194,8 +196,8 @@ Setup other stuff
 
 (straight-use-package 'doom-themes)
 (setq custom-safe-themes t)
-(load-theme 'doom-vibrant t)
-;; (load-theme 'doom-flatwhite t)
+;; (load-theme 'doom-vibrant t)
+(load-theme 'doom-one-light t)
 
 (straight-use-package 'ligature)
 (global-ligature-mode)
@@ -219,7 +221,6 @@ Setup other stuff
 (set-default 'truncate-lines nil)
 (set-default 'truncate-partial-width-windows nil)
 
-
 (add-hook 'before-save-hook 'whitespace-cleanup)
 #+end_src
 
@@ -235,10 +236,12 @@ Setup other stuff
   (setq org-edit-src-content-indentation 0)))
 (add-hook 'org-mode-hook (defun joe/org-hook ()
   (org-bullets-mode)
-  (org-indent-mode))
+  (org-indent-mode)))
 #+end_src
 
 ** VEMCO (Vertico Embark Marginalia Consult Orderless)
+Vertico Embark Marginalia Consult Orderless
+
 #+begin_src emacs-lisp
 (straight-use-package '(vertico :files (:defaults "extensions/*") :includes (vertico-directory)))
 ;; :bind (:map vertico-map
@@ -282,7 +285,7 @@ Setup other stuff
 (add-to-list 'dirvish-preview-dispatchers 'exa)
 (setq dired-listing-switches "-l --almost-all --human-readable --time-style=long-iso --group-directories-first --no-group")
 (setq dirvish-preview-dispatchers (cl-substitute 'pdf-preface 'pdf dirvish-preview-dispatchers))
-
+(define-key global-map (kbd "M--") #'dirvish)
 #+end_src
 
 ** Terminals/Shells
@@ -292,7 +295,9 @@ Setup other stuff
 (setq vterm-timer-delay 0.01)
 (setq vterm-buffer-name-string "VTerm - %s")
 (setq vterm-max-scrollback 100000)
+
 #+end_src
+
 ** Undo Tree
 #+begin_src emacs-lisp
 (straight-use-package 'undo-tree)
@@ -301,15 +306,17 @@ Setup other stuff
 (setq undo-tree-visualizer-diff t)
 (setq undo-tree-history-directory-alist `(("." . ,(expand-file-name "undo" user-emacs-directory))))
 #+end_src
+
 ** Which Key
 #+begin_src emacs-lisp
 (straight-use-package 'which-key)
 (setq which-key-idle-delay 0.3)
 (which-key-mode)
 #+end_src
+
 ** Text Editor
 
-Emacs is an amazing operating system, if only it had a good text editor...
+Emacs is an great operating system, if only it had a good text editor...
 
 *** Hydra
 #+begin_src emacs-lisp
@@ -327,6 +334,7 @@ Emacs is an amazing operating system, if only it had a good text editor...
   ("e" View-scroll-line-backward "line up")
 )
 #+end_src
+
 *** Avy
 #+begin_src emacs-lisp
 (straight-use-package 'avy)
@@ -341,6 +349,7 @@ Emacs is an amazing operating system, if only it had a good text editor...
 (define-key global-map (kbd "M-g )")  'avy-goto-close-paren)
 (define-key global-map (kbd "M-g P")  'avy-pop-mark)
 #+end_src
+
 *** Multiple Cursors
 #+begin_src emacs-lisp
 (straight-use-package 'multiple-cursors)
@@ -439,7 +448,6 @@ Emacs is an amazing operating system, if only it had a good text editor...
 (meow-global-mode t)
 #+end_src
 
-
 *** Boon
 #+begin_src emacs-lisp :tangle no
 (straight-use-package 'boon)
@@ -494,6 +502,11 @@ The best git porcelain/client I've ever used
 (straight-use-package 'magit)
 #+end_src
 
+** Restclient
+#+begin_src emacs-lisp
+(straight-use-package 'restclient)
+#+end_src
+
 ** Finish up
 
 #+begin_src emacs-lisp
diff --git a/.emacs.vanilla/init.el b/.emacs.vanilla/init.el
index 8d5905d..1143736 100644
--- a/.emacs.vanilla/init.el
+++ b/.emacs.vanilla/init.el
@@ -177,15 +177,17 @@ all of the evil keybindings in buffers like magit, without compromises."
 (require 'dirvish)
 (setq delete-by-moving-to-trash t)
 (setq dired-dwim-target t)
+(setq dirvish-override-dired-mode t)
 (setq dirvish-preview-dispatchers (cl-substitute 'pdf-preface 'pdf dirvish-preview-dispatchers))
 (dirvish-define-preview exa (file)
   "Use `exa' to generate directory preview."
   :require ("exa") ; tell Dirvish to check if we have the executable
   (when (file-directory-p file) ; we only interest in directories here
-    `(shell . ("exa" "--color=always" "-al" ,file)))) ; use the command output as preview
+    `(shell . ("exa" "--color=always" "-al" "--group-directories-first" ,file)))) ; use the command output as preview
 (setq dired-listing-switches "-l --almost-all --human-readable --time-style=long-iso --group-directories-first --no-group")
 (add-to-list 'dirvish-preview-dispatchers 'exa)
 (evil-define-key 'normal dirvish-mode-map (kbd "q") 'dirvish-quit)
+(evil-define-key 'normal 'global (kbd "-") 'dirvish)
 
 (defun joe/dired-open-file ()
   "In dired, open the file named on this line."