From 048815eab6feab07cbcf3ba6d6ffcf73fd19f5b9 Mon Sep 17 00:00:00 2001 From: mattkae Date: Sun, 9 Jul 2023 21:14:52 -0400 Subject: Finishing off some silly things that I did --- lisp/general.el | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/lisp/general.el b/lisp/general.el index d7e74d4..55e1fa4 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -1,5 +1,8 @@ ;;; Code: +(set-language-environment "UTF-8") +(set-default-coding-systems 'utf-8) + ;; Initialization screen (setq fancy-splash-image "~/.emacs.d/images/true.png") (setq inhibit-startup-screen t @@ -18,7 +21,17 @@ kept-old-versions 2 version-control t) -(add-to-list 'default-frame-alist '(font . "JetBrains Mono-10")) +(set-face-attribute 'default nil + :family "JetBrains Mono" + :height 100 + :weight 'normal + :width 'normal) + +;; Don't ask to kill when we have an open line number +(setq-default confirm-kill-processes nil) + +;; Line highlighting +(global-hl-line-mode 1) ;; Initial major mode (setq initial-major-mode 'text-mode) @@ -38,23 +51,9 @@ :config (mood-line-mode)) - -;; Reload user init file -(defun reload-init-file () - (interactive) - (load-file user-init-file)) - -(global-set-key (kbd "C-c C-l") 'reload-init-file) - ;; Disable major modes on long lines (global-so-long-mode 1) -(use-package fast-scroll - :ensure t - :config - (fast-scroll-config) - (fast-scroll-mode 1)) - ;; Ability to fold regions (add-hook 'javascript-mode-hook (lambda () (hs-minor-mode 1))) (add-hook 'typescript-mode-hook (lambda () (hs-minor-mode 1))) @@ -66,15 +65,6 @@ (setq-default indent-tabs-mode nil) ; use spaces only if nil (setq-default tab-width 2) ; Assuming you want your tabs to be four spaces wide -(set-face-attribute 'default nil - :family "JetBrains Mono" - :height 100 - :weight 'normal - :width 'normal) - -(set-language-environment "UTF-8") -(set-default-coding-systems 'utf-8) - ;; Cursor (setq-default cursor-type 'bar) (blink-cursor-mode 1) @@ -82,12 +72,6 @@ ;; Line numbers (global-display-line-numbers-mode 1) -;; Margin -(use-package perfect-margin - :ensure t - :config - (perfect-margin-mode t)) - ;; Show number of matches (setq isearch-lazy-highlight t) (setq isearch-lazy-count t) @@ -175,9 +159,6 @@ ) -;; Don't ask to kill when we have an open line number -(setq-default confirm-kill-processes nil) - ;; Tree (use-package treemacs :ensure t @@ -190,9 +171,6 @@ :ensure t :after (treemacs projectile)) -;; Line highlighting -(global-hl-line-mode 1) - ;; Git (use-package git-gutter -- cgit v1.2.1