init: remove broken let() around everything. More to come.
This commit is contained in:
parent
bafcb8da3a
commit
7e06facbfd
139
init.el
139
init.el
@ -10,96 +10,91 @@
|
||||
|
||||
;;; Code:
|
||||
;; Speed up loading/finding files
|
||||
(let
|
||||
(
|
||||
;; (file-name-handler-alist nil) ;; no. Breaks evil for some reason.
|
||||
)
|
||||
|
||||
;; Load the files that I put my settings in...
|
||||
(defvar mitch-directory
|
||||
(directory-file-name
|
||||
(concat user-emacs-directory
|
||||
(convert-standard-filename "lisp/"))))
|
||||
(add-to-list 'load-path mitch-directory t)
|
||||
(setq custom-theme-directory mitch-directory)
|
||||
;; Load the files that I put my settings in...
|
||||
(defvar mitch-directory
|
||||
(directory-file-name
|
||||
(concat user-emacs-directory
|
||||
(convert-standard-filename "lisp/"))))
|
||||
(add-to-list 'load-path mitch-directory t)
|
||||
(setq custom-theme-directory mitch-directory)
|
||||
|
||||
(require 'mitch-defuns)
|
||||
(require 'mitch-defuns)
|
||||
|
||||
;; minify yes/no prompts
|
||||
;; (if (>= (string-to-number emacs-version) 28)
|
||||
;; (defvar use-short-answers t)) ;; doesn't work
|
||||
(defalias 'yes-or-no-p 'y-or-n-p)
|
||||
;; minify yes/no prompts
|
||||
;; (if (>= (string-to-number emacs-version) 28)
|
||||
;; (defvar use-short-answers t)) ;; doesn't work
|
||||
(defalias 'yes-or-no-p 'y-or-n-p)
|
||||
|
||||
;; do the things
|
||||
(add-hook 'server-after-make-frame-hook #'mitch/graphical-setup)
|
||||
(if (display-graphic-p) (mitch/graphical-setup))
|
||||
;; do the things
|
||||
(add-hook 'server-after-make-frame-hook #'mitch/graphical-setup)
|
||||
(if (display-graphic-p) (mitch/graphical-setup))
|
||||
|
||||
;; Control backups/swapfiles
|
||||
(defvar backup-directory
|
||||
(expand-file-name "emacs-backups"
|
||||
(or (getenv "XDG_CACHE_HOME")
|
||||
(expand-file-name
|
||||
".cache" "~"))))
|
||||
(if (not (file-exists-p backup-directory))
|
||||
(make-directory backup-directory t))
|
||||
(setq backup-directory-alist `(("." . ,backup-directory)))
|
||||
;; auto-save-mode doesn't create the path automatically!
|
||||
(defvar auto-save-directory
|
||||
(expand-file-name "tmp/auto-saves/" backup-directory))
|
||||
(make-directory auto-save-directory t)
|
||||
(setq auto-save-list-file-prefix
|
||||
(expand-file-name "sessions/" auto-save-directory)
|
||||
auto-save-file-name-transforms
|
||||
`((".*" ,auto-save-directory t)))
|
||||
(setq create-lockfiles nil)
|
||||
;; Control backups/swapfiles
|
||||
(defvar backup-directory
|
||||
(expand-file-name "emacs-backups"
|
||||
(or (getenv "XDG_CACHE_HOME")
|
||||
(expand-file-name
|
||||
".cache" "~"))))
|
||||
(if (not (file-exists-p backup-directory))
|
||||
(make-directory backup-directory t))
|
||||
(setq backup-directory-alist `(("." . ,backup-directory)))
|
||||
;; auto-save-mode doesn't create the path automatically!
|
||||
(defvar auto-save-directory
|
||||
(expand-file-name "tmp/auto-saves/" backup-directory))
|
||||
(make-directory auto-save-directory t)
|
||||
(setq auto-save-list-file-prefix
|
||||
(expand-file-name "sessions/" auto-save-directory)
|
||||
auto-save-file-name-transforms
|
||||
`((".*" ,auto-save-directory t)))
|
||||
(setq create-lockfiles nil)
|
||||
|
||||
;; remove auto-generated bits
|
||||
(setq custom-file (expand-file-name "custom.el" backup-directory))
|
||||
(if (not (file-exists-p custom-file))
|
||||
(make-empty-file custom-file t))
|
||||
(load custom-file)
|
||||
;; remove auto-generated bits
|
||||
(setq custom-file (expand-file-name "custom.el" backup-directory))
|
||||
(if (not (file-exists-p custom-file))
|
||||
(make-empty-file custom-file t))
|
||||
(load custom-file)
|
||||
|
||||
;; straight.el: the better package manager?
|
||||
;; minified bootstrap (split lines if you want) (or not)
|
||||
;; (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (unless (file-exists-p bootstrap-file) (with-current-buffer (url-retrieve-synchronously "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" 'silent 'inhibit-cookies) (goto-char (point-max)) (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) (straight-use-package 'use-package) (setq straight-use-package-by-default t)
|
||||
;; straight.el: the better package manager?
|
||||
;; minified bootstrap (split lines if you want) (or not)
|
||||
;; (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (unless (file-exists-p bootstrap-file) (with-current-buffer (url-retrieve-synchronously "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" 'silent 'inhibit-cookies) (goto-char (point-max)) (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) (straight-use-package 'use-package) (setq straight-use-package-by-default t)
|
||||
|
||||
;; actually, use elpaca instead
|
||||
(require 'elpaca-bootstrap) (elpaca use-package (require 'use-package))
|
||||
;; actually, use elpaca instead
|
||||
(require 'elpaca-bootstrap) (elpaca use-package (require 'use-package))
|
||||
|
||||
;; actually, don't because it's broken on Windows
|
||||
;; actually, don't because it's broken on Windows
|
||||
|
||||
(require 'mitch-packages)
|
||||
(require 'mitch-packages)
|
||||
|
||||
;; Absolute line numbers. Relative ones are an annoyance to set up, sadly.
|
||||
;; (global-display-line-numbers-mode)
|
||||
;; (defvar display-line-numbers-width-start t)
|
||||
;; Absolute line numbers. Relative ones are an annoyance to set up, sadly.
|
||||
;; (global-display-line-numbers-mode)
|
||||
;; (defvar display-line-numbers-width-start t)
|
||||
|
||||
;; scroll step stuff
|
||||
(setq scroll-margin 2
|
||||
scroll-conservatively 100
|
||||
scroll-up-aggressively 0.01
|
||||
scroll-down-aggressively 0.01)
|
||||
(global-visual-line-mode t)
|
||||
;; scroll step stuff
|
||||
(setq scroll-margin 2
|
||||
scroll-conservatively 100
|
||||
scroll-up-aggressively 0.01
|
||||
scroll-down-aggressively 0.01)
|
||||
(global-visual-line-mode t)
|
||||
|
||||
;; UTF-8 supremacy (Snippet originally from https://github.com/doomemacs/doomemacs/blob/master/early-init.el, but it's not in there anymore)
|
||||
(set-language-environment "UTF-8")
|
||||
;; UTF-8 supremacy (Snippet originally from https://github.com/doomemacs/doomemacs/blob/master/early-init.el, but it's not in there anymore)
|
||||
(set-language-environment "UTF-8")
|
||||
|
||||
;; Toggle Japanese with `qq'
|
||||
;; Sample text: 進撃 の 巨人
|
||||
;; (shingeki no kyojin (attack on titan))
|
||||
(setq default-input-method "japanese")
|
||||
;; DISABLED because something broke and I didn't bother figuring out what...
|
||||
;; Toggle Japanese with `qq'
|
||||
;; Sample text: 進撃 の 巨人
|
||||
;; (shingeki no kyojin (attack on titan))
|
||||
(setq default-input-method "japanese")
|
||||
;; DISABLED because something broke and I didn't bother figuring out what...
|
||||
|
||||
;; Don't barf out emacs errors as they are encountered
|
||||
(setq debug-on-error nil)
|
||||
;; Don't barf out emacs errors as they are encountered
|
||||
(setq debug-on-error nil)
|
||||
|
||||
;; Speed up scrolling down (why is this even a thing?)
|
||||
(setq auto-window-vscroll nil)
|
||||
;; Speed up scrolling down (why is this even a thing?)
|
||||
(setq auto-window-vscroll nil)
|
||||
|
||||
;; Display "labmda" as λ
|
||||
(global-prettify-symbols-mode 1)
|
||||
;; Display "labmda" as λ
|
||||
(global-prettify-symbols-mode 1)
|
||||
|
||||
)
|
||||
|
||||
;; lower gc threshold again
|
||||
(setq gc-cons-threshold (* 2 1000 1000))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user