3 files changed, 45 insertions, 39 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 3802e44..b723cad 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,41 +1,5 @@
-(setq backup-directory-alist '(("." . "~/.cache/emacs-backup"))
-    backup-by-copying t
-    version-control t
-    delete-old-versions t
-    kept-new-versions 20
-    kept-old-versions 5)
-
-;; window
-(add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
-(add-to-list 'default-frame-alist '(ns-appearance . dark))
-(add-to-list 'default-frame-alist '(fullscreen . maximized))
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
-(menu-bar-mode -1)
-(setq column-number-mode t)
-(setopt display-fill-column-indicator-column 120)
-
-;; Prevent Extraneous Tabs
-(setq indent-tabs-mode nil)
-(setq tab-width 4)
-(defvaralias 'c-basic-offset 'tab-width)
-
-;; Font
-(set-frame-font "JetBrains Mono 14" nil t)
-
-;; Relative Line Numbers
-(display-line-numbers-mode)
-(setq-default display-line-numbers 'relative)
-
-;; Remove whitespace at the end of lines and change tabs to 4 spaces
-(defun remove-trailing-whitespace-before-save-hook ()
-  (progn
-    (if (not (string-match ".*makefile.*" (message "%s" major-mode)))
-        (untabify (point-min) (point-max)))
-    (delete-trailing-whitespace)))
-(add-hook 'before-save-hook 'remove-trailing-whitespace-before-save-hook)
-
 (add-to-list 'load-path "~/.emacs.d/lisp")
+(require 'set)
 (require 'melpa-setup)
 (require 'theme-setup)
 (when (not (eq system-type 'windows-nt))
@@ -43,7 +7,8 @@
 (require 'evil-setup)
 (require 'tree-sitter-setup)
 (require 'magit-setup)
-(require 'lsp-setup)
+(when (eq (getenv "EMACS_IGNORE_LSP") nil)
+    (require 'lsp-setup))
 
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
diff --git a/.emacs.d/lisp/set.el b/.emacs.d/lisp/set.el
new file mode 100644
index 0000000..4d8a8ef
--- /dev/null
+++ b/.emacs.d/lisp/set.el
@@ -0,0 +1,40 @@
+;; Set ~/.cache/emacs-backup as the backup directory instead of the current
+;; working directory.
+(setq backup-directory-alist '(("." . "~/.cache/emacs-backup"))
+    backup-by-copying t
+    version-control t
+    delete-old-versions t
+    kept-new-versions 20
+    kept-old-versions 5)
+
+;; window
+(add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
+(add-to-list 'default-frame-alist '(ns-appearance . dark))
+(add-to-list 'default-frame-alist '(fullscreen . maximized))
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+(menu-bar-mode -1)
+(setq column-number-mode t)
+(setopt display-fill-column-indicator-column 120)
+
+;; Prevent Extraneous Tabs
+(setq indent-tabs-mode nil)
+(setq tab-width 4)
+(defvaralias 'c-basic-offset 'tab-width)
+
+;; Font
+(set-frame-font "JetBrains Mono 14" nil t)
+
+;; Relative Line Numbers
+(display-line-numbers-mode)
+(setq-default display-line-numbers 'relative)
+
+;; Remove whitespace at the end of lines and change tabs to 4 spaces
+(defun remove-trailing-whitespace-before-save-hook ()
+  (progn
+    (if (not (string-match ".*makefile.*" (message "%s" major-mode)))
+        (untabify (point-min) (point-max)))
+    (delete-trailing-whitespace)))
+(add-hook 'before-save-hook 'remove-trailing-whitespace-before-save-hook)
+
+(provide 'set)
diff --git a/.emacs.d/lisp/vterm-setup.el b/.emacs.d/lisp/vterm-setup.el
index dbdea29..e8e71a9 100644
--- a/.emacs.d/lisp/vterm-setup.el
+++ b/.emacs.d/lisp/vterm-setup.el
@@ -1,6 +1,8 @@
 (use-package vterm
     :ensure t)
 
+(setq vterm-kill-buffer-on-exit t)
+
 (set-face-attribute 'vterm-color-black          nil :foreground "#171421" :background "#171421")
 (set-face-attribute 'vterm-color-red            nil :foreground "#C01C28" :background "#C01C28")
 (set-face-attribute 'vterm-color-green          nil :foreground "#26A269" :background "#26A269")
@@ -19,4 +21,3 @@
 (set-face-attribute 'vterm-color-bright-white   nil :foreground "#FFFFFF" :background "#FFFFFF")
 
 (provide 'vterm-setup)
-