Removed submodules, no longer needed
This commit is contained in:
parent
6890f25891
commit
784af7e25b
|
@ -1,9 +0,0 @@
|
||||||
[submodule "org-mode"]
|
|
||||||
path = vendor/org-mode
|
|
||||||
url = https://git.savannah.gnu.org/git/emacs/org-mode.git/
|
|
||||||
[submodule "tera-mode"]
|
|
||||||
path = vendor/tera-mode
|
|
||||||
url = https://github.com/svavs/tera-mode.git
|
|
||||||
[submodule "vendor/org-contrib"]
|
|
||||||
path = vendor/org-contrib
|
|
||||||
url = https://git.sr.ht/~bzg/org-contrib
|
|
35
README.org
35
README.org
|
@ -1,7 +1,7 @@
|
||||||
* My Emacs Configuration
|
* My Emacs Configuration
|
||||||
|
|
||||||
This is my Emacs configuration. It's been written and rewritten and
|
This is my Emacs configuration. It's been written and rewritten and
|
||||||
refactored and migrated and changed and updated since the late '90s.
|
refactored and migrated and changed and updated since the 1990s.
|
||||||
|
|
||||||
I keep this setup in git because I like to keep it up to date across
|
I keep this setup in git because I like to keep it up to date across
|
||||||
all the computers I use — work laptop, home workstation, home laptop,
|
all the computers I use — work laptop, home workstation, home laptop,
|
||||||
|
@ -17,40 +17,25 @@ This means that my configuration is a human-readable document that
|
||||||
puts comments first, and embeds the actual configuration elisp as code
|
puts comments first, and embeds the actual configuration elisp as code
|
||||||
snippets.
|
snippets.
|
||||||
|
|
||||||
The main file is called [configuration.org](configuration.org), and
|
The main file is called [configuration.org](configuration.org), and is
|
||||||
is in =org-mode= format.
|
in =org-mode= format.
|
||||||
|
|
||||||
Files found in =~/.emacs.d/local= are ignore by Git, but added to
|
Files found in =~/.emacs.d/local= (if it exists) are ignore by Git,
|
||||||
the load path.
|
but added to the load path.
|
||||||
|
|
||||||
Files found in =~/.emacs.d/lisp= are checked into Git, and added to
|
** Usage
|
||||||
the load path.
|
|
||||||
|
|
||||||
** Getting Started
|
If you already have an .emacs.d directory, make a backup!
|
||||||
|
|
||||||
The process for bootstrapping all this stuff is complicated
|
: $ mv -f ~/.emacs.d ~/.emacs.d.OLD
|
||||||
a little bit by the fact that I use the latest =org-mode=
|
|
||||||
as a Git submodule. The full process for getting everything running
|
|
||||||
is as follows:
|
|
||||||
|
|
||||||
*** Clone the Repository
|
Then, simply clone the project.
|
||||||
|
|
||||||
: $ git clone git@github.com:sethm/emacs-files.git ~/.emacs.d
|
: $ git clone git@github.com:sethm/emacs-files.git ~/.emacs.d
|
||||||
|
|
||||||
*** Update the =org-mode= and =tera-mode= submodules
|
|
||||||
|
|
||||||
: $ cd ~/.emacs.d
|
|
||||||
: $ git submodule init
|
|
||||||
: $ git submodule update
|
|
||||||
|
|
||||||
*** Build =org-mode=
|
|
||||||
|
|
||||||
: $ cd ~/.emacs.d/vendor/org-mode
|
|
||||||
: $ make
|
|
||||||
|
|
||||||
** License
|
** License
|
||||||
|
|
||||||
Copyright 1995–2020, Seth J. Morabito <web@loomcom.com>
|
Copyright 1995–2022, Seth J. Morabito <web@loomcom.com>
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
a copy of this software and associated documentation files (the
|
a copy of this software and associated documentation files (the
|
||||||
|
|
|
@ -29,32 +29,12 @@ readable prose is ignored by the interpreter or compiler.
|
||||||
|
|
||||||
The magic here is provided by =org-babel=, which provides a method for
|
The magic here is provided by =org-babel=, which provides a method for
|
||||||
extracting and evaluating Emacs Lisp expressions inside an =org-mode=
|
extracting and evaluating Emacs Lisp expressions inside an =org-mode=
|
||||||
file.
|
file. The only thing needed in the main Emacs init file is this line:
|
||||||
|
|
||||||
*There is one more thing:* Emacs comes with a built-in version of Org
|
|
||||||
Mode that is usually out of date. Because I like to live on the
|
|
||||||
bleeding edge of Org Mode, I provide my own checkout as a git
|
|
||||||
submodule. The first two lines of my =init.el= file then add this
|
|
||||||
submodule to the load path. This is required to use the submodule
|
|
||||||
version of org mode. My =init.el= looks like this, in its entirety:
|
|
||||||
|
|
||||||
#+BEGIN_EXAMPLE
|
#+BEGIN_EXAMPLE
|
||||||
(add-to-list 'load-path "~/.emacs.d/vendor/org-mode/lisp")
|
|
||||||
(add-to-list 'load-path "~/.emacs.d/vendor/org-contrib/lisp")
|
|
||||||
|
|
||||||
(org-babel-load-file "~/.emacs.d/configuration.org")
|
(org-babel-load-file "~/.emacs.d/configuration.org")
|
||||||
#+END_EXAMPLE
|
#+END_EXAMPLE
|
||||||
|
|
||||||
To finish the bootstrap, all you need to do is:
|
|
||||||
|
|
||||||
#+BEGIN_EXAMPLE
|
|
||||||
$ cd ~/.emacs.d
|
|
||||||
$ git submodule init
|
|
||||||
$ git submodule update
|
|
||||||
$ cd ~/.emacs.d/org-mode
|
|
||||||
$ make
|
|
||||||
#+END_EXAMPLE
|
|
||||||
|
|
||||||
* Basic Setup
|
* Basic Setup
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:CUSTOM_ID: basic-setup
|
:CUSTOM_ID: basic-setup
|
||||||
|
@ -1124,20 +1104,6 @@ in the =snippets= directory.
|
||||||
:config (yasnippet-snippets-initialize))
|
:config (yasnippet-snippets-initialize))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** Tera Mode
|
|
||||||
|
|
||||||
One of my projects uses [[https://tera.netlify.app/][the Tera template language]], so I add
|
|
||||||
support here. Unfortunately, ~tera-mode~ is not in ELPA or MELPA,
|
|
||||||
so I have it checked out as a sub-module. I also just lazily enable
|
|
||||||
~tera-mode~ by hand when I need it.
|
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
|
||||||
(add-to-list 'load-path "~/.emacs.d/vendor/tera-mode")
|
|
||||||
(require 'tera-mode)
|
|
||||||
;; Set offset for HTML/XML-like things
|
|
||||||
(setq sgml-basic-offset 4)
|
|
||||||
#+END_SRC
|
|
||||||
|
|
||||||
** Markdown
|
** Markdown
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
|
3
init.el
3
init.el
|
@ -5,7 +5,4 @@
|
||||||
;;
|
;;
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(add-to-list 'load-path "~/.emacs.d/vendor/org-mode/lisp")
|
|
||||||
(add-to-list 'load-path "~/.emacs.d/vendor/org-contrib/lisp")
|
|
||||||
|
|
||||||
(org-babel-load-file "~/.emacs.d/configuration.org")
|
(org-babel-load-file "~/.emacs.d/configuration.org")
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit b8012e759bd5bf5da802b0b41734a8fec218323c
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit fbff082f733858e547a07ad452b6e3ed61a30099
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit a3a8e37ba169ce00c4a6201aa509555521a99b11
|
|
Loading…
Reference in New Issue