From f2a60f0a3d8c90de737602556db71fda205c3bd3 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 18 Aug 2022 12:18:08 +0700 Subject: [PATCH] Init clean up --- .emacs.vanilla/init.el | 113 ++++++++++++----------------------------- 1 file changed, 32 insertions(+), 81 deletions(-) diff --git a/.emacs.vanilla/init.el b/.emacs.vanilla/init.el index d58d1fd..694434c 100644 --- a/.emacs.vanilla/init.el +++ b/.emacs.vanilla/init.el @@ -15,32 +15,18 @@ (set-default-coding-systems 'utf-8) (set-terminal-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8) -(define-key key-translation-map (kbd "ESC") (kbd "C-g")) +;; (define-key key-translation-map (kbd "ESC") (kbd "C-g")) -(add-hook 'text-mode-hook (lambda () (setq fill-column 90) (turn-on-auto-fill))) +(add-hook 'text-mode-hook (lambda () (setq fill-column 100) (turn-on-auto-fill))) (put 'narrow-to-region 'disabled nil) (require 'server) (if (not (server-running-p)) (server-start)) (add-hook 'prog-mode (lambda () (modify-syntax-entry ?_ "w"))) + (setq default-directory "/home/joe") - -;; Visuals -(scroll-bar-mode -1) -(tool-bar-mode -1) -(menu-bar-mode -1) -(tooltip-mode -1) - -(defun joe/flash-mode-line () - (invert-face 'mode-line) - (run-with-timer 0.1 nil #'invert-face 'mode-line)) - -;; (setq visible-bell nil ring-bell-function 'joe/flash-mode-line) (setq-default display-line-numbers 'relative) -(dolist (mode '(dashboard-mode-hook org-mode-hook term-mode-hook eww-mode-hook vterm-mode-hook eshell-mode-hook dired-mode-hook shell-mode-hook magit-mode-hook)) - (add-hook mode (lambda () (display-line-numbers-mode 0)))) - (make-variable-buffer-local 'global-hl-line-mode) (set-window-margins nil 0) (setq-default right-fringe-width 10) @@ -51,11 +37,17 @@ (global-hl-line-mode +1) (column-number-mode +1) -(set-face-attribute 'default nil :font "Fira Code Nerd Font" :height 105) -(setq-default line-spacing 5) -(add-hook 'dashboard-mode-hook (lambda () (setq-local line-spacing 12))) -(set-face-foreground 'minibuffer-prompt nil) +(dolist (mode '(dashboard-mode-hook org-mode-hook term-mode-hook eww-mode-hook vterm-mode-hook eshell-mode-hook dired-mode-hook shell-mode-hook magit-mode-hook)) + (add-hook mode (lambda () (display-line-numbers-mode 0)))) + +(set-face-attribute 'default nil :font "Fira Code Nerd Font" :height 105) + +;; Visuals +(scroll-bar-mode -1) +(tool-bar-mode -1) +(menu-bar-mode -1) +(tooltip-mode -1) ;; Text Settings (setq-default c-basic-offset 4) ;; This is annoying @@ -65,6 +57,18 @@ (set-default 'truncate-lines t) (set-default 'truncate-partial-width-windows nil) +(setq-default line-spacing 5) +(add-hook 'dashboard-mode-hook (lambda () (setq-local line-spacing 12))) + +(add-hook 'before-save-hook 'whitespace-cleanup) + +;; (setq visible-bell nil ring-bell-function 'joe/flash-mode-line) +;; (defun joe/flash-mode-line () +;; (invert-face 'mode-line) +;; (run-with-timer 0.1 nil #'invert-face 'mode-line)) + +;; (set-face-foreground 'minibuffer-prompt nil) + (defadvice text-scale-increase (around all-buffers (arg) activate) (dolist (buffer (buffer-list)) (with-current-buffer buffer @@ -98,6 +102,7 @@ all of the evil keybindings in buffers like magit, without compromises." (interactive) (revert-buffer :ignore-auto :noconfirm)) +;; Packages (require 'package) (setq package-archives '(("org" . "http://orgmode.org/elpa/") @@ -105,9 +110,6 @@ all of the evil keybindings in buffers like magit, without compromises." ("melpa" . "https://melpa.org/packages/"))) ;; ("marmalade" . "http://marmalade-repo.org/packages/"))) -(add-hook 'before-save-hook 'whitespace-cleanup) -;; Packages - (package-initialize) ;; Why we use this line @@ -121,16 +123,8 @@ all of the evil keybindings in buffers like magit, without compromises." ;; If there is more than one, they won't work right. '(ansi-color-faces-vector [default default default italic underline success warning error]) - '(beacon-color "#f2777a") '(custom-safe-themes '("aaa4c36ce00e572784d424554dcc9641c82d1155370770e231e10c649b59a074" default)) - '(feebleline-msg-functions - '((feebleline-line-number :align right :post "" :fmt "%5s") - (feebleline-column-number :pre ":" :fmt "%-2s") - (feebleline-file-directory :face feebleline-dir-face :post "") - (feebleline-file-or-buffer-name :face font-lock-keyword-face :post "") - (feebleline-file-modified-star :face font-lock-warning-face :post "") - (feebleline-git-branch :face feebleline-git-face :pre " - "))) '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id) '(frame-background-mode 'dark) '(org-agenda-files '("~/todo.org")) @@ -142,9 +136,6 @@ all of the evil keybindings in buffers like magit, without compromises." ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(evil-goggles-delete-face ((t (:inherit 'shadow)))) - '(evil-goggles-paste-face ((t (:inherit 'lazy-highlight)))) - '(evil-goggles-yank-face ((t (:inherit 'isearch-fail)))) '(magit-diff-hunk-heading-highlight ((t (:extend t :background "cornflower blue" :foreground "#212337" :weight bold))))) (dolist (p package-selected-packages) @@ -155,7 +146,6 @@ all of the evil keybindings in buffers like magit, without compromises." (load-theme 'doom-vibrant t) ;; (load-theme 'doom-flatwhite t) - (setq evil-want-keybinding nil) (setq evil-undo-system 'undo-tree) (setq evil-want-C-u-scroll t) @@ -325,11 +315,6 @@ all of the evil keybindings in buffers like magit, without compromises." (require 'olivetti) (setq olivetti-minimum-body-width 120) -;; (require 'selectrum) -;; (require 'prescient) -;; (selectrum-mode +1) -;; (selectrum-prescient-mode +1) -;; (prescient-persist-mode +1) ;; VEMCO (require 'vertico) @@ -516,8 +501,9 @@ all of the evil keybindings in buffers like magit, without compromises." t) ;either `t' (selected window), `main', `root', or an arbitrary valid window (direction . below) ;`below' (window) or `bottom' (of frame) - (window-height . 0.33) ;absolute (10) or relative (0.3) - ))) + ;absolute (10) or relative (0.3) + (window-height . 0.33)))) + ;; (dap-register-debug-template "NetCoreDdg Launch (4)" ;; (list :type "coreclr" ;; :request "launch" @@ -538,16 +524,6 @@ all of the evil keybindings in buffers like magit, without compromises." ;; (require 'slime) ;; (setq inferior-lisp-program "/usr/bin/sbcl") -;; (require 'feebleline) -;; (feebleline-mode) -;; (setq feebleline-msg-functions -;; '((feebleline-git-branch :align right :face feebleline-git-face :pre " - ") -;; (feebleline-file-directory :align right :face feebleline-dir-face :post "") -;; (feebleline-file-or-buffer-name :align right :face font-lock-keyword-face :post "") -;; (feebleline-file-modified-star :align right :face font-lock-warning-face :post "") -;; (feebleline-line-number :align right :post "" :fmt "%5s") -;; (feebleline-column-number :align right :pre ":" :fmt "%-2s"))) - ;; (add-hook 'slime-mode-hook ;; (lambda () ;; ;; (setq global-hl-line-mode nil) @@ -557,40 +533,15 @@ all of the evil keybindings in buffers like magit, without compromises." ;; (evil-define-key 'normal slime-repl-mode-map (kbd "C-k") 'evil-window-up))) ;; (setq slime-contribs '(slime-fancy slime-company)) -;; (define-advice fit-frame-to-buffer (:around (f &rest args) dont-skip-ws-for-mini-frame) -;; (cl-letf* ((orig (symbol-function #'window-text-pixel-size)) -;; ((symbol-function #'window-text-pixel-size) -;; (lambda (win from to &rest args) -;; (apply orig -;; (append (list win from -;; (if (and (window-minibuffer-p win) -;; (frame-root-window-p win) -;; (eq t to)) -;; nil -;; to)) -;; args))))) -;; (apply f args))) - - ;; (require 'eglot) ;; (require 'eglot-fsharp) ;; (require 'consult-eglot) -;; (require 'sublimity) -;; (require 'sublimity-scroll) -;; (sublimity-mode 1) -;; (setq sublimity-scroll-weight 14 -;; sublimity-scroll-drift-length 6) - ;; TODO: Packages to check out ;; expand-region ;; projectile ;; Hydra (we can use it for some of the ideas I've had about repeating and arranging stuff) ;; CTRLF (figure out if it does anything interesting) - -;; exec-path-from-shell -;; markdown-preview-mode -;; markdown-mode -;; sly -;; ))) -;; '(send-mail-function (quote smtpmail-send-it))) +;; exec-path-from-shell +;; markdown-preview-mode +;; markdown-mode