6 files changed, 68 insertions, 103 deletions
diff --git a/.config/emacs/bd-development.el b/.config/emacs/bd-development.el
index ef61f17..4329948 100644
--- a/.config/emacs/bd-development.el
+++ b/.config/emacs/bd-development.el
@@ -6,8 +6,12 @@
   (untabify (point-min) (point-max))
   (indent-region (point-min) (point-max)))
 
-(require 'display-line-numbers)
+(defun remote-shell ()
+  (interactive)
+  (let ((default-directory "/ssh:bdunahu@perch.cs.colostate.edu:"))
+    (shell)))
 
+(require 'display-line-numbers)
 (defcustom display-line-numbers-exempt-modes
   '(vterm-mode eshell-mode shell-mode term-mode ansi-term-mode image-mode doc-view-mode newsticker-treeview-mode newsticker-treeview-item-mode dired-mode org-agenda-mode)
   "Major modes on which to disable line numbers."
@@ -70,7 +74,8 @@ Exempt major modes are defined in `display-line-numbers-exempt-modes'."
   :commands magit-status
   :custom
   (magit-define-global-key-bindings 'recommended))
-; do not prompt me
+
+;; do not prompt me
 (setq vc-follow-symlinks t)
 
 (use-package python
diff --git a/.config/emacs/bd-wm.el b/.config/emacs/bd-wm.el
index 06b20ed..ae45e7b 100644
--- a/.config/emacs/bd-wm.el
+++ b/.config/emacs/bd-wm.el
@@ -1,7 +1,5 @@
 ;; -*- lexical-binding: t; -*-
 
-(winner-mode 1)
-
 (defun bd/exwm-update-class ()
   "Changes the buffer name to reflect the class name for
 that buffer."
diff --git a/.config/emacs/bookmarks b/.config/emacs/bookmarks
deleted file mode 100644
index 72d8115..0000000
--- a/.config/emacs/bookmarks
+++ /dev/null
@@ -1,23 +0,0 @@
-;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8-emacs; mode: lisp-data -*-
-;;; This format is meant to be slightly human-readable;
-;;; nevertheless, you probably don't want to edit it.
-;;; -*- End Of Bookmark File Format Version Stamp -*-
-(("org-capture-last-stored"
- (filename . "~/Personal/roam/agenda/agenda_tasks.org")
- (front-context-string . "** TODO Fix paus")
- (rear-context-string . "ox\n\n* Unsorted\n\n")
- (position . 917)
- (last-modified 26000 61282 867384 301000))
-("emacs-dired"
- (filename . "~/.config/emacs/")
- (front-context-string . "auto-save-list\n ")
- (rear-context-string . "0K Dec 22 22:30 ")
- (position . 187)
- (last-modified 25991 13342 785210 917000))
-("agenda"
- (filename . "~/Personal/roam/agenda/agenda_tasks.org")
- (front-context-string . ":PROPERTIES:\n:ID")
- (rear-context-string)
- (position . 1)
- (last-modified 25991 16926 960521 263000))
-)
diff --git a/.config/emacs/early-init.el b/.config/emacs/early-init.el
index 8138bb3..a80caf9 100644
--- a/.config/emacs/early-init.el
+++ b/.config/emacs/early-init.el
@@ -4,16 +4,6 @@
 (setq package-archives nil)
 
 
-(defun bd/display-startup-time ()
-  (message "Emacs loaded in %s with %d garbage collections."
-           (format "%.2f seconds"
-                   (float-time
-                    (time-subtract after-init-time before-init-time)))
-           gcs-done))
-
-(add-hook 'emacs-startup-hook #'bd/display-startup-time)
-
-
 (push '(menu-bar-lines . 0) default-frame-alist)
 (push '(tool-bar-lines . 0) default-frame-alist)
 (push '(background-color . "#000000") default-frame-alist)
diff --git a/.config/emacs/essential.el b/.config/emacs/essential.el
new file mode 100644
index 0000000..c6df385
--- /dev/null
+++ b/.config/emacs/essential.el
@@ -0,0 +1,47 @@
+;; -*- lexical-binding: t; -*-
+
+
+;;;; packages
+(require 'package)
+(add-to-list 'load-path "/home/bdunahu/.guix-profile/share/emacs/site-lisp")
+(guix-emacs-autoload-packages)
+
+(require 'use-package-ensure)
+(setopt use-package-always-ensure t)
+;; (setq use-package-verbose t) ; for debugging
+
+
+(setenv "PATH" (format "%s:%s" "/home/bdunahu/Personal/scripts/" (getenv "PATH")))
+
+
+;;;; do not store customized setting (automatic) here
+(setq custom-file "/home/bdunahu/.config/emacs/custom.el")
+(load custom-file t)
+
+
+;;;; defaults
+(global-unset-key (kbd "C-z"))
+(global-unset-key (kbd "C-x C-z")) ; terrible binding
+(global-set-key (kbd "C-z =") 'text-scale-increase)
+(global-set-key (kbd "C-z -") 'text-scale-decrease)
+
+(setopt inhibit-startup-message t)
+(menu-bar-mode -1)
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+
+(global-auto-revert-mode 1)
+(winner-mode 1)
+
+;; allow one side window per side of frame
+(setopt window-sides-slots '(1 1 1 1))
+
+(setopt scroll-up-aggressively '0.0
+	scroll-down-aggressively '0.0)
+
+;; move backups to tmp folder
+(setopt backup-directory-alist `(("." . ,(expand-file-name "tmp/backups/" user-emacs-directory))))
+(make-directory (expand-file-name "tmp/auto_saves/" user-emacs-directory) t)
+;; move auto-saves to tmp folder
+(setopt auto-save-list-file-prefix (expand-file-name "tmp/auto_saves/sessions/" user-emacs-directory)
+      auto-save-file-transforms `((".*" ,(expand-file-name "tmp/auto_saves/" user-emacs-directory) t)))
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index e312bca..762e5b1 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,24 +1,11 @@
 ;; -*- lexical-binding: t; -*-
 
 
-(require 'package)
-(add-to-list 'load-path "/home/bdunahu/.guix-profile/share/emacs/site-lisp")
-(guix-emacs-autoload-packages)
-
-(require 'use-package-ensure)
-(setq use-package-always-ensure t)
-;; (setq use-package-verbose t) ; for debugging
-
-
 ;; reduce the frequency of garbage collection by making it happen on
 ;; each 50MB of allocated data (the default is on every 0.76MB)
-(setq gc-cons-threshold 50000000)
-
-(setenv "PATH" (format "%s:%s" "/home/bdunahu/Personal/scripts/" (getenv "PATH")))
+(setopt gc-cons-threshold 50000000)
 
-;;; do not store customized setting (automatic) here
-(setq custom-file "/home/bdunahu/.config/emacs/custom.el")
-(load custom-file t)
+(load (expand-file-name "$HOME/.config/emacs/bd-essential.el"))
 
 (defun request-sudo ()
   "Uses TRAMP to edit currently opened file as root."
@@ -46,16 +33,9 @@ open URL at point."
 (defun clamp (lower-bound upper-bound value)
   (max lower-bound (min value upper-bound)))
 
-(defun remote-shell ()
-  (interactive)
-  (let ((default-directory "/ssh:bdunahu@perch.cs.colostate.edu:"))
-    (shell)))
-
-(global-unset-key (kbd "C-z"))
-
-(load "/home/bdunahu/.config/emacs/bd-org.el")
-(load "/home/bdunahu/.config/emacs/bd-emms.el")
-(load "/home/bdunahu/.config/emacs/bd-development.el")
+(load (expand-file-name "$HOME/.config/emacs/bd-org.el"))
+(load (expand-file-name "$HOME/.config/emacs/bd-emms.el"))
+(load (expand-file-name "$HOME/.config/emacs/bd-development.el"))
 
 (use-package newsticker
   :demand t
@@ -82,34 +62,15 @@ open URL at point."
                        ("TECH" ("GNU/Linux" "Arch Linux: Recent news updates" "Parabola GNU/Linux-libre: Recent news updates") "suckless.org news")
                        ("VIDEO" "Mental Outlaw" "Luke Smith" "Brent Westbrook" "Bugswriter" "Protesilaos Stravrou"))))
 
-(setq erc-server "irc.libera.chat"
-      erc-nick "Isaz"
-      erc-user-full-name "bd"
-      erc-kill-buffer-on-part t
-      erc-autojoin-channels-alist '(("irc.libera.char" "#parabola" "#emacs")))
+(setopt erc-server "irc.libera.chat"
+	erc-nick "Isaz"
+	erc-user-full-name "bd"
+	erc-kill-buffer-on-part t
+	erc-autojoin-channels-alist '(("irc.libera.char" "#parabola" "#emacs")))
 (defalias 'erc 'erc-tls)
 
 ;; dired
-(setq dired-listing-switches "-alh")
-
-(setq inhibit-startup-message t)
-(menu-bar-mode -1)
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
-
-;; move backups to tmp folder
-(setq backup-directory-alist `(("." . ,(expand-file-name "tmp/backups/" user-emacs-directory))))
-(make-directory (expand-file-name "tmp/auto_saves/" user-emacs-directory) t)
-;; move auto-saves to tmp folder
-(setq auto-save-list-file-prefix (expand-file-name "tmp/auto_saves/sessions/" user-emacs-directory)
-      auto-save-file-transforms `((".*" ,(expand-file-name "tmp/auto_saves/" user-emacs-directory) t)))
-
-(setq scroll-up-aggressively '0.0
-      scroll-down-aggressively '0.0)
-
-(global-auto-revert-mode 1)
-
-(setq fit-window-to-buffer-horizontally t)
+(setopt dired-listing-switches "-alh")
 
 (use-package vertico
   :init
@@ -117,23 +78,10 @@ open URL at point."
   :custom
   (vertico-cycle t))
 
-;; allow one side window per side of frame
-(setq window-sides-slots '(1 1 1 1))
-
-(global-unset-key (kbd "C-x C-z")) ; unbind suspend-frame--terrible spot for binding
-
 ;; dired
 (global-set-key (kbd "C-z d") 'dired-jump)
 
-;; text-scale
-(global-set-key (kbd "C-z =") 'text-scale-increase)
-(global-set-key (kbd "C-z -") 'text-scale-decrease)
-
-(load "/home/bdunahu/.config/emacs/bd-wm.el")
-(load "/home/bdunahu/.config/emacs/bd-mode-and-themes.el")
-
-(setq gc-cons-threshold 800000)
+(load (expand-file-name "$HOME/.config/emacs/bd-wm.el"))
+(load (expand-file-name "$HOME/.config/emacs/bd-mode-and-themes.el"))
 
-;; packages to consider:
-;;; pydocs
-;;; yasnippit
+(setopt gc-cons-threshold 800000)