From 9377230e3bafd7c71d9e40be1e725bc01ea6b460 Mon Sep 17 00:00:00 2001
From: Mars <mars@pupbrained.xyz>
Date: Fri, 4 Oct 2024 19:01:46 -0400
Subject: [PATCH] ouighe

---
 .gitignore    |   5 ++
 config.org    | 128 +++++++++++++++++++++++++++++++++++++++++++++++++-
 early-init.el |   1 -
 3 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ce21b6..a29827d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
 elpaca/
+eln-cache/
+elpa/
+recentf
+transient/
+undo/
 config.el
diff --git a/config.org b/config.org
index c585711..1a40253 100644
--- a/config.org
+++ b/config.org
@@ -1,7 +1,6 @@
 #+TITLE: Emacs Configuration
 #+AUTHOR: Mars (@pupbrained)
 #+EMAIL: mars@pupbrained.xyz
-#+STARTUP: showeverything
 
 * Basic Setup
 
@@ -37,6 +36,7 @@
 #+begin_src emacs-lisp
   (setq initial-scratch-message nil)
   (setq initial-buffer-choice nil)
+
   (add-hook 'emacs-startup-hook
       (lambda ()
         (when (and (get-buffer "*scratch*")
@@ -44,6 +44,35 @@
     (kill-buffer "*scratch*"))))
 #+end_src
 
+** Dirvish
+
+#+begin_src emacs-lisp
+  (use-package dirvish
+    :ensure t
+    :config
+    (dirvish-override-dired-mode)
+    (dirvish-side-follow-mode)
+    (setq dired-mouse-drag-files t)
+    (setq mouse-drag-and-drop-region-cross-program t))
+
+  ;; Addtional syntax highlighting for dired
+  (use-package diredfl
+    :ensure t
+    :hook
+    ((dired-mode . diredfl-mode)
+     (dirvish-directory-view-mode . diredfl-mode))
+    :config
+    (set-face-attribute 'diredfl-dir-name nil :bold t))
+
+  (use-package all-the-icons
+    :ensure t)
+
+  (use-package ns-auto-titlebar
+    :ensure t
+    :config
+    (when (eq system-type 'darwin) (ns-auto-titlebar-mode)))
+#+end_src
+
 ** Fix Indents + Enable Autopairs
 
 #+begin_src emacs-lisp
@@ -66,6 +95,20 @@
     :config
     (evil-mode 1))
 
+  (use-package evil-collection
+    :ensure t
+    :config
+    (evil-collection-init))
+
+  (use-package evil-leader
+    :ensure t
+    :config
+    (global-evil-leader-mode)
+    (setq evil-leader/leader "<SPC>")
+    (evil-leader/set-key "a" #'eglot-code-actions)
+    (evil-leader/set-key "bd" #'kill-this-buffer)
+    (evil-leader/set-key "e" #'dirvish-side))
+
   (use-package eglot
     :hook (emacs-lisp-mode . eglot-ensure))
 
@@ -78,3 +121,86 @@
   (setq auto-save-default nil)
   (setq make-backup-files nil)
 #+end_src
+
+** Rainbow Delimiters
+
+#+begin_src emacs-lisp
+  (use-package rainbow-delimiters
+    :ensure t
+    :config
+    (add-hook 'prog-mode-hook 'rainbow-delimiters-mode))
+#+end_src
+
+** Disable Bars
+
+#+begin_src emacs-lisp
+  (menu-bar-mode -1)
+  (scroll-bar-mode -1)
+  (tool-bar-mode -1)
+#+end_src
+
+** Line Numbers
+
+#+begin_src emacs-lisp
+  (global-display-line-numbers-mode t)
+
+  (setq display-line-numbers-type 'relative)
+
+  (dolist (mode '(term-mode-hook
+      vterm-mode-hook
+      shell-mode-hook
+      dirvish-setup-hook
+      eshell-mode-hook))
+    (add-hook mode (lambda () (display-line-numbers-mode 0))))
+#+end_src
+
+** Vim-Style Scrolling
+
+#+begin_src emacs-lisp
+  (setq scroll-step 3
+        scroll-conservatively 9999)
+#+end_src
+
+** System-Specific Settings
+
+#+begin_src emacs-lisp
+  (cond
+   ((eq system-type 'darwin)
+    (setq default-frame-alist '((font . "Iosevka Comfy-14"))))
+   ((eq system-type 'gnu/linux)
+    (setq default-frame-alist '((font . "Maple Mono NF-12")
+        (undecorated . t)))))
+#+end_src
+
+** Use Short Answers
+
+#+begin_src emacs-lisp
+  (setq use-short-answers t)
+#+end_src
+
+** Undo Tree
+
+#+begin_src emacs-lisp
+  (use-package undo-tree
+    :ensure t
+    :demand t
+    :config
+    (global-undo-tree-mode)
+    (setq undo-tree-history-directory-alist '(("." . "~/.emacs.d/undo"))))
+#+end_src
+
+** Dashboard
+
+#+begin_src emacs-lisp
+  (use-package dashboard
+    :ensure t
+    :config
+    (dashboard-setup-startup-hook)
+    (setq dashboard-startup-banner 'logo)
+    (setq dashboard-center-content t)
+    (setq dashboard-vertically-center-content t)
+    (setq dashboard-startup-banner 'logo)
+    (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*")))
+    (setq recentf-exclude '("~/.emacs.d/.cache/treemacs-persist")))
+#+end_src
+
diff --git a/early-init.el b/early-init.el
index b7ae511..a3d7194 100644
--- a/early-init.el
+++ b/early-init.el
@@ -2,4 +2,3 @@
 (setq tab-always-indent 'complete)
 (setq text-mode-ispell-word-completion nil)
 (setq read-extended-command-predicate #'command-completion-default-include-p)
-