From 4b1238fa4f7208e4bd5a74518eac320b48af92c4 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Sat, 15 Mar 2025 14:53:19 -0400
Subject: [PATCH] Add git ignore and organize init.el somewhat

---
 config/emacs/.config/emacs/.gitignore |  8 +++
 config/emacs/.config/emacs/init.el    | 86 ++++++++++++++++-----------
 2 files changed, 59 insertions(+), 35 deletions(-)
 create mode 100644 config/emacs/.config/emacs/.gitignore

diff --git a/config/emacs/.config/emacs/.gitignore b/config/emacs/.config/emacs/.gitignore
new file mode 100644
index 0000000..1794812
--- /dev/null
+++ b/config/emacs/.config/emacs/.gitignore
@@ -0,0 +1,8 @@
+*cache*
+*eshell*
+*elpa*
+*log*
+.lsp*
+saves
+auto-save-list
+*transient*
\ No newline at end of file
diff --git a/config/emacs/.config/emacs/init.el b/config/emacs/.config/emacs/init.el
index 1eda6b3..a6ec794 100644
--- a/config/emacs/.config/emacs/init.el
+++ b/config/emacs/.config/emacs/init.el
@@ -1,44 +1,52 @@
-;;; -*- lexical-binding: t -*-
-;;; package --- jams experimental emacs config
-;;; commentary --- not much
+;;; init.el --- James' Emacs config -*- lexical-binding: t -*-
+;;;
+;;; Author: James Dixon <notjamesdixon@gmail.com>
+;;; Maintainer: James Dixon <notjamesdixon@gmail.com>
+;;;
+;;; Commentary:
+;;; Emacs from scratch (somewhat), this is my ~~story~~ config
+;;; ((((((((((((((((((((!!!GNU EMACS!!!))))))))))))))))))))
+;;;
 
 ;;; Code:
-(setq inhibit-startup-message t) ; Don't show the splash screen
-(setq inhibit-splash-screen t)   ; Do not show splash screen
-(setq visible-bell t)            ; Flash when the bell rings
-(setq frame-resize-pixelwise t)  ; Yes, I would like to be able to **resize** emacs, thanks!
+(setq inhibit-startup-message t)        ; Don't show the splash screen
+(setq inhibit-splash-screen t)          ; Do not show splash screen
+(setq visible-bell t)                   ; Flash when the bell rings
+(setq frame-resize-pixelwise t)         ; Yes, I would like to be able to **resize** emacs, thanks!
+(global-display-line-numbers-mode 1)	; Display line numbers
+(column-number-mode -1)			; Toggle column number display in the mode line.
+(tool-bar-mode -1)			; Disable tool bar
+(scroll-bar-mode -1)			; Disable scroll bar
+(transient-mark-mode 1)			; Easier starting of marks/regions
+(delete-selection-mode 1)		; Easier deleting of marks/regions
 
+(set-frame-font "Maple Mono 12" nil t)
+(load-theme 'modus-vivendi t)
+
+;; More memory for Garbage Collection
 (setq gc-cons-threshold-original gc-cons-threshold)
 (setq gc-cons-threshold (* 1024 1024 100))
 
-(set-frame-font "Recursive 12" nil t)
-
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
-(column-number-mode)
-
-(global-display-line-numbers-mode 1)
-(load-theme 'modus-vivendi t)
-
 ;; Auto-refresh buffers when files on disk change.
 (global-auto-revert-mode t)
-(delete-selection-mode 1)
-
 ;; Place backups in a separate folder.
-(setq backup-directory-alist `(("." . "~/.emacs.d/saves")))
-(setq auto-save-file-name-transforms `((".*" "~/.emacs.d/saves/" t)))
+(setq backup-directory-alist `(("." . "~/.config/emacs/saves")))
+(setq auto-save-file-name-transforms `((".*" "~/.config/emacs/saves/" t)))
+(set-register ?e (find-file (or user-init-file "")))
 
+;; package init w/ melpa
 (require 'package)
 (add-to-list 'package-archives
 	     '("melpa" . "https://melpa.org/packages/"))
 (package-initialize)
 
+;; use-package install and init
 (unless (package-installed-p 'use-package)
   (package-install 'use-package))
 
+;; start evil
 (unless (package-installed-p 'evil)
   (package-install 'evil))
-
 (setq evil-want-C-u-scroll t)
 (setq evil-want-keybinding nil)
 (require 'evil)
@@ -50,9 +58,13 @@
   :init
   (evil-collection-init))
 
-(transient-mark-mode 1)
+(use-package evil-surround
+  :ensure t
+  :config
+  (global-evil-surround-mode 1))
+;; end evil
 
-(set-register ?e (find-file (or user-init-file "")))
+;; writing
 (global-set-key (kbd "C-c a") #'org-agenda)
 (global-set-key (kbd "C-c c") #'org-capture)
 
@@ -62,6 +74,7 @@
   :init (setq markdown-command "multimarkdown")
   :bind (:map markdown-mode-map
 	      ("C-c C-e" . markdown-do)))
+;; end writing
 
 (use-package dired
   :ensure nil
@@ -71,10 +84,7 @@
 (use-package magit
   :ensure t)
 
-(use-package multiple-cursors
-  :ensure t)
-(global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
-
+;; show more vertcal suggestions on M-x
 (use-package vertico
   :ensure t
   :init
@@ -90,6 +100,10 @@
   :ensure t
   :init)
 
+(use-package multiple-cursors
+  :ensure t)
+(global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
+
 (use-package which-key
   :ensure t
   :defer t
@@ -100,23 +114,25 @@
   :init (global-flycheck-mode))
 
 (use-package company
-  ;; Download company if not found
   :ensure t
   :init
-  ;; Turn on company after emacs starts up
   (global-company-mode))
-  
+
 (use-package lsp-mode
   :ensure t
-  :hook (( ;; and any other mode you want to hook into lsp
-          prog-mode) . lsp-deferred))
+  :hook ((prog-mode) . lsp-deferred))
 
+;; fun
 (use-package rainbow-delimiters
-    :ensure t
-    :hook (prog-mode . rainbow-delimiters-mode))
+  :ensure t
+  :defer t
+  :hook ((prog-mode) . rainbow-delimiters-mode))
 
 (setq mode-line-format(list '(:eval (list (nyan-create)))))
+(use-package nyan-mode
+  :ensure t)
 
-(nyan-mode)
+(use-package fireplace
+  :ensure t)
 
 ;;; init.el ends here