From 89467846ab071d2644ac777d3187b3f913e62e69 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 23 Feb 2021 12:17:33 -0600 Subject: Force LF --- .gitattributes | 8 ++- .gitignore | 50 +++++++------- LICENSE | 28 ++++---- early-init.el | 178 ++++++++++++++++++++++++------------------------ etc/eshell/aliases | 2 +- init.el | 100 +++++++++++++-------------- 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 @@ -*.lisp diff=lisp -*.el diff=lisp -*.org diff=org +* text=eol=lf + +*.lisp diff=lisp +*.el diff=lisp +*.org diff=org diff --git a/.gitignore b/.gitignore index d273700..7014eed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,25 @@ -# ignore everything -* - -# except ... -!config.org -!init.el -!early-init.el -!.gitignore -!.gitattributes -!README.* - -# and ... -!var/ -var/* -!var/elpher-bookmarks.el -!var/elfeed/ -var/elfeed/* -!var/elfeed/db - -!etc/ -etc/* -!etc/eshell -!etc/eshell/* - -!elfeed.org +# ignore everything +* + +# except ... +!config.org +!init.el +!early-init.el +!.gitignore +!.gitattributes +!README.* + +# and ... +!var/ +var/* +!var/elpher-bookmarks.el +!var/elfeed/ +var/elfeed/* +!var/elfeed/db + +!etc/ +etc/* +!etc/eshell +!etc/eshell/* + +!elfeed.org diff --git a/LICENSE b/LICENSE index de537e6..767282c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,14 @@ -DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - -Version 2, December 2004 - -Copyright (C) 2004 Sam Hocevar - -Everyone is permitted to copy and distribute verbatim or modified copies of -this license document, and changing it is allowed as long as the name is changed. - -DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. You just DO WHAT THE FUCK YOU WANT TO. +DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + +Version 2, December 2004 + +Copyright (C) 2004 Sam Hocevar + +Everyone is permitted to copy and distribute verbatim or modified copies of +this license document, and changing it is allowed as long as the name is changed. + +DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +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 @@ -;;; early-init.el -*- no-byte-compile: t; coding: utf-8 -*- -;; Copyright (C) 2020 Case Duckworth - -;; Author: Case Duckworth -;; Created: Sometime during the Covid-19 lockdown, 2019 -;; Keywords: configuration -;; URL: https://tildegit.org/acdw/emacs - -;; This file is not part of GNU Emacs. - -;;; Commentary: -;; This file is automatically tangled from config.org. -;; Hand edits will be overwritten! - -;;; Code: - -;; BOOTSTRAP PACKAGE MANAGEMENT -(let ((win-app-dir "~/Applications")) - (dolist (path (list - ;; Windows - (expand-file-name "exe" win-app-dir) - (expand-file-name "exe/bin" win-app-dir) - (expand-file-name "Git/bin" win-app-dir) - (expand-file-name "Git/usr/bin" win-app-dir) - (expand-file-name "Git/mingw64/bin" win-app-dir) - (expand-file-name "Everything" win-app-dir) - (expand-file-name "Win-builds/bin" win-app-dir) - (expand-file-name "Z/bin" win-app-dir) - ;; Linux - (expand-file-name "bin" user-emacs-directory) - (expand-file-name "~/bin") - (expand-file-name "~/.local/bin") - (expand-file-name "~/Scripts") - )) - (when (file-exists-p path) - (add-to-list 'exec-path path :append)))) - -;; Set $PATH -(setenv "PATH" (mapconcat #'identity exec-path path-separator)) -(setq package-enable-at-startup nil) -(defun acdw/bootstrap-straight () - "Bootstrap straight.el." - (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 - (concat - "https://raw.githubusercontent.com/" - "raxod502/straight.el/develop/install.el") - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage))) -(when (executable-find "git") - (unless (ignore-errors (acdw/bootstrap-straight)) - (let ((msg "Straight.el didn't bootstrap correctly. Cloning directly")) - (message "%s..." msg) - (call-process "git" nil - (get-buffer-create "*bootstrap-straight-messages*") nil - "clone" - "https://github.com/raxod502/straight.el" - (expand-file-name "straight/repos/straight.el" - user-emacs-directory)) - (message "%s...Done." msg) - (acdw/bootstrap-straight)))) -;; SETUP FRAME -(add-to-list 'default-frame-alist - '(tool-bar-lines . 0)) - -(tool-bar-mode -1) -(add-to-list 'default-frame-alist - '(menu-bar-lines . 0)) - -(menu-bar-mode -1) -(add-to-list 'default-frame-alist - '(vertical-scroll-bars . nil) - '(horizontal-scroll-bars . nil)) - -(scroll-bar-mode -1) -(horizontal-scroll-bar-mode -1) -(setq-default frame-inhibit-implied-resize t - frame-resize-pixelwise t) - -;;; early-init.el ends here +;;; early-init.el -*- no-byte-compile: t; coding: utf-8 -*- +;; Copyright (C) 2020 Case Duckworth + +;; Author: Case Duckworth +;; Created: Sometime during the Covid-19 lockdown, 2019 +;; Keywords: configuration +;; URL: https://tildegit.org/acdw/emacs + +;; This file is not part of GNU Emacs. + +;;; Commentary: +;; This file is automatically tangled from config.org. +;; Hand edits will be overwritten! + +;;; Code: + +;; BOOTSTRAP PACKAGE MANAGEMENT +(let ((win-app-dir "~/Applications")) + (dolist (path (list + ;; Windows + (expand-file-name "exe" win-app-dir) + (expand-file-name "exe/bin" win-app-dir) + (expand-file-name "Git/bin" win-app-dir) + (expand-file-name "Git/usr/bin" win-app-dir) + (expand-file-name "Git/mingw64/bin" win-app-dir) + (expand-file-name "Everything" win-app-dir) + (expand-file-name "Win-builds/bin" win-app-dir) + (expand-file-name "Z/bin" win-app-dir) + ;; Linux + (expand-file-name "bin" user-emacs-directory) + (expand-file-name "~/bin") + (expand-file-name "~/.local/bin") + (expand-file-name "~/Scripts") + )) + (when (file-exists-p path) + (add-to-list 'exec-path path :append)))) + +;; Set $PATH +(setenv "PATH" (mapconcat #'identity exec-path path-separator)) +(setq package-enable-at-startup nil) +(defun acdw/bootstrap-straight () + "Bootstrap straight.el." + (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 + (concat + "https://raw.githubusercontent.com/" + "raxod502/straight.el/develop/install.el") + 'silent 'inhibit-cookies) + (goto-char (point-max)) + (eval-print-last-sexp))) + (load bootstrap-file nil 'nomessage))) +(when (executable-find "git") + (unless (ignore-errors (acdw/bootstrap-straight)) + (let ((msg "Straight.el didn't bootstrap correctly. Cloning directly")) + (message "%s..." msg) + (call-process "git" nil + (get-buffer-create "*bootstrap-straight-messages*") nil + "clone" + "https://github.com/raxod502/straight.el" + (expand-file-name "straight/repos/straight.el" + user-emacs-directory)) + (message "%s...Done." msg) + (acdw/bootstrap-straight)))) +;; SETUP FRAME +(add-to-list 'default-frame-alist + '(tool-bar-lines . 0)) + +(tool-bar-mode -1) +(add-to-list 'default-frame-alist + '(menu-bar-lines . 0)) + +(menu-bar-mode -1) +(add-to-list 'default-frame-alist + '(vertical-scroll-bars . nil) + '(horizontal-scroll-bars . nil)) + +(scroll-bar-mode -1) +(horizontal-scroll-bar-mode -1) +(setq-default frame-inhibit-implied-resize t + frame-resize-pixelwise t) + +;;; 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 @@ -;;; init.el -*- lexical-binding: t; coding: utf-8 -*- -;; Copyright (C) 2020 Case Duckworth - -;; Author: Case Duckworth -;; Created: Sometime during the Covid-19 lockdown, 2019 -;; Keywords: configuration -;; URL: https://tildegit.org/acdw/emacs - -;; This file is not part of GNU Emacs. - -;;; Commentary: -;; This file is automatically tangled from config.org. -;; Hand edits will be overwritten! - -;;; Code: - -(setq-default load-prefer-newer t) - -(let* (;; Speed up init - (gc-cons-threshold most-positive-fixnum) - ;; (gc-cons-percentage 0.6) - (file-name-handler-alist nil) - ;; Config file names - (config (expand-file-name "config" - user-emacs-directory)) - (config.el (concat config ".el")) - (config.org (concat config ".org")) - (straight-org-dir (locate-user-emacs-file "straight/build/org"))) - ;; Okay, let's figure this out. - ;; `and' evaluates each form, and returns nil on the first that - ;; returns nil. `unless' only executes its body if the test - ;; returns nil. So. - ;; 1. Test if config.org is newer than config.el. If it is (t), we - ;; *want* to evaluate the body, so we need to negate that test. - ;; 2. Try to load the config. If it errors (nil), it'll bubble that - ;; to the `and' and the body will be evaluated. - (unless (and (not (file-newer-than-file-p config.org config.el)) - (load config :noerror)) - ;; A plain require here just loads the older `org' - ;; in Emacs' install dir. We need to add the newer - ;; one to the `load-path', hopefully that's all. - (when (file-exists-p straight-org-dir) - (add-to-list 'load-path straight-org-dir)) - ;; Load config.org - (message "%s..." "Loading config.org") - (require 'org) - (org-babel-load-file config.org) - (message "%s... Done" "Loading config.org"))) - -;;; init.el ends here +;;; init.el -*- lexical-binding: t; coding: utf-8 -*- +;; Copyright (C) 2020 Case Duckworth + +;; Author: Case Duckworth +;; Created: Sometime during the Covid-19 lockdown, 2019 +;; Keywords: configuration +;; URL: https://tildegit.org/acdw/emacs + +;; This file is not part of GNU Emacs. + +;;; Commentary: +;; This file is automatically tangled from config.org. +;; Hand edits will be overwritten! + +;;; Code: + +(setq-default load-prefer-newer t) + +(let* (;; Speed up init + (gc-cons-threshold most-positive-fixnum) + ;; (gc-cons-percentage 0.6) + (file-name-handler-alist nil) + ;; Config file names + (config (expand-file-name "config" + user-emacs-directory)) + (config.el (concat config ".el")) + (config.org (concat config ".org")) + (straight-org-dir (locate-user-emacs-file "straight/build/org"))) + ;; Okay, let's figure this out. + ;; `and' evaluates each form, and returns nil on the first that + ;; returns nil. `unless' only executes its body if the test + ;; returns nil. So. + ;; 1. Test if config.org is newer than config.el. If it is (t), we + ;; *want* to evaluate the body, so we need to negate that test. + ;; 2. Try to load the config. If it errors (nil), it'll bubble that + ;; to the `and' and the body will be evaluated. + (unless (and (not (file-newer-than-file-p config.org config.el)) + (load config :noerror)) + ;; A plain require here just loads the older `org' + ;; in Emacs' install dir. We need to add the newer + ;; one to the `load-path', hopefully that's all. + (when (file-exists-p straight-org-dir) + (add-to-list 'load-path straight-org-dir)) + ;; Load config.org + (message "%s..." "Loading config.org") + (require 'org) + (org-babel-load-file config.org) + (message "%s... Done" "Loading config.org"))) + +;;; 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 @@ -; Elpher bookmarks file - -; Bookmarks are stored as a list of (label URL) items. -; Feel free to edit by hand, but take care to ensure -; the list structure remains intact. - -(("MEDUSAE directory" "gemini://medusae.space/") - ("Will Lewis" "gemini://wflewis.com/") - ("Cornbread Recipe" "gemini://perplexing.space/2021/cornbread-recipe.gmi") - ("SMOG" "gemini://gemini.trans-neptunian.space/~smog/") - ("Caolan - Vermont Sourdough" "gemini://caolan.uk/baking/2020-11-26_vermont_sourdough.gmi") - ("BREADPUNK!" "gemini://breadpunk.club/") - ("ACDW" "gemini://gem.acdw.net/") - ("Spacewalk" "gemini://rawtext.club/~sloum/spacewalk.gmi") - ("CAPCOM" "gemini://gemini.circumlunar.space/capcom/") - ("cosmic voyage" "gemini://cosmic.voyage/") - ("kayw" "gemini://salejandro.me/") - ("low-key: weechat relay" "gemini://low-key.me/guides/weechat_irc_relay.gmi")) +; Elpher bookmarks file + +; Bookmarks are stored as a list of (label URL) items. +; Feel free to edit by hand, but take care to ensure +; the list structure remains intact. + +(("MEDUSAE directory" "gemini://medusae.space/") + ("Will Lewis" "gemini://wflewis.com/") + ("Cornbread Recipe" "gemini://perplexing.space/2021/cornbread-recipe.gmi") + ("SMOG" "gemini://gemini.trans-neptunian.space/~smog/") + ("Caolan - Vermont Sourdough" "gemini://caolan.uk/baking/2020-11-26_vermont_sourdough.gmi") + ("BREADPUNK!" "gemini://breadpunk.club/") + ("ACDW" "gemini://gem.acdw.net/") + ("Spacewalk" "gemini://rawtext.club/~sloum/spacewalk.gmi") + ("CAPCOM" "gemini://gemini.circumlunar.space/capcom/") + ("cosmic voyage" "gemini://cosmic.voyage/") + ("kayw" "gemini://salejandro.me/") + ("low-key: weechat relay" "gemini://low-key.me/guides/weechat_irc_relay.gmi")) -- cgit 1.4.1-21-gabe81