diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | emacs/Makefile | 13 | ||||
| -rw-r--r-- | emacs/eshell/Makefile | 5 | ||||
| -rw-r--r-- | emacs/gtkrc | 19 | ||||
| -rw-r--r-- | emacs/site-lisp/Makefile | 11 | ||||
| -rw-r--r-- | emacs/snippets/Makefile | 4 | ||||
| -rw-r--r-- | emacs/snippets/html-mode/Makefile | 3 | ||||
| -rw-r--r-- | emacs/snippets/org-mode/Makefile | 3 | ||||
| -rw-r--r-- | emacs/snippets/python-mode/Makefile | 3 |
9 files changed, 43 insertions, 20 deletions
@@ -1,5 +1,5 @@ export DESTDIR:=$(HOME) -modules=emacs .config .conkerorrc .local .moc .ncmpcpp .sawfish .ssh \ +modules=.config .conkerorrc .local .moc .ncmpcpp .sawfish .ssh \ .w3m .zsh sbcl objects=.bash_profile .beetsconfig .gitconfig .guile .hgrc \ .offlineimap.py .offlineimaprc .screenrc .stumpwmrc .urlview \ diff --git a/emacs/Makefile b/emacs/Makefile index 8d99401..51d9c84 100644 --- a/emacs/Makefile +++ b/emacs/Makefile @@ -1,10 +1,17 @@ SUBDIR=.emacs.d -objects=init.elc init.el gnus.elc gnus.el -modules=eshell site-lisp snippets +MODULES=eshell site-lisp snippets +EXCLUDE=auto-save-list/ elpa/ .org-id-locations abbrev_defs \ + ac-comphist.dat bookmarks custom.el* emms-streams flymake.log \ + geiser-history.guile history loaddefs.el smex-items srecode-map.el \ + tramp elnode/ emms/ image-dired/ jabber-hist/ jabber/ newsticker/ \ + packages/ semanticdb/ templates/ themes/ url/ var/ vendor-lisp/ \ + init.html init.org project.el* _publish/ EMACS=emacs -include ../dotfiles.mk +include ../dotfiles2.mk + +install: init.el init.el: init.org $(EMACS) -Q -batch \ diff --git a/emacs/eshell/Makefile b/emacs/eshell/Makefile index 3b6ce2f..9519abb 100644 --- a/emacs/eshell/Makefile +++ b/emacs/eshell/Makefile @@ -1,5 +1,4 @@ SUBDIR=eshell -objects=alias -modules= +EXCLUDE=login lastdir history -include ../../dotfiles.mk +include ../../dotfiles2.mk diff --git a/emacs/gtkrc b/emacs/gtkrc new file mode 100644 index 0000000..6b63cd7 --- /dev/null +++ b/emacs/gtkrc @@ -0,0 +1,19 @@ +gtk-font-name = "Envy Code R 12" + +style "yoshi" +{ + bg[NORMAL] = "#111113" + bg[SELECTED] = "#111113" + bg[INSENSITIVE] = "#111113" + bg[ACTIVE] = "#111113" + bg[PRELIGHT] = "#4a5b73" + + fg[NORMAL] = "#eeeeec" + fg[SELECTED] = "#eeeeec" + fg[INSENSITIVE] = "#a5a5a4" + fg[ACTIVE] = "#eeeeec" + fg[PRELIGHT] = "#eeeeec" +} + +widget "Emacs.*" style "yoshi" +widget_class "*Menu*" style "yoshi" diff --git a/emacs/site-lisp/Makefile b/emacs/site-lisp/Makefile index 91ee32e..0da215a 100644 --- a/emacs/site-lisp/Makefile +++ b/emacs/site-lisp/Makefile @@ -1,7 +1,8 @@ SUBDIR=site-lisp -objects=dzen.elc dzen.el eltuki.elc eltuki.el ext.elc ext.el \ - metalexpress.elc metalexpress.el mu4e-init.elc mu4e-init.el \ - oni.elc oni.el org-init.elc org-init.el quick-edit-mode.elc \ - quick-edit-mode.el -include ../../dotfiles.mk +include ../../dotfiles2.mk + +install: wm-init.elc + +wm-init.elc: wm-init.el + emacs -Q -batch -eval "(byte-compile-file \"wm-init.el\")" diff --git a/emacs/snippets/Makefile b/emacs/snippets/Makefile index e003ed3..193429f 100644 --- a/emacs/snippets/Makefile +++ b/emacs/snippets/Makefile @@ -1,4 +1,4 @@ SUBDIR=snippets -modules=html-mode org-mode python-mode +MODULES=html-mode org-mode python-mode -include ../../dotfiles.mk +include ../../dotfiles2.mk diff --git a/emacs/snippets/html-mode/Makefile b/emacs/snippets/html-mode/Makefile index 2d6defe..f0e0e33 100644 --- a/emacs/snippets/html-mode/Makefile +++ b/emacs/snippets/html-mode/Makefile @@ -1,4 +1,3 @@ SUBDIR=html-mode -objects=for generic-block -include ../../../dotfiles.mk +include ../../../dotfiles2.mk diff --git a/emacs/snippets/org-mode/Makefile b/emacs/snippets/org-mode/Makefile index 670b139..b9da9e8 100644 --- a/emacs/snippets/org-mode/Makefile +++ b/emacs/snippets/org-mode/Makefile @@ -1,4 +1,3 @@ SUBDIR=org-mode -objects=codeblock heading project snippet -include ../../../dotfiles.mk +include ../../../dotfiles2.mk diff --git a/emacs/snippets/python-mode/Makefile b/emacs/snippets/python-mode/Makefile index 8e8b652..7f2ddd3 100644 --- a/emacs/snippets/python-mode/Makefile +++ b/emacs/snippets/python-mode/Makefile @@ -1,4 +1,3 @@ SUBDIR=python-mode -objects=defm_empty form form_valid import_from permission_guard url -include ../../../dotfiles.mk +include ../../../dotfiles2.mk |