diff options
| author | Ryan Kavanagh <rak@rak.ac> | 2023-02-09 18:12:08 -0500 |
|---|---|---|
| committer | Ryan Kavanagh <rak@rak.ac> | 2023-02-09 18:12:08 -0500 |
| commit | 2a96a851a8db91d9ee6338f123f0abd42b1812c9 (patch) | |
| tree | 80e522e0729518d68b45ec858b3e4cf63348d45a | |
| parent | Merge commit 'bf77e060f17055a5efa6941be7a94cb278d3935c' as 'dot_emacs.d/local... (diff) | |
actually install dictem
| -rw-r--r-- | .chezmoiignore | 2 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | dot_emacs.tmpl | 1 | ||||
| -rw-r--r-- | emacsen/Makefile | 48 | ||||
| m--------- | emacsen/dictem | 0 |
5 files changed, 3 insertions, 51 deletions
diff --git a/.chezmoiignore b/.chezmoiignore index 076df73..f96270e 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -44,6 +44,8 @@ crontab .emacs.d/elpa/* !.emacs.d/elpa/gnupg !.emacs.d/elpa/gnupg/pubring.kbx +.emacs.d/local/dictem/* +!.emacs.d/local/dictem/*.el .emacs.d/transient .fonts .gnupg/* diff --git a/.gitmodules b/.gitmodules index 6c03175..1e1b1b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "emacsen/dictem"] - path = emacsen/dictem - url = https://github.com/cheusov/dictem.git [submodule "dot_fonts/Inconsolata-Hellenic"] path = fonts/Inconsolata-Hellenic url = git://github.com/cosmix/Inconsolata-Hellenic.git diff --git a/dot_emacs.tmpl b/dot_emacs.tmpl index 8fc67a1..167aaf8 100644 --- a/dot_emacs.tmpl +++ b/dot_emacs.tmpl @@ -3,6 +3,7 @@ (require 'package) (setq package-enable-at-startup nil) (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) +(add-to-list 'load-path "~/.emacs.d/local") (package-initialize) ;; Bootstrap `use-package' diff --git a/emacsen/Makefile b/emacsen/Makefile deleted file mode 100644 index ce070d9..0000000 --- a/emacsen/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -EMACSD=~/.emacs.d/ - -SUBDIRS = dictem - -MAKEDIRS = $(SUBDIRS:%=make-%) -INSTALLDIRS = $(SUBDIRS:%=install-%) -CLEANDIRS = $(SUBDIRS:%=clean-%) - -all: subdirs - -subdirs: $(MAKEDIRS) - -$(MAKEDIRS): - $(MAKE) -C $(@:make-%=%) - touch $@ - -install: $(INSTALLDIRS) - [ ! -d $(EMACSD)/share/info ] || install-info $(EMACSD)/share/info/*.info $(EMACSD)/share/info/dir - -install-% : make-% -$(INSTALLDIRS): - -mkdir -p $(EMACSD)/$(@:install-%=%) - $(MAKE) -C $(@:install-%=%) install DIR=$(EMACSD)/$(@:install-%=%) - -clean: $(CLEANDIRS) - rm -f make-* - -$(CLEANDIRS): - [ ! -f $(@:clean-%=%)/Makefile ] || $(MAKE) -C $(@:clean-%=%) clean - -# Manual overrides: -make-dictem: - touch $@ - -clean-dictem: - echo $@ - -install-dictem: - -mkdir -p $(EMACSD)/$(@:install-%=%) - install -m 644 $(@:install-%=%)/*.el $(EMACSD)/$(@:install-%=%) - -clobber: - for dir in $(SUBDIRS); do \ - git --git-dir=$${dir}/.git reset --hard HEAD; \ - git --git-dir=$${dir}/.git clean -qxdf; \ - done - -.PHONY: all install clean $(CLEANDIRS) clobber diff --git a/emacsen/dictem b/emacsen/dictem deleted file mode 160000 -Subproject 078e60824eb97ac4e9f0a3033b2f592219a8152 |