summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--emacs.d/init.el12
-rw-r--r--emacs.d/lib/basic-theme.el59
2 files changed, 6 insertions, 65 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index a234233..8a5e1e9 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -30,12 +30,6 @@
          ("s--" . fc/scale-down-font)
          ("s-0" . fc/reset-font-size)))
 
-(use-package basic-theme
-  ;; this is my own custom theme. No syntax highlighting
-  :load-path (lambda () (expand-file-name "lib" user-emacs-directory))
-  :config
-  (load-theme 'basic t))
-
 (use-package bindings
   ;; my own custom bindings
   :load-path (lambda () (expand-file-name  "lib" user-emacs-directory)))
@@ -510,6 +504,12 @@
   (setq tramp-default-method "ssh"
         tramp-persistency-file-name (expand-file-name "var/tramp" user-emacs-directory)))
 
+(use-package wabi-sabi-theme
+  ;; this is my own custom theme. No syntax highlighting
+  :load-path (lambda () (expand-file-name  "~/src/wabi-sabi-theme.el/"))
+  :config
+  (load-theme 'wabi-sabi t))
+
 (use-package whitespace
   ;; highlight white spaces
   :config
diff --git a/emacs.d/lib/basic-theme.el b/emacs.d/lib/basic-theme.el
deleted file mode 100644
index 66c8ad1..0000000
--- a/emacs.d/lib/basic-theme.el
+++ /dev/null
@@ -1,59 +0,0 @@
-;;; basic-theme.el --- Black and light yellow theme without syntax highlighting
-
-;;; Code:
-
-(deftheme basic)
-
-(defvar basic-faces
-  `(default
-    font-lock-builtin-face
-    font-lock-constant-face
-    font-lock-function-name-face
-    font-lock-keyword-face
-    font-lock-negation-char-face
-    font-lock-preprocessor-face
-    font-lock-regexp-grouping-backslash
-    font-lock-regexp-grouping-construct
-    font-lock-string-face
-    font-lock-type-face
-    font-lock-variable-name-face
-    font-lock-warning-face
-    fringe
-    sh-quoted-exec))
-
-(let ((bg          "#fdfaf5")
-      (fg          "#000000")
-      (highlight   "#fffaaa")
-      (modeline-fg "#ffffff")
-      (modeline-bg "#e0ebf5"))
-
-  (apply 'custom-theme-set-faces 'basic
-         `(default   ((t (:foreground ,fg :background ,bg))))
-         `(cursor    ((t (:background ,fg :foreground ,bg))))
-         `(highlight ((t (:background ,highlight))))
-
-         `(whitespace-indentation ((t (:background "LightYellow" :foreground "lightgray"))))
-
-         `(mode-line           ((t (:foreground: ,fg :background ,modeline-bg))))
-         `(mode-line-inactive  ((t (:foreground "grey20" :background "grey90"))))
-
-         `(show-paren-match ((t (:background "turquoise"))))
-         `(hl-line ((t (:background "grey90"))))
-
-         `(font-lock-comment-face           ((t (:foreground ,fg :weight bold))))
-         `(font-lock-comment-delimiter-face ((t (:foreground ,fg :weight bold))))
-         `(font-lock-doc-face               ((t (:foreground ,fg :weight bold))))
-         `(font-lock-doc-string-face        ((t (:foreground ,fg :weight bold))))
-
-         `(region ((t (:background ,highlight :foreground ,fg))))
-
-         (mapcar (lambda (n) `(,n ((t (:background ,bg :foreground ,fg))))) basic-faces)))
-
-;;;###autoload
-(when load-file-name
-  (add-to-list 'custom-theme-load-path
-               (file-name-as-directory (file-name-directory load-file-name))))
-
-(provide-theme 'basic)
-
-;;; basic-theme.el ends here