summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/config-utilities.el1
-rw-r--r--modules/keybindings.el16
-rw-r--r--modules/prog-general.el5
-rw-r--r--modules/system-utils.el8
-rw-r--r--modules/treesitter-config.el11
-rw-r--r--modules/user-constants.el26
6 files changed, 25 insertions, 42 deletions
diff --git a/modules/config-utilities.el b/modules/config-utilities.el
index 240c6d14..aeeed5fc 100644
--- a/modules/config-utilities.el
+++ b/modules/config-utilities.el
@@ -40,7 +40,6 @@ Will recompile natively if supported, or byte-compiled if not."
(byte-recompile-directory user-emacs-directory 0)))
(message "Cancelled recompilation of %s" user-emacs-directory))))
-
;; ---------------------- Delete Emacs Home Compiled Files ---------------------
;; removes all compiled files and deletes the eln directory
diff --git a/modules/keybindings.el b/modules/keybindings.el
index bf23ebc4..5d8b6bdd 100644
--- a/modules/keybindings.el
+++ b/modules/keybindings.el
@@ -73,22 +73,6 @@
(global-set-key (kbd "C-c ?") 'hydra-general/body)
-;; ------------------------------ Jump To Commands -----------------------------
-;; quick access for commonly used files
-
-(defvar jump-to-keymap nil "Jump-to commonly used files/directories/commands.")
-(setq jump-to-keymap (make-sparse-keymap))
-(global-set-key (kbd "C-c j") jump-to-keymap)
-(define-key jump-to-keymap (kbd "E") #'(lambda () (interactive) (find-file emacs-early-init-file)))
-(define-key jump-to-keymap (kbd "I") #'(lambda () (interactive) (find-file emacs-init-file)))
-(define-key jump-to-keymap (kbd "i") #'(lambda () (interactive) (find-file inbox-file)))
-(define-key jump-to-keymap (kbd "A") #'(lambda () (interactive) (find-file article-archive)))
-(define-key jump-to-keymap (kbd "a") #'(lambda () (interactive) (find-file article-file)))
-(define-key jump-to-keymap (kbd "c") #'(lambda () (interactive) (find-file contacts-file)))
-(define-key jump-to-keymap (kbd "s") #'(lambda () (interactive) (find-file schedule-file)))
-(define-key jump-to-keymap (kbd "m") #'(lambda () (interactive) (find-file macros-file)))
-(define-key jump-to-keymap (kbd "$") #'(lambda () (interactive) (find-file ledger-file)))
-
;; ---------------------------- General Keybindings ----------------------------
;; Avoid hostile bindings
diff --git a/modules/prog-general.el b/modules/prog-general.el
index 1f1b8e4e..b6b58494 100644
--- a/modules/prog-general.el
+++ b/modules/prog-general.el
@@ -125,7 +125,7 @@ If none exists, it opens magit-status."
(advice-add 'ripgrep-regexp :after #'switch-to-ripgrep-results))
;; ---------------------------------- Snippets ---------------------------------
-;; reusable code and text.
+;; reusable code and text
(use-package yasnippet
:defer 1
@@ -160,7 +160,8 @@ If none exists, it opens magit-status."
(prog-mode . symbol-overlay-mode))
;; ------------------------------ Highlight TODOs ------------------------------
-;; Highlights todo keywords in code for easy spotting
+;; Highlights todo keywords in code for easy spotting.
+
(use-package hl-todo
:defer 1
:hook
diff --git a/modules/system-utils.el b/modules/system-utils.el
index 62f73dc8..0592f928 100644
--- a/modules/system-utils.el
+++ b/modules/system-utils.el
@@ -168,14 +168,6 @@ Don't automatically display output buffers, but keep them in buffer list."
;; make scratch buffer an org-mode buffer
(setq initial-major-mode 'org-mode)
-;; persists scratch contents between Emacs sessions
-(use-package persistent-scratch
- :defer .5
- :custom
- (persistent-scratch-save-file (expand-file-name ".scratch" user-emacs-directory))
- :config
- (persistent-scratch-setup-default))
-
;; -------------------------------- World Clock --------------------------------
;; displays current time in various timezones
diff --git a/modules/treesitter-config.el b/modules/treesitter-config.el
index c19564e6..1ceabb78 100644
--- a/modules/treesitter-config.el
+++ b/modules/treesitter-config.el
@@ -10,17 +10,6 @@
(use-package tree-sitter
:defer .5)
- ;; :hook ((ruby-mode . tree-sitter-hl-mode)
- ;; (js-mode . tree-sitter-hl-mode)
- ;; (rust-mode . tree-sitter-hl-mode)
- ;; (sh-mode . tree-sitter-hl-mode)
- ;; (c-mode . tree-sitter-hl-mode)
- ;; (typescript-mode . tree-sitter-hl-mode)
- ;; (go-mode . tree-sitter-hl-mode)))
-
-;; (use-package tree-sitter-langs
-;; :ensure 'nil ;; built-in
-;; :after tree-sitter)
;; ----------------------- Grammar Installation ----------------------
;; installs tree-sitter grammars if they're absent
diff --git a/modules/user-constants.el b/modules/user-constants.el
index 2702f978..f42389d5 100644
--- a/modules/user-constants.el
+++ b/modules/user-constants.el
@@ -1,13 +1,15 @@
;;; user-constants.el --- User Constants -*- lexical-binding: t; -*-
;;; Commentary:
-;; user file locations are defined here.
-;; if they aren't found, they are created.
+
+;; User file locations are defined here. A file or directory is created if it
+;; doesn't exist. Note the keybindings at the bottom for quick access.
;;; Code:
;; ------------------------ Directory And File Constants -----------------------
+## DIRECTORIES
(defconst emacs-init-file (concat user-emacs-directory "init.el")
"The location of Emacs's main init file.")
@@ -32,7 +34,7 @@
(defconst snippets-dir (concat sync-dir "snippets/")
"The location of ya-snippet snippets.")
-
+### FILES
(defvar schedule-file (concat sync-dir "schedule.org")
"The location of the org file containing scheduled events.")
@@ -80,7 +82,23 @@
article-file
article-archive
ledger-file
- macros-file))
+ macros-file))
+
+;; ------------------------------ Jump To Commands -----------------------------
+;; quick access for commonly used files
+
+(defvar jump-to-keymap nil "Jump-to commonly used files/directories/commands.")
+(setq jump-to-keymap (make-sparse-keymap))
+(global-set-key (kbd "C-c j") jump-to-keymap)
+(define-key jump-to-keymap (kbd "s") #'(lambda () (interactive) (find-file schedule-file)))
+(define-key jump-to-keymap (kbd "i") #'(lambda () (interactive) (find-file inbox-file)))
+(define-key jump-to-keymap (kbd "c") #'(lambda () (interactive) (find-file contacts-file)))
+(define-key jump-to-keymap (kbd "a") #'(lambda () (interactive) (find-file article-file)))
+(define-key jump-to-keymap (kbd "A") #'(lambda () (interactive) (find-file article-archive)))
+(define-key jump-to-keymap (kbd "$") #'(lambda () (interactive) (find-file ledger-file)))
+(define-key jump-to-keymap (kbd "m") #'(lambda () (interactive) (find-file macros-file)))
+(define-key jump-to-keymap (kbd "I") #'(lambda () (interactive) (find-file emacs-init-file)))
+
(provide 'user-constants)
;;; user-constants.el ends here.