diff options
author | Case Duckworth | 2021-02-23 12:17:33 -0600 |
---|---|---|
committer | Case Duckworth | 2021-02-23 12:17:51 -0600 |
commit | 89467846ab071d2644ac777d3187b3f913e62e69 (patch) | |
tree | 607a172b9ae68cf331b607ebda49bd358441d5ba | |
parent | Add nov.el (diff) | |
download | emacs-89467846ab071d2644ac777d3187b3f913e62e69.tar.gz emacs-89467846ab071d2644ac777d3187b3f913e62e69.zip |
Force LF
-rw-r--r-- | .gitattributes | 8 | ||||
-rw-r--r-- | .gitignore | 50 | ||||
-rw-r--r-- | LICENSE | 28 | ||||
-rw-r--r-- | early-init.el | 178 | ||||
-rw-r--r-- | etc/eshell/aliases | 2 | ||||
-rw-r--r-- | init.el | 100 | ||||
-rw-r--r-- | var/elpher-bookmarks.el | 36 |
7 files changed, 202 insertions, 200 deletions
diff --git a/.gitattributes b/.gitattributes index a5516e5..13a682e 100644 --- a/.gitattributes +++ b/.gitattributes | |||
@@ -1,3 +1,5 @@ | |||
1 | *.lisp diff=lisp | 1 | * text=eol=lf |
2 | *.el diff=lisp | 2 | |
3 | *.org diff=org | 3 | *.lisp diff=lisp |
4 | *.el diff=lisp | ||
5 | *.org diff=org | ||
diff --git a/.gitignore b/.gitignore index d273700..7014eed 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -1,25 +1,25 @@ | |||
1 | # ignore everything | 1 | # ignore everything |
2 | * | 2 | * |
3 | 3 | ||
4 | # except ... | 4 | # except ... |
5 | !config.org | 5 | !config.org |
6 | !init.el | 6 | !init.el |
7 | !early-init.el | 7 | !early-init.el |
8 | !.gitignore | 8 | !.gitignore |
9 | !.gitattributes | 9 | !.gitattributes |
10 | !README.* | 10 | !README.* |
11 | 11 | ||
12 | # and ... | 12 | # and ... |
13 | !var/ | 13 | !var/ |
14 | var/* | 14 | var/* |
15 | !var/elpher-bookmarks.el | 15 | !var/elpher-bookmarks.el |
16 | !var/elfeed/ | 16 | !var/elfeed/ |
17 | var/elfeed/* | 17 | var/elfeed/* |
18 | !var/elfeed/db | 18 | !var/elfeed/db |
19 | 19 | ||
20 | !etc/ | 20 | !etc/ |
21 | etc/* | 21 | etc/* |
22 | !etc/eshell | 22 | !etc/eshell |
23 | !etc/eshell/* | 23 | !etc/eshell/* |
24 | 24 | ||
25 | !elfeed.org | 25 | !elfeed.org |
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 0738ca2..b8a6c6c 100644 --- a/early-init.el +++ b/early-init.el | |||
@@ -1,89 +1,89 @@ | |||
1 | ;;; early-init.el -*- no-byte-compile: t; coding: utf-8 -*- | 1 | ;;; early-init.el -*- no-byte-compile: t; coding: utf-8 -*- |
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 "exe/bin" win-app-dir) | 22 | (expand-file-name "exe/bin" win-app-dir) |
23 | (expand-file-name "Git/bin" win-app-dir) | 23 | (expand-file-name "Git/bin" win-app-dir) |
24 | (expand-file-name "Git/usr/bin" win-app-dir) | 24 | (expand-file-name "Git/usr/bin" win-app-dir) |
25 | (expand-file-name "Git/mingw64/bin" win-app-dir) | 25 | (expand-file-name "Git/mingw64/bin" win-app-dir) |
26 | (expand-file-name "Everything" win-app-dir) | 26 | (expand-file-name "Everything" win-app-dir) |
27 | (expand-file-name "Win-builds/bin" win-app-dir) | 27 | (expand-file-name "Win-builds/bin" win-app-dir) |
28 | (expand-file-name "Z/bin" win-app-dir) | 28 | (expand-file-name "Z/bin" win-app-dir) |
29 | ;; Linux | 29 | ;; Linux |
30 | (expand-file-name "bin" user-emacs-directory) | 30 | (expand-file-name "bin" user-emacs-directory) |
31 | (expand-file-name "~/bin") | 31 | (expand-file-name "~/bin") |
32 | (expand-file-name "~/.local/bin") | 32 | (expand-file-name "~/.local/bin") |
33 | (expand-file-name "~/Scripts") | 33 | (expand-file-name "~/Scripts") |
34 | )) | 34 | )) |
35 | (when (file-exists-p path) | 35 | (when (file-exists-p path) |
36 | (add-to-list 'exec-path path :append)))) | 36 | (add-to-list 'exec-path path :append)))) |
37 | 37 | ||
38 | ;; Set $PATH | 38 | ;; Set $PATH |
39 | (setenv "PATH" (mapconcat #'identity exec-path path-separator)) | 39 | (setenv "PATH" (mapconcat #'identity exec-path path-separator)) |
40 | (setq package-enable-at-startup nil) | 40 | (setq package-enable-at-startup nil) |
41 | (defun acdw/bootstrap-straight () | 41 | (defun acdw/bootstrap-straight () |
42 | "Bootstrap straight.el." | 42 | "Bootstrap straight.el." |
43 | (defvar bootstrap-version) | 43 | (defvar bootstrap-version) |
44 | (let ((bootstrap-file | 44 | (let ((bootstrap-file |
45 | (expand-file-name | 45 | (expand-file-name |
46 | "straight/repos/straight.el/bootstrap.el" | 46 | "straight/repos/straight.el/bootstrap.el" |
47 | user-emacs-directory)) | 47 | user-emacs-directory)) |
48 | (bootstrap-version 5)) | 48 | (bootstrap-version 5)) |
49 | (unless (file-exists-p bootstrap-file) | 49 | (unless (file-exists-p bootstrap-file) |
50 | (with-current-buffer | 50 | (with-current-buffer |
51 | (url-retrieve-synchronously | 51 | (url-retrieve-synchronously |
52 | (concat | 52 | (concat |
53 | "https://raw.githubusercontent.com/" | 53 | "https://raw.githubusercontent.com/" |
54 | "raxod502/straight.el/develop/install.el") | 54 | "raxod502/straight.el/develop/install.el") |
55 | 'silent 'inhibit-cookies) | 55 | 'silent 'inhibit-cookies) |
56 | (goto-char (point-max)) | 56 | (goto-char (point-max)) |
57 | (eval-print-last-sexp))) | 57 | (eval-print-last-sexp))) |
58 | (load bootstrap-file nil 'nomessage))) | 58 | (load bootstrap-file nil 'nomessage))) |
59 | (when (executable-find "git") | 59 | (when (executable-find "git") |
60 | (unless (ignore-errors (acdw/bootstrap-straight)) | 60 | (unless (ignore-errors (acdw/bootstrap-straight)) |
61 | (let ((msg "Straight.el didn't bootstrap correctly. Cloning directly")) | 61 | (let ((msg "Straight.el didn't bootstrap correctly. Cloning directly")) |
62 | (message "%s..." msg) | 62 | (message "%s..." msg) |
63 | (call-process "git" nil | 63 | (call-process "git" nil |
64 | (get-buffer-create "*bootstrap-straight-messages*") nil | 64 | (get-buffer-create "*bootstrap-straight-messages*") nil |
65 | "clone" | 65 | "clone" |
66 | "https://github.com/raxod502/straight.el" | 66 | "https://github.com/raxod502/straight.el" |
67 | (expand-file-name "straight/repos/straight.el" | 67 | (expand-file-name "straight/repos/straight.el" |
68 | user-emacs-directory)) | 68 | user-emacs-directory)) |
69 | (message "%s...Done." msg) | 69 | (message "%s...Done." msg) |
70 | (acdw/bootstrap-straight)))) | 70 | (acdw/bootstrap-straight)))) |
71 | ;; SETUP FRAME | 71 | ;; SETUP FRAME |
72 | (add-to-list 'default-frame-alist | 72 | (add-to-list 'default-frame-alist |
73 | '(tool-bar-lines . 0)) | 73 | '(tool-bar-lines . 0)) |
74 | 74 | ||
75 | (tool-bar-mode -1) | 75 | (tool-bar-mode -1) |
76 | (add-to-list 'default-frame-alist | 76 | (add-to-list 'default-frame-alist |
77 | '(menu-bar-lines . 0)) | 77 | '(menu-bar-lines . 0)) |
78 | 78 | ||
79 | (menu-bar-mode -1) | 79 | (menu-bar-mode -1) |
80 | (add-to-list 'default-frame-alist | 80 | (add-to-list 'default-frame-alist |
81 | '(vertical-scroll-bars . nil) | 81 | '(vertical-scroll-bars . nil) |
82 | '(horizontal-scroll-bars . nil)) | 82 | '(horizontal-scroll-bars . nil)) |
83 | 83 | ||
84 | (scroll-bar-mode -1) | 84 | (scroll-bar-mode -1) |
85 | (horizontal-scroll-bar-mode -1) | 85 | (horizontal-scroll-bar-mode -1) |
86 | (setq-default frame-inhibit-implied-resize t | 86 | (setq-default frame-inhibit-implied-resize t |
87 | frame-resize-pixelwise t) | 87 | frame-resize-pixelwise t) |
88 | 88 | ||
89 | ;;; early-init.el ends here | 89 | ;;; early-init.el ends here |
diff --git a/etc/eshell/aliases b/etc/eshell/aliases index 621749d..24a7efc 100644 --- a/etc/eshell/aliases +++ b/etc/eshell/aliases | |||
@@ -1 +1 @@ | |||
alias e find-file $1 | alias e find-file $1 | ||
diff --git a/init.el b/init.el index 2fdd1c9..0d48e0d 100644 --- a/init.el +++ b/init.el | |||
@@ -1,50 +1,50 @@ | |||
1 | ;;; init.el -*- lexical-binding: t; coding: utf-8 -*- | 1 | ;;; init.el -*- lexical-binding: t; coding: utf-8 -*- |
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 | ;; (gc-cons-percentage 0.6) | 21 | ;; (gc-cons-percentage 0.6) |
22 | (file-name-handler-alist nil) | 22 | (file-name-handler-alist nil) |
23 | ;; Config file names | 23 | ;; Config file names |
24 | (config (expand-file-name "config" | 24 | (config (expand-file-name "config" |
25 | user-emacs-directory)) | 25 | user-emacs-directory)) |
26 | (config.el (concat config ".el")) | 26 | (config.el (concat config ".el")) |
27 | (config.org (concat config ".org")) | 27 | (config.org (concat config ".org")) |
28 | (straight-org-dir (locate-user-emacs-file "straight/build/org"))) | 28 | (straight-org-dir (locate-user-emacs-file "straight/build/org"))) |
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 | (message "%s..." "Loading config.org") | 45 | (message "%s..." "Loading config.org") |
46 | (require 'org) | 46 | (require 'org) |
47 | (org-babel-load-file config.org) | 47 | (org-babel-load-file config.org) |
48 | (message "%s... Done" "Loading config.org"))) | 48 | (message "%s... Done" "Loading config.org"))) |
49 | 49 | ||
50 | ;;; init.el ends here | 50 | ;;; init.el ends here |
diff --git a/var/elpher-bookmarks.el b/var/elpher-bookmarks.el index c1dd228..311d980 100644 --- a/var/elpher-bookmarks.el +++ b/var/elpher-bookmarks.el | |||
@@ -1,18 +1,18 @@ | |||
1 | ; Elpher bookmarks file | 1 | ; Elpher bookmarks file |
2 | 2 | ||
3 | ; Bookmarks are stored as a list of (label URL) items. | 3 | ; Bookmarks are stored as a list of (label URL) items. |
4 | ; Feel free to edit by hand, but take care to ensure | 4 | ; Feel free to edit by hand, but take care to ensure |
5 | ; the list structure remains intact. | 5 | ; the list structure remains intact. |
6 | 6 | ||
7 | (("MEDUSAE directory" "gemini://medusae.space/") | 7 | (("MEDUSAE directory" "gemini://medusae.space/") |
8 | ("Will Lewis" "gemini://wflewis.com/") | 8 | ("Will Lewis" "gemini://wflewis.com/") |
9 | ("Cornbread Recipe" "gemini://perplexing.space/2021/cornbread-recipe.gmi") | 9 | ("Cornbread Recipe" "gemini://perplexing.space/2021/cornbread-recipe.gmi") |
10 | ("SMOG" "gemini://gemini.trans-neptunian.space/~smog/") | 10 | ("SMOG" "gemini://gemini.trans-neptunian.space/~smog/") |
11 | ("Caolan - Vermont Sourdough" "gemini://caolan.uk/baking/2020-11-26_vermont_sourdough.gmi") | 11 | ("Caolan - Vermont Sourdough" "gemini://caolan.uk/baking/2020-11-26_vermont_sourdough.gmi") |
12 | ("BREADPUNK!" "gemini://breadpunk.club/") | 12 | ("BREADPUNK!" "gemini://breadpunk.club/") |
13 | ("ACDW" "gemini://gem.acdw.net/") | 13 | ("ACDW" "gemini://gem.acdw.net/") |
14 | ("Spacewalk" "gemini://rawtext.club/~sloum/spacewalk.gmi") | 14 | ("Spacewalk" "gemini://rawtext.club/~sloum/spacewalk.gmi") |
15 | ("CAPCOM" "gemini://gemini.circumlunar.space/capcom/") | 15 | ("CAPCOM" "gemini://gemini.circumlunar.space/capcom/") |
16 | ("cosmic voyage" "gemini://cosmic.voyage/") | 16 | ("cosmic voyage" "gemini://cosmic.voyage/") |
17 | ("kayw" "gemini://salejandro.me/") | 17 | ("kayw" "gemini://salejandro.me/") |
18 | ("low-key: weechat relay" "gemini://low-key.me/guides/weechat_irc_relay.gmi")) | 18 | ("low-key: weechat relay" "gemini://low-key.me/guides/weechat_irc_relay.gmi")) |