From 5fb7704c0f844191de7c5e4d03b059525348b5f4 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 13 Apr 2019 19:26:19 -0400 Subject: [PATCH] emacs: move configuration to .emacs.d --- Makefile => .emacs.d/Makefile | 0 {etc => .emacs.d/etc}/.dir-locals.el | 0 {etc => .emacs.d/etc}/custom.el | 0 {etc => .emacs.d/etc}/secrets.el | 0 init.org => .emacs.d/init.org | 0 {lisp => .emacs.d/lisp}/tangomod-theme.el | 0 .../straight}/versions/default.el | 0 {var => .emacs.d/var}/abbrev.el | 0 {var => .emacs.d/var}/eshell/alias | 0 .gitignore | 31 ++-- lisp/tangomod-dark-theme.el | 170 ------------------ 11 files changed, 15 insertions(+), 186 deletions(-) rename Makefile => .emacs.d/Makefile (100%) rename {etc => .emacs.d/etc}/.dir-locals.el (100%) rename {etc => .emacs.d/etc}/custom.el (100%) rename {etc => .emacs.d/etc}/secrets.el (100%) rename init.org => .emacs.d/init.org (100%) rename {lisp => .emacs.d/lisp}/tangomod-theme.el (100%) rename {straight => .emacs.d/straight}/versions/default.el (100%) rename {var => .emacs.d/var}/abbrev.el (100%) rename {var => .emacs.d/var}/eshell/alias (100%) delete mode 100644 lisp/tangomod-dark-theme.el diff --git a/Makefile b/.emacs.d/Makefile similarity index 100% rename from Makefile rename to .emacs.d/Makefile diff --git a/etc/.dir-locals.el b/.emacs.d/etc/.dir-locals.el similarity index 100% rename from etc/.dir-locals.el rename to .emacs.d/etc/.dir-locals.el diff --git a/etc/custom.el b/.emacs.d/etc/custom.el similarity index 100% rename from etc/custom.el rename to .emacs.d/etc/custom.el diff --git a/etc/secrets.el b/.emacs.d/etc/secrets.el similarity index 100% rename from etc/secrets.el rename to .emacs.d/etc/secrets.el diff --git a/init.org b/.emacs.d/init.org similarity index 100% rename from init.org rename to .emacs.d/init.org diff --git a/lisp/tangomod-theme.el b/.emacs.d/lisp/tangomod-theme.el similarity index 100% rename from lisp/tangomod-theme.el rename to .emacs.d/lisp/tangomod-theme.el diff --git a/straight/versions/default.el b/.emacs.d/straight/versions/default.el similarity index 100% rename from straight/versions/default.el rename to .emacs.d/straight/versions/default.el diff --git a/var/abbrev.el b/.emacs.d/var/abbrev.el similarity index 100% rename from var/abbrev.el rename to .emacs.d/var/abbrev.el diff --git a/var/eshell/alias b/.emacs.d/var/eshell/alias similarity index 100% rename from var/eshell/alias rename to .emacs.d/var/eshell/alias diff --git a/.gitignore b/.gitignore index 4303fd1..218b7e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,15 @@ -*.elc - -/early-init.el -/init.el - -/straight/* -!/straight/versions - -/var/* -/var/eshell/lastdir -/var/eshell/history - -!/var/eshell -!/var/eshell/alias - -!/var/abbrev.el +# byte-compiled elisp files +.emacs.d/*.elc +.emacs.d/early-init.el +.emacs.d/init.el + +# straight +.emacs.d/straight/* +!.emacs.d/straight/versions + +# various +.emacs.d/var/* +.emacs.d/var/eshell/lastdir +.emacs.d/var/eshell/history +!.emacs.d/var/eshell +!.emacs.d/var/abbrev.el diff --git a/lisp/tangomod-dark-theme.el b/lisp/tangomod-dark-theme.el deleted file mode 100644 index ccf441b..0000000 --- a/lisp/tangomod-dark-theme.el +++ /dev/null @@ -1,170 +0,0 @@ -;;; tango-dark-theme.el --- Tango-based custom theme for faces - -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. - -;; Authors: Chong Yidong -;; Jan Moringen - -;; This file is part of GNU Emacs. - -;; GNU Emacs 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 of the License, or -;; (at your option) any later version. - -;; GNU Emacs 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 GNU Emacs. If not, see . - -;;; Commentary - -;; The colors in this theme come from the Tango palette, which is in -;; the public domain: http://tango.freedesktop.org/ - -;;; Code: - -(deftheme tangomod-dark - "Face colors using the Tango palette (dark background). -Basic, Font Lock, Isearch, Gnus, Message, Ediff, Flyspell, -Semantic, and Ansi-Color faces are included.") - -(let ((class '((class color) (min-colors 89))) - ;; Tango palette colors. - (butter-1 "#fce94f") (butter-2 "#edd400") (butter-3 "#c4a000") - (orange-1 "#fcaf3e") (orange-2 "#f57900") (orange-3 "#ce5c00") - (choc-1 "#e9b96e") (choc-2 "#c17d11") (choc-3 "#8f5902") - (cham-1 "#8ae234") (cham-2 "#73d216") (cham-3 "#4e9a06") - (blue-1 "#729fcf") (blue-2 "#3465a4") (blue-3 "#204a87") - (plum-1 "#e090d7") (plum-2 "#75507b") (plum-3 "#5c3566") - (red-1 "#ef2929") (red-2 "#cc0000") (red-3 "#a40000") - (alum-1 "#eeeeec") (alum-2 "#d3d7cf") (alum-3 "#babdb6") - (alum-4 "#888a85") (alum-5 "#555753") (alum-6 "#2e3436") - ;; Not in Tango palette; used for better contrast. - (cham-0 "#b4fa70") (blue-0 "#8cc4ff") (plum-0 "#e9b2e3") - (red-0 "#ff4b4b") (alum-5.5 "#41423f") (alum-7 "#212526")) - - (custom-theme-set-faces - 'tangomod-dark - ;; Ensure sufficient contrast on low-color terminals. - `(default ((((class color) (min-colors 4096)) - (:foreground ,alum-1 :background ,alum-6)) - (((class color) (min-colors 256)) - (:foreground ,alum-1 :background "#222")) - (,class - (:foreground ,alum-1 :background "black")))) - `(cursor ((,class (:background ,butter-1)))) - ;; Highlighting faces - `(fringe ((,class (:background ,alum-7)))) - `(highlight ((,class (:foreground ,alum-6 :background ,butter-2)))) - `(region ((,class (:background ,alum-5)))) - `(secondary-selection ((,class (:background ,blue-3)))) - `(isearch ((,class (:foreground ,alum-1 :background ,orange-3)))) - `(lazy-highlight ((,class (:background ,choc-3)))) - `(trailing-whitespace ((,class (:background ,red-3)))) - ;; Paren face - `(show-paren-match ((,class (:background ,blue-3)))) - ;; Mode line faces - `(mode-line ((,class - ;; (:box (:line-width -1 :style released-button) - (:background ,alum-2 :foreground ,alum-6)))) - `(mode-line-inactive ((,class - ;; (:box (:line-width -1 :style released-button) - (:background ,alum-5 :foreground ,alum-1)))) - `(compilation-mode-line-fail ((,class (:foreground ,red-3)))) - `(compilation-mode-line-run ((,class (:foreground ,orange-3)))) - `(compilation-mode-line-exit ((,class (:foreground ,cham-3)))) - ;; Escape and prompt faces - `(minibuffer-prompt ((,class (:foreground ,cham-0)))) - `(escape-glyph ((,class (:foreground ,butter-3)))) - `(error ((,class (:foreground ,red-0)))) - `(warning ((,class (:foreground ,orange-1)))) - `(success ((,class (:foreground ,cham-1)))) - ;; Font lock faces - `(font-lock-builtin-face ((,class (:foreground ,cham-3)))) - `(font-lock-comment-face ((,class (:slant italic :foreground ,alum-3)))) - ;; `(font-lock-comment-face ((,class (:foreground ,cham-2)))) - `(font-lock-constant-face ((,class (:weight bold :foreground ,plum-0)))) - `(font-lock-function-name-face ((,class (:foreground ,butter-1)))) - `(font-lock-keyword-face ((,class (:foreground ,cham-0)))) - `(font-lock-string-face ((,class (:foreground ,choc-1)))) - `(font-lock-type-face ((,class (:foreground ,blue-0)))) - `(font-lock-variable-name-face ((,class (:foreground ,orange-1)))) - `(font-lock-negation-char-face ((,class (:weight bold)))) - ;; Button and link faces - `(link ((,class (:underline t :foreground ,blue-1)))) - `(link-visited ((,class (:underline t :foreground ,blue-2)))) - ;; Gnus faces - `(gnus-group-news-1 ((,class (:foreground ,plum-1)))) - `(gnus-group-news-1-low ((,class (:foreground ,plum-2)))) - `(gnus-group-news-2 ((,class (:foreground ,blue-1)))) - `(gnus-group-news-2-low ((,class (:foreground ,blue-2)))) - `(gnus-group-news-3 ((,class (:foreground ,cham-1)))) - `(gnus-group-news-3-low ((,class (:foreground ,cham-2)))) - `(gnus-group-news-4 ((,class (:foreground ,plum-0)))) - `(gnus-group-news-4-low ((,class (:foreground ,choc-2)))) - `(gnus-group-news-5 ((,class (:foreground ,orange-1)))) - `(gnus-group-news-5-low ((,class (:foreground ,orange-2)))) - `(gnus-group-news-low ((,class (:foreground ,butter-2)))) - `(gnus-group-mail-1 ((,class (:foreground ,plum-1)))) - `(gnus-group-mail-1-low ((,class (:foreground ,plum-2)))) - `(gnus-group-mail-2 ((,class (:foreground ,blue-1)))) - `(gnus-group-mail-2-low ((,class (:foreground ,blue-2)))) - `(gnus-group-mail-3 ((,class (:foreground ,cham-1)))) - `(gnus-group-mail-3-low ((,class (:foreground ,cham-2)))) - `(gnus-group-mail-low ((,class (:foreground ,butter-2)))) - `(gnus-header-content ((,class (:weight normal :foreground ,butter-3)))) - `(gnus-header-from ((,class (:foreground ,butter-2)))) - `(gnus-header-subject ((,class (:foreground ,cham-1)))) - `(gnus-header-name ((,class (:foreground ,blue-1)))) - `(gnus-header-newsgroups ((,class (:foreground ,choc-2)))) - ;; Message faces - `(message-header-name ((,class (:foreground ,blue-1)))) - `(message-header-cc ((,class (:foreground ,butter-3)))) - `(message-header-other ((,class (:foreground ,choc-2)))) - `(message-header-subject ((,class (:foreground ,cham-1)))) - `(message-header-to ((,class (:foreground ,butter-2)))) - `(message-cited-text ((,class (:foreground ,cham-1)))) - `(message-separator ((,class (:foreground ,plum-1)))) - ;; SMerge faces - `(smerge-refined-change ((,class (:background ,blue-3)))) - ;; Ediff faces - `(ediff-current-diff-A ((,class (:background ,alum-5)))) - `(ediff-fine-diff-A ((,class (:background ,blue-3)))) - `(ediff-even-diff-A ((,class (:background ,alum-5.5)))) - `(ediff-odd-diff-A ((,class (:background ,alum-5.5)))) - `(ediff-current-diff-B ((,class (:background ,alum-5)))) - `(ediff-fine-diff-B ((,class (:background ,choc-3)))) - `(ediff-even-diff-B ((,class (:background ,alum-5.5)))) - `(ediff-odd-diff-B ((,class (:background ,alum-5.5)))) - ;; Flyspell faces - `(flyspell-duplicate ((,class (:underline ,orange-1)))) - `(flyspell-incorrect ((,class (:underline ,red-1)))) - ;; Semantic faces - `(semantic-decoration-on-includes ((,class (:underline ,alum-4)))) - `(semantic-decoration-on-private-members-face - ((,class (:background ,plum-3)))) - `(semantic-decoration-on-protected-members-face - ((,class (:background ,choc-3)))) - `(semantic-decoration-on-unknown-includes - ((,class (:background ,red-3)))) - `(semantic-decoration-on-unparsed-includes - ((,class (:background ,alum-5.5)))) - `(semantic-tag-boundary-face ((,class (:overline ,blue-1)))) - `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))) - - (custom-theme-set-variables - 'tangomod-dark - `(ansi-color-names-vector [,alum-7 ,red-0 ,cham-0 ,butter-1 - ,blue-1 ,plum-1 ,blue-0 ,alum-1]))) - -(provide-theme 'tangomod-dark) - -;; Local Variables: -;; no-byte-compile: t -;; End: - -;;; tangomod-dark-theme.el ends here -- 2.20.1