commit 309fed93b82cfca8810b77fb16e86f219ae5407f
parent 5d94e68c2a2108f5a8701ff9135c620d64bc000a
Author: Mark Feller <mfeller@recurly.com>
Date: Mon, 24 Aug 2020 18:58:28 -0600
merge macOS emacs and linux emacs config directories
Signed-off-by: Mark Feller <mfeller@recurly.com>
Diffstat:
5 files changed, 27 insertions(+), 196 deletions(-)
diff --git a/dots/.config/emacs/README b/dots/.config/emacs/README
@@ -2,33 +2,29 @@ Installation
To install, clone this repo to ~/.emacs.d.
- git clone https://gitlab.com/mark.feller/emacs.d ~/.emacs.d
+ git clone https://gitlab.com/mark.feller/emacs.d ~/.emacs.d
-Upon starting up Emacs for the first time, packages will be downloaded and
-installed via the public repos. If you encounter any errors at that stage, try
-restarting Emacs, and possibly running 'M-x package-refresh-contents' before
-doing so. After successfully installing packages future startups will be much
-faster.
+Upon starting up Emacs for the first time, packages will be downloaded
+and installed via the public repos. If you encounter any errors at that
+stage, try restarting Emacs, and possibly running 'M-x
+package-refresh-contents' before doing so. After successfully installing
+packages future startups will be much faster.
There are several subdirectories:
-'core' holds primary configuration that I feel lost without.
-'elpa' holds vendored packages from package.el.
-'etc' holds configuration files for packages, files often written to
- like bookmarks.el, and the custom.el file used when configuring
- emacs through the customization interface.
-'lisp' holds custom user lisp code. Useful for personal packages,
- personal information, etc.
-'modules' holds package/language specific configuration that is useful when
- working with specific tasks or within specific languages, but are
- not needed generally.
-'src' holds the Emacs source directory for jumping to definition and
- viewing docs within the C code.
-'snippets' holds Yasnippet snippets.
-'theme' holds theme packages. Poet is my current goto.
+'core' holds primary configuration that I feel lost without.
+'lisp' holds custom user lisp code. Useful for site packages,
+ personal information, etc.
+'modules' holds package/language specific configuration that is
+ useful when working with specific tasks or within specific
+ languages, but are not needed generally.
+'src' holds the Emacs source directory for jumping to definition
+ and viewing docs within the C code.
+'snippets' holds Yasnippet snippets.
+'theme' holds theme packages. Poet is my current goto.
Disclaimer
-This is an everchanging and evolving Emacs configuration for my personal use. I
-see this repo more as a collection of ideas to be incorporated into your own
-configurations.-
\ No newline at end of file
+This is an everchanging and evolving Emacs configuration for my personal
+use. I see this repo more as a collection of ideas to be incorporated
+into your own configurations.+
\ No newline at end of file
diff --git a/dots/.config/emacs/init.el b/dots/.config/emacs/init.el
@@ -65,15 +65,9 @@
(defvar modules-dir (expand-file-name "modules" emacs-dir)
"This directory houses all of the modules.")
-(defvar persistent-dir (expand-file-name "etc" emacs-dir)
- "This directory houses files created by emacs packages")
-
(defvar lisp-dir (expand-file-name "lisp" emacs-dir)
"This directory houses user lisp and site lisp")
-(unless (file-exists-p persistent-dir)
- (make-directory persistent-dir))
-
(if (file-exists-p (concat emacs-dir "src"))
(setq source-directory (concat emacs-dir "src")))
@@ -82,7 +76,7 @@
(add-to-list 'load-path lisp-dir)
;; load the custom file
-(setq custom-file (concat persistent-dir "/custom.el"))
+(setq custom-file "~/.cache/emacs-custom.el")
(unless (file-exists-p custom-file)
(write-region "" nil custom-file))
(load custom-file)
@@ -97,7 +91,7 @@
(require 'core-bootstrap)
(require 'core-ui)
-(when (eq system-type 'darwin) (require 'core-osx))
+(when (eq system-type 'darwin) (require 'core-macos))
(require 'core-packages)
(require 'core-defuns)
(require 'core-paths)
@@ -108,19 +102,22 @@
(message "Loading modules...")
-;; (require 'module-bbdb)
(require 'module-c)
(require 'module-company)
(require 'module-docker)
(require 'module-eldoc)
+(require 'module-elfeed)
(require 'module-emacs-lisp)
+(require 'module-eshell)
(require 'module-evil)
(require 'module-git)
(require 'module-go)
+(require 'module-kubernetes)
+(require 'module-ledger)
(require 'module-multiple-cursors)
+(require 'module-notmuch)
(require 'module-org)
(require 'module-projectile)
-(require 'module-protobuf)
(require 'module-python)
(require 'module-restclient)
(require 'module-yaml)
diff --git a/dots/.emacs.d/scripts/Center-Window.scpt b/dots/.config/emacs/scripts/Center-Window.scpt
Binary files differ.
diff --git a/dots/.emacs.d/README b/dots/.emacs.d/README
@@ -1,30 +0,0 @@
-Installation
-
-To install, clone this repo to ~/.emacs.d.
-
- git clone https://gitlab.com/mark.feller/emacs.d ~/.emacs.d
-
-Upon starting up Emacs for the first time, packages will be downloaded
-and installed via the public repos. If you encounter any errors at that
-stage, try restarting Emacs, and possibly running 'M-x
-package-refresh-contents' before doing so. After successfully installing
-packages future startups will be much faster.
-
-There are several subdirectories:
-
-'core' holds primary configuration that I feel lost without.
-'lisp' holds custom user lisp code. Useful for site packages,
- personal information, etc.
-'modules' holds package/language specific configuration that is
- useful when working with specific tasks or within specific
- languages, but are not needed generally.
-'src' holds the Emacs source directory for jumping to definition
- and viewing docs within the C code.
-'snippets' holds Yasnippet snippets.
-'theme' holds theme packages. Poet is my current goto.
-
-Disclaimer
-
-This is an everchanging and evolving Emacs configuration for my personal
-use. I see this repo more as a collection of ideas to be incorporated
-into your own configurations.-
\ No newline at end of file
diff --git a/dots/.emacs.d/init.el b/dots/.emacs.d/init.el
@@ -1,131 +0,0 @@
-;;; init.el --- initialize
-
-;; Author: Mark Feller <mark.feller@member.fsf.org>
-
-;; This file is not part of GNU Emacs.
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this file. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-;;---------------------------------------------------------------------
-;; Init
-;;---------------------------------------------------------------------
-
-;; Added by Package.el. This must come before configurations of
-;; installed packages. Don't delete this line. If you don't want it,
-;; just comment it out by adding a semicolon to the start of the line.
-;; You may delete these explanatory comments.
-(package-initialize)
-
-(defvar current-user
- (getenv
- (if (equal system-type 'windows-nt) "USERNAME" "USER")))
-
-(message "Powering up... Be patient, Master %s!" current-user)
-
-(when (version< emacs-version "24.4")
- (error "Requires at least GNU Emacs 24.4, but you're running %s" emacs-version))
-
-;; Always load newest byte code
-(setq load-prefer-newer t)
-
-;; reduce the frequency of garbage collection by making it happen on
-;; each 50MB of allocated data (the default is on every 0.76MB)
-(setq gc-cons-threshold 50000000)
-
-;; warn when opening files bigger than 100MB
-(setq large-file-warning-threshold 100000000)
-
-(setq inhibit-startup-echo-area-message t)
-
-;;---------------------------------------------------------------------
-;; Variables and Load Paths
-;;---------------------------------------------------------------------
-
-(defvar emacs-dir (file-name-directory "~/.emacs.d/")
- "The root dir of the Emacs distribution.")
-
-(defvar core-dir (expand-file-name "core" emacs-dir)
- "The home of core functionality.")
-
-(defvar modules-dir (expand-file-name "modules" emacs-dir)
- "This directory houses all of the modules.")
-
-(defvar lisp-dir (expand-file-name "lisp" emacs-dir)
- "This directory houses user lisp and site lisp")
-
-(if (file-exists-p (concat emacs-dir "src"))
- (setq source-directory (concat emacs-dir "src")))
-
-(add-to-list 'load-path core-dir)
-(add-to-list 'load-path modules-dir)
-(add-to-list 'load-path lisp-dir)
-
-;; load the custom file
-(setq custom-file "~/.cache/emacs-custom.el")
-(unless (file-exists-p custom-file)
- (write-region "" nil custom-file))
-(load custom-file)
-
-(require 'init-preload-local nil t)
-
-;;---------------------------------------------------------------------
-;; Core
-;;---------------------------------------------------------------------
-
-(message "Loading core...")
-
-(require 'core-bootstrap)
-(require 'core-ui)
-(when (eq system-type 'darwin) (require 'core-macos))
-(require 'core-packages)
-(require 'core-defuns)
-(require 'core-paths)
-
-;;---------------------------------------------------------------------
-;; Modules
-;;---------------------------------------------------------------------
-
-(message "Loading modules...")
-
-(require 'module-c)
-(require 'module-company)
-(require 'module-docker)
-(require 'module-eldoc)
-(require 'module-elfeed)
-(require 'module-emacs-lisp)
-(require 'module-eshell)
-(require 'module-evil)
-(require 'module-git)
-(require 'module-go)
-(require 'module-kubernetes)
-(require 'module-ledger)
-(require 'module-multiple-cursors)
-(require 'module-notmuch)
-(require 'module-org)
-(require 'module-projectile)
-(require 'module-python)
-(require 'module-restclient)
-(require 'module-yaml)
-(require 'module-yasnippet)
-
-;; load any custom user provided locals
-(require 'init-local nil t)
-
-(message "Ready to do thy bidding, Master %s!" current-user)
-
-;;; init.el ends here
