From 3618bc5b7dab82e89636c29b16b756a6ea0d82bf Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 25 Sep 2021 12:23:33 -0500 Subject: Remove speed up It makes bookmark.el.gz not able to load ??? for some reason??? something related to file-name-handler-alist --- early-init.el | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'early-init.el') diff --git a/early-init.el b/early-init.el index c569cc5..eeb5e57 100644 --- a/early-init.el +++ b/early-init.el @@ -24,23 +24,6 @@ load-path) (require 'acdw) (require 'acdw-frame) -;;; Speed up init -;; see doom-emacs, et al. - -(setq acdw/orig-file-name-handler-alist file-name-handler-alist - file-name-handler-alist nil - gc-cons-percentage 0.8 - gc-cons-threshold most-positive-fixnum - load-prefer-newer noninteractive) - -(add-hook 'after-init-hook - (defun after-init@reset () - "Reset `file-name-handler-alist' and garbage collection." - (setq gc-cons-percentage 0.1 - gc-cons-threshold (* 800 1024 1024)) - (dolist (handler file-name-handler-alist) - (add-to-list 'acdw/orig-file-name-handler-alist handler)) - (setq file-name-handler-alist acdw/orig-file-name-handler-alist))) ;;; Frame settings (setq default-frame-alist ; Remove most UI -- cgit 1.4.1-21-gabe81 From e70d19dc6ea0d42b2d75716146d23870b378a83d Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 25 Sep 2021 12:28:57 -0500 Subject: Rot13 my email taken from pkal. Is this a good idea /now/, even though my email's already been on there for ages? myeshhhhhhhh~~~~ --- early-init.el | 2 +- eshell.el | 2 +- gnus.el | 2 +- init.el | 4 ++-- lisp/acdw-compat.el | 2 +- lisp/acdw-erc.el | 2 +- lisp/acdw-eshell.el | 2 +- lisp/acdw-fonts.el | 2 +- lisp/acdw-modeline.el | 2 +- lisp/acdw-re.el | 2 +- lisp/acdw-reading.el | 2 +- lisp/acdw-setup.el | 2 +- lisp/acdw.el | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'early-init.el') diff --git a/early-init.el b/early-init.el index eeb5e57..9e410b1 100644 --- a/early-init.el +++ b/early-init.el @@ -1,5 +1,5 @@ ;;; early-init.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: Sometime during Covid-19, 2020 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/eshell.el b/eshell.el index dc96b8e..05f90bc 100644 --- a/eshell.el +++ b/eshell.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2021 Case Duckworth -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Keywords: ;; This program is free software; you can redistribute it and/or modify diff --git a/gnus.el b/gnus.el index 4a38733..7a2cdc7 100644 --- a/gnus.el +++ b/gnus.el @@ -1,6 +1,6 @@ ;;; gnus.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: Sometime during Covid-19, 2020 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/init.el b/init.el index 30bcd97..5e20566 100644 --- a/init.el +++ b/init.el @@ -1,6 +1,6 @@ ;;; init.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: Sometime during Covid-19, 2020 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs @@ -79,7 +79,7 @@ (acdw/require-private) (:option user-full-name "Case Duckworth" - user-mail-address "acdw@acdw.net") + user-mail-address (rot13-string "npqj@npqj.arg")) (when-let ((default-directory (expand-file-name-exists-p "pkg/" user-emacs-directory))) diff --git a/lisp/acdw-compat.el b/lisp/acdw-compat.el index 353a1f1..3221191 100644 --- a/lisp/acdw-compat.el +++ b/lisp/acdw-compat.el @@ -1,6 +1,6 @@ ;;; acdw-compat.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: 2021-08-11 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/lisp/acdw-erc.el b/lisp/acdw-erc.el index dd8525d..beea24b 100644 --- a/lisp/acdw-erc.el +++ b/lisp/acdw-erc.el @@ -1,6 +1,6 @@ ;;; acdw-erc.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: 24 May 2021 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/lisp/acdw-eshell.el b/lisp/acdw-eshell.el index fa27299..eedcc8b 100644 --- a/lisp/acdw-eshell.el +++ b/lisp/acdw-eshell.el @@ -1,6 +1,6 @@ ;;; acdw-eshell.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/lisp/acdw-fonts.el b/lisp/acdw-fonts.el index 1b73af7..0fce172 100644 --- a/lisp/acdw-fonts.el +++ b/lisp/acdw-fonts.el @@ -1,6 +1,6 @@ ;;; acdw-fonts.el -- font setup -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: Sometime during Covid-19, 2020 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/lisp/acdw-modeline.el b/lisp/acdw-modeline.el index 6e5afb8..3836c81 100644 --- a/lisp/acdw-modeline.el +++ b/lisp/acdw-modeline.el @@ -1,5 +1,5 @@ ;;; acdw-modeline.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: Sometime during Covid-19, 2020 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/lisp/acdw-re.el b/lisp/acdw-re.el index f7df241..db46af1 100644 --- a/lisp/acdw-re.el +++ b/lisp/acdw-re.el @@ -1,5 +1,5 @@ ;;; acdw-re.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: 2021-04-29 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs diff --git a/lisp/acdw-reading.el b/lisp/acdw-reading.el index e21cff9..26ee5e8 100644 --- a/lisp/acdw-reading.el +++ b/lisp/acdw-reading.el @@ -1,6 +1,6 @@ ;;; acdw-reading.el --- minor mode for reading -*- lexical-binding: t -*- -;; Copyright 2021 Case Duckworth +;; Copyright 2021 Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; This file is NOT part of GNU Emacs. ;;; License: diff --git a/lisp/acdw-setup.el b/lisp/acdw-setup.el index 10a2b52..cd3807d 100644 --- a/lisp/acdw-setup.el +++ b/lisp/acdw-setup.el @@ -1,6 +1,6 @@ ;;; acdw-setup.el -- my `setup' commands -*- lexical-binding: t -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; This file is NOT part of GNU Emacs. diff --git a/lisp/acdw.el b/lisp/acdw.el index b146f58..4043134 100644 --- a/lisp/acdw.el +++ b/lisp/acdw.el @@ -1,6 +1,6 @@ ;;; acdw.el --- miscellaneous -*- lexical-binding: t; coding: utf-8-unix -*- -;; Author: Case Duckworth +;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> ;; Created: Sometime during Covid-19, 2020 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs -- cgit 1.4.1-21-gabe81 From d9063ef9d606c0adca90c9c568fa67b5355dcdf4 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 25 Sep 2021 13:16:09 -0500 Subject: Clean up early-init.el and whitespace --- early-init.el | 76 +++++++++++++++++++++++------------------------------------ init.el | 8 +++---- 2 files changed, 33 insertions(+), 51 deletions(-) (limited to 'early-init.el') diff --git a/early-init.el b/early-init.el index 9e410b1..bb6454e 100644 --- a/early-init.el +++ b/early-init.el @@ -26,24 +26,22 @@ (require 'acdw-frame) ;;; Frame settings -(setq default-frame-alist ; Remove most UI - `((tool-bar-lines . 0) ; No tool bar - (menu-bar-lines . 0) ; No menu bar - (vertical-scroll-bars) ; No scroll bars - (horizontal-scroll-bars) ; ... at all - (width . 84) ; A /little/ wider than - ; `fill-column' (set later) +(setq default-frame-alist + `((tool-bar-lines . 0) + (menu-bar-lines . 0) + (vertical-scroll-bars . nil) + (horizontal-scroll-bars . nil) + (width . 84) (height . 30) - (left-fringe . 8) ; Width of fringes - (right-fringe . 8) ; (8 is default) + (left-fringe . 8) + (right-fringe . 8) (font . ,(acdw/system (:home "DejaVu Sans Mono 10") (:work "Consolas 12") (:other "monospace 10")))) - frame-inhibit-implied-resize t ; Don't resize randomly - frame-resize-pixelwise t ; Resize by pixels, not chars - inhibit-x-resources t ; Don't load ~/.Xresources - ) + frame-inhibit-implied-resize t + frame-resize-pixelwise t + inhibit-x-resources t) (add-hook 'after-init-hook (defun after-init@disable-ui-modes () @@ -64,26 +62,23 @@ say, `tool-bar-mode' once to toggle the tool bar back on." (add-hook 'after-make-frame-functions (defun after-make-frame@setup (&rest args) (ignore args) - (let ((monospace-faces - ;; (acdw/system - ;; (:work '((:font "Consolas" :height 110) - ;; (:font "DejaVu Sans Mono" :height 110) - ;; (:font "monospace" :height 110))) - ;; (_ '((:font "DejaVu Sans Mono" :height 100) - ;; (:font "Consolas" :height 100) - ;; (:font "monospace" :height 100)))) + (let ((fixed-pitch-faces '((:font "Fantasque Sans Mono" :height 110) (:font "Go Mono" :height 100) (:font "DejaVu Sans Mono" :height 110) - (:font "monospace" :height 100)))) - (acdw/set-first-face-attribute 'default monospace-faces) - (acdw/set-first-face-attribute 'fixed-pitch monospace-faces) + (:font "monospace" :height 100))) + (variable-pitch-faces + '((:font "Comic Neue" :height 125) + (:font "Inter" :height 120) + (:font "Go" :height 120) + (:font "sans-serif" + :height 100)))) + (acdw/set-first-face-attribute 'default + fixed-pitch-faces) + (acdw/set-first-face-attribute 'fixed-pitch + fixed-pitch-faces) (acdw/set-first-face-attribute 'variable-pitch - '((:font "Comic Neue" :height 125) - (:font "Inter" :height 120) - (:font "Go" :height 120) - (:font "sans-serif" - :height 100)))) + variable-pitch-faces)) (acdw/set-emoji-fonts "Noto Color Emoji" "Noto Emoji" "Segoe UI Emoji" @@ -125,22 +120,7 @@ say, `tool-bar-mode' once to toggle the tool bar back on." ;;; Bootstrap package manager (`straight.el') -;; 1. Update `exec-path'. -(dolist (path (list (expand-file-name "bin" user-emacs-directory) - (expand-file-name "~/bin") - (expand-file-name "~/.local/bin") - (expand-file-name "~/usr/bin") - (expand-file-name "~/cmd") - (expand-file-name "~/mingw64/bin") - (expand-file-name "~/clisp-2.49")) - exec-path) - (when (file-exists-p path) - (add-to-list 'exec-path path :append))) - -;; 1.5. Update $PATH to reflect changes. -(setenv "PATH" (mapconcat #'identity exec-path path-separator)) - -;; 2. Set `package' and `straight' variables. +;; Set `package' and `straight' variables. (setq package-enable-at-startup nil package-quickstart nil straight-host-usernames '((github . "duckwork") @@ -148,7 +128,7 @@ say, `tool-bar-mode' once to toggle the tool bar back on." straight-base-dir (acdw/dir) straight-check-for-modifications '(check-on-save find-when-checking)) -;; 3. Bootstrap `straight'. +;; Bootstrap `straight'. (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name @@ -189,7 +169,9 @@ say, `tool-bar-mode' once to toggle the tool bar back on." ;; These packages are here because they need to be loaded /before/ ;; everything else in init.el. -(straight-use-package '(setup :host nil :repo "https://git.sr.ht/~pkal/setup")) +(straight-use-package '(setup + :host nil + :repo "https://git.sr.ht/~pkal/setup")) (require 'setup) (require 'acdw-setup) diff --git a/init.el b/init.el index d19d715..6d1eb92 100644 --- a/init.el +++ b/init.el @@ -1243,8 +1243,8 @@ specific to most general, they are these: (crux-reopen-as-root-mode +1)) (setup (:straight-if (define-repeat-map - :host nil - :repo "https://tildegit.org/acdw/define-repeat-map.el") + :host nil + :repo "https://tildegit.org/acdw/define-repeat-map.el") (acdw/system :home)) (defun acdw/other-window-or-switch-buffer-backward () @@ -1883,8 +1883,8 @@ the default is \"/\"." for n from 0 collect (el-patch-swap (org-add-props - head nil '`face - (nth (% n org-n-level-faces) org-level-faces)) + head nil '`face + (nth (% n org-n-level-faces) org-level-faces)) head)) separator)))) (when (> (length fpath) width) -- cgit 1.4.1-21-gabe81