diff options
-rw-r--r-- | LICENSE | 28 | ||||
-rw-r--r-- | early-init.el | 174 | ||||
-rw-r--r-- | init.el | 96 |
3 files changed, 149 insertions, 149 deletions
diff --git a/LICENSE b/LICENSE index de537e6..767282c 100644 --- a/LICENSE +++ b/LICENSE | |||
@@ -1,14 +1,14 @@ | |||
1 | DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | 1 | DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE |
2 | 2 | ||
3 | Version 2, December 2004 | 3 | Version 2, December 2004 |
4 | 4 | ||
5 | Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> | 5 | Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> |
6 | 6 | ||
7 | Everyone is permitted to copy and distribute verbatim or modified copies of | 7 | Everyone is permitted to copy and distribute verbatim or modified copies of |
8 | this license document, and changing it is allowed as long as the name is changed. | 8 | this license document, and changing it is allowed as long as the name is changed. |
9 | 9 | ||
10 | DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | 10 | DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE |
11 | 11 | ||
12 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | 12 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
13 | 13 | ||
14 | 0. You just DO WHAT THE FUCK YOU WANT TO. | 14 | 0. You just DO WHAT THE FUCK YOU WANT TO. |
diff --git a/early-init.el b/early-init.el index 1c2492e..447597b 100644 --- a/early-init.el +++ b/early-init.el | |||
@@ -1,87 +1,87 @@ | |||
1 | ;;; early-init.el -*- no-byte-compile: t; -*- | 1 | ;;; early-init.el -*- no-byte-compile: t; -*- |
2 | ;; Copyright (C) 2020 Case Duckworth | 2 | ;; Copyright (C) 2020 Case Duckworth |
3 | 3 | ||
4 | ;; Author: Case Duckworth <acdw@acdw.net> | 4 | ;; Author: Case Duckworth <acdw@acdw.net> |
5 | ;; Created: Sometime during the Covid-19 lockdown, 2019 | 5 | ;; Created: Sometime during the Covid-19 lockdown, 2019 |
6 | ;; Keywords: configuration | 6 | ;; Keywords: configuration |
7 | ;; URL: https://tildegit.org/acdw/emacs | 7 | ;; URL: https://tildegit.org/acdw/emacs |
8 | 8 | ||
9 | ;; This file is not part of GNU Emacs. | 9 | ;; This file is not part of GNU Emacs. |
10 | 10 | ||
11 | ;;; Commentary: | 11 | ;;; Commentary: |
12 | ;; This file is automatically tangled from config.org. | 12 | ;; This file is automatically tangled from config.org. |
13 | ;; Hand edits will be overwritten! | 13 | ;; Hand edits will be overwritten! |
14 | 14 | ||
15 | ;;; Code: | 15 | ;;; Code: |
16 | 16 | ||
17 | ;; BOOTSTRAP PACKAGE MANAGEMENT | 17 | ;; BOOTSTRAP PACKAGE MANAGEMENT |
18 | (let ((win-app-dir "~/Applications")) | 18 | (let ((win-app-dir "~/Applications")) |
19 | (dolist (path (list | 19 | (dolist (path (list |
20 | ;; Windows | 20 | ;; Windows |
21 | (expand-file-name "exe" win-app-dir) | 21 | (expand-file-name "exe" win-app-dir) |
22 | (expand-file-name "Git/bin" win-app-dir) | 22 | (expand-file-name "Git/bin" win-app-dir) |
23 | (expand-file-name "Git/usr/bin" win-app-dir) | 23 | (expand-file-name "Git/usr/bin" win-app-dir) |
24 | (expand-file-name "Git/mingw64/bin" win-app-dir) | 24 | (expand-file-name "Git/mingw64/bin" win-app-dir) |
25 | (expand-file-name "Everything" win-app-dir) | 25 | (expand-file-name "Everything" win-app-dir) |
26 | (expand-file-name "Win-builds/bin" win-app-dir) | 26 | (expand-file-name "Win-builds/bin" win-app-dir) |
27 | ;; Linux | 27 | ;; Linux |
28 | (expand-file-name "bin" user-emacs-directory) | 28 | (expand-file-name "bin" user-emacs-directory) |
29 | (expand-file-name "~/bin") | 29 | (expand-file-name "~/bin") |
30 | (expand-file-name "~/.local/bin") | 30 | (expand-file-name "~/.local/bin") |
31 | (expand-file-name "~/Scripts") | 31 | (expand-file-name "~/Scripts") |
32 | )) | 32 | )) |
33 | (when (file-exists-p path) | 33 | (when (file-exists-p path) |
34 | (add-to-list 'exec-path path :append)))) | 34 | (add-to-list 'exec-path path :append)))) |
35 | 35 | ||
36 | ;; Set $PATH | 36 | ;; Set $PATH |
37 | (setenv "PATH" (mapconcat #'identity exec-path path-separator)) | 37 | (setenv "PATH" (mapconcat #'identity exec-path path-separator)) |
38 | (setq package-enable-at-startup nil) | 38 | (setq package-enable-at-startup nil) |
39 | (defun acdw/bootstrap-straight () | 39 | (defun acdw/bootstrap-straight () |
40 | "Bootstrap straight.el." | 40 | "Bootstrap straight.el." |
41 | (defvar bootstrap-version) | 41 | (defvar bootstrap-version) |
42 | (let ((bootstrap-file | 42 | (let ((bootstrap-file |
43 | (expand-file-name | 43 | (expand-file-name |
44 | "straight/repos/straight.el/bootstrap.el" | 44 | "straight/repos/straight.el/bootstrap.el" |
45 | user-emacs-directory)) | 45 | user-emacs-directory)) |
46 | (bootstrap-version 5)) | 46 | (bootstrap-version 5)) |
47 | (unless (file-exists-p bootstrap-file) | 47 | (unless (file-exists-p bootstrap-file) |
48 | (with-current-buffer | 48 | (with-current-buffer |
49 | (url-retrieve-synchronously | 49 | (url-retrieve-synchronously |
50 | (concat | 50 | (concat |
51 | "https://raw.githubusercontent.com/" | 51 | "https://raw.githubusercontent.com/" |
52 | "raxod502/straight.el/develop/install.el") | 52 | "raxod502/straight.el/develop/install.el") |
53 | 'silent 'inhibit-cookies) | 53 | 'silent 'inhibit-cookies) |
54 | (goto-char (point-max)) | 54 | (goto-char (point-max)) |
55 | (eval-print-last-sexp))) | 55 | (eval-print-last-sexp))) |
56 | (load bootstrap-file nil 'nomessage))) | 56 | (load bootstrap-file nil 'nomessage))) |
57 | (when (executable-find "git") | 57 | (when (executable-find "git") |
58 | (unless (ignore-errors (acdw/bootstrap-straight)) | 58 | (unless (ignore-errors (acdw/bootstrap-straight)) |
59 | (let ((msg "Straight.el didn't bootstrap correctly. Cloning directly")) | 59 | (let ((msg "Straight.el didn't bootstrap correctly. Cloning directly")) |
60 | (message "%s..." msg) | 60 | (message "%s..." msg) |
61 | (call-process "git" nil | 61 | (call-process "git" nil |
62 | (get-buffer-create "*bootstrap-straight-messages*") nil | 62 | (get-buffer-create "*bootstrap-straight-messages*") nil |
63 | "clone" | 63 | "clone" |
64 | "https://github.com/raxod502/straight.el" | 64 | "https://github.com/raxod502/straight.el" |
65 | (expand-file-name "straight/repos/straight.el" | 65 | (expand-file-name "straight/repos/straight.el" |
66 | user-emacs-directory)) | 66 | user-emacs-directory)) |
67 | (message "%s...Done." msg) | 67 | (message "%s...Done." msg) |
68 | (acdw/bootstrap-straight)))) | 68 | (acdw/bootstrap-straight)))) |
69 | ;; SETUP FRAME | 69 | ;; SETUP FRAME |
70 | (add-to-list 'default-frame-alist | 70 | (add-to-list 'default-frame-alist |
71 | '(tool-bar-lines . 0)) | 71 | '(tool-bar-lines . 0)) |
72 | 72 | ||
73 | (tool-bar-mode -1) | 73 | (tool-bar-mode -1) |
74 | (add-to-list 'default-frame-alist | 74 | (add-to-list 'default-frame-alist |
75 | '(menu-bar-lines . 0)) | 75 | '(menu-bar-lines . 0)) |
76 | 76 | ||
77 | (menu-bar-mode -1) | 77 | (menu-bar-mode -1) |
78 | (add-to-list 'default-frame-alist | 78 | (add-to-list 'default-frame-alist |
79 | '(vertical-scroll-bars . nil) | 79 | '(vertical-scroll-bars . nil) |
80 | '(horizontal-scroll-bars . nil)) | 80 | '(horizontal-scroll-bars . nil)) |
81 | 81 | ||
82 | (scroll-bar-mode -1) | 82 | (scroll-bar-mode -1) |
83 | (horizontal-scroll-bar-mode -1) | 83 | (horizontal-scroll-bar-mode -1) |
84 | (setq-default frame-inhibit-implied-resize t | 84 | (setq-default frame-inhibit-implied-resize t |
85 | frame-resize-pixelwise t) | 85 | frame-resize-pixelwise t) |
86 | 86 | ||
87 | ;;; early-init.el ends here | 87 | ;;; early-init.el ends here |
diff --git a/init.el b/init.el index 1ddb5f9..2fdadb6 100644 --- a/init.el +++ b/init.el | |||
@@ -1,48 +1,48 @@ | |||
1 | ;;; init.el -*- lexical-binding: t -*- | 1 | ;;; init.el -*- lexical-binding: t -*- |
2 | ;; Copyright (C) 2020 Case Duckworth | 2 | ;; Copyright (C) 2020 Case Duckworth |
3 | 3 | ||
4 | ;; Author: Case Duckworth <acdw@acdw.net> | 4 | ;; Author: Case Duckworth <acdw@acdw.net> |
5 | ;; Created: Sometime during the Covid-19 lockdown, 2019 | 5 | ;; Created: Sometime during the Covid-19 lockdown, 2019 |
6 | ;; Keywords: configuration | 6 | ;; Keywords: configuration |
7 | ;; URL: https://tildegit.org/acdw/emacs | 7 | ;; URL: https://tildegit.org/acdw/emacs |
8 | 8 | ||
9 | ;; This file is not part of GNU Emacs. | 9 | ;; This file is not part of GNU Emacs. |
10 | 10 | ||
11 | ;;; Commentary: | 11 | ;;; Commentary: |
12 | ;; This file is automatically tangled from config.org. | 12 | ;; This file is automatically tangled from config.org. |
13 | ;; Hand edits will be overwritten! | 13 | ;; Hand edits will be overwritten! |
14 | 14 | ||
15 | ;;; Code: | 15 | ;;; Code: |
16 | 16 | ||
17 | (setq-default load-prefer-newer t) | 17 | (setq-default load-prefer-newer t) |
18 | 18 | ||
19 | (let* (;; Speed up init | 19 | (let* (;; Speed up init |
20 | (gc-cons-threshold most-positive-fixnum) | 20 | (gc-cons-threshold most-positive-fixnum) |
21 | (file-name-handler-alist nil) | 21 | (file-name-handler-alist nil) |
22 | ;; Config file names | 22 | ;; Config file names |
23 | (config (expand-file-name "config" | 23 | (config (expand-file-name "config" |
24 | user-emacs-directory)) | 24 | user-emacs-directory)) |
25 | (config.el (concat config ".el")) | 25 | (config.el (concat config ".el")) |
26 | (config.org (concat config ".org")) | 26 | (config.org (concat config ".org")) |
27 | (straight-org-dir (expand-file-name "straight/build/org" | 27 | (straight-org-dir (expand-file-name "straight/build/org" |
28 | user-emacs-directory))) | 28 | user-emacs-directory))) |
29 | ;; Okay, let's figure this out. | 29 | ;; Okay, let's figure this out. |
30 | ;; `and' evaluates each form, and returns nil on the first that | 30 | ;; `and' evaluates each form, and returns nil on the first that |
31 | ;; returns nil. `unless' only executes its body if the test | 31 | ;; returns nil. `unless' only executes its body if the test |
32 | ;; returns nil. So. | 32 | ;; returns nil. So. |
33 | ;; 1. Test if config.org is newer than config.el. If it is (t), we | 33 | ;; 1. Test if config.org is newer than config.el. If it is (t), we |
34 | ;; *want* to evaluate the body, so we need to negate that test. | 34 | ;; *want* to evaluate the body, so we need to negate that test. |
35 | ;; 2. Try to load the config. If it errors (nil), it'll bubble that | 35 | ;; 2. Try to load the config. If it errors (nil), it'll bubble that |
36 | ;; to the `and' and the body will be evaluated. | 36 | ;; to the `and' and the body will be evaluated. |
37 | (unless (and (not (file-newer-than-file-p config.org config.el)) | 37 | (unless (and (not (file-newer-than-file-p config.org config.el)) |
38 | (load config :noerror)) | 38 | (load config :noerror)) |
39 | ;; A plain require here just loads the older `org' | 39 | ;; A plain require here just loads the older `org' |
40 | ;; in Emacs' install dir. We need to add the newer | 40 | ;; in Emacs' install dir. We need to add the newer |
41 | ;; one to the `load-path', hopefully that's all. | 41 | ;; one to the `load-path', hopefully that's all. |
42 | (when (file-exists-p straight-org-dir) | 42 | (when (file-exists-p straight-org-dir) |
43 | (add-to-list 'load-path straight-org-dir)) | 43 | (add-to-list 'load-path straight-org-dir)) |
44 | ;; Load config.org | 44 | ;; Load config.org |
45 | (require 'org) | 45 | (require 'org) |
46 | (org-babel-load-file config.org))) | 46 | (org-babel-load-file config.org))) |
47 | 47 | ||
48 | ;;; init.el ends here | 48 | ;;; init.el ends here |