summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-08-30 00:02:28 +0200
committerGravatar Tom Willemsen2011-08-30 00:02:28 +0200
commitcb909ac4732245c5420fd6eda65887bc30beb75e (patch)
treea255f3ea45b679104e9deeaf435a225f9a8886e0
parentac8a5d362fbc40bd6293477971a353e347f88a18 (diff)
downloaddotfiles-cb909ac4732245c5420fd6eda65887bc30beb75e.tar.gz
dotfiles-cb909ac4732245c5420fd6eda65887bc30beb75e.zip
EMACS: theme, fullscreen, font
`.emacs.d/functions.el' - Don't require the lcars-theme. - Removed theme settings for markdown mode. - Don't use the fullscreen function at startup. `.emacs.d/init.el' - Switched to naquadah-theme. - Change some markdown-mode theme settings when the naquadah theme is loaded. - Increased font-size to 11, from 10. `.emacs.d/ryuslash-load-path.el' - Added `~/.emacs.d/naquadah-theme' to `load-path'.
-rw-r--r--.emacs.d/functions.el17
-rw-r--r--.emacs.d/init.el18
-rw-r--r--.emacs.d/ryuslash-load-path.el1
3 files changed, 17 insertions, 19 deletions
diff --git a/.emacs.d/functions.el b/.emacs.d/functions.el
index c3e393d..00a458a 100644
--- a/.emacs.d/functions.el
+++ b/.emacs.d/functions.el
@@ -110,23 +110,6 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
(defun x-init ()
"Initialization only for X"
- (require 'lcars-theme)
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;; THEME SETTINGS ;;
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- (lcars-theme-set-faces
- 'lcars
-
- ;; markdown-mode
- '(markdown-link-face (:inherit 'link))
- '(markdown-header-face-1 (:inherit 'org-level-1))
- '(markdown-header-face-2 (:inherit 'org-level-2))
- '(markdown-header-face-3 (:inherit 'org-level-3))
- '(markdown-header-face-4 (:inherit 'org-level-4))
- '(markdown-header-face-5 (:inherit 'org-level-5))
- '(markdown-header-face-6 (:inherit 'org-level-6)))
-
- (add-hook 'emacs-startup-hook 'fullscreen)
(setq linum-format " %d"))
(defun cli-init ()
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 62cd22e..37b01e9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,6 +1,20 @@
;; -*- mode: Emacs-Lisp; -*-
(load "~/.emacs.d/ryuslash-load-path")
(load "~/.emacs.d/functions")
+;;; Theme
+(require 'naquadah-theme)
+(eval-after-load 'naquadah-theme
+ (naquadah-theme-set-faces
+ 'naquadah
+
+ ;; markdown-mode
+ '(markdown-link-face (:inherit 'link))
+ '(markdown-header-face-1 (:inherit 'org-level-1))
+ '(markdown-header-face-2 (:inherit 'org-level-2))
+ '(markdown-header-face-3 (:inherit 'org-level-3))
+ '(markdown-header-face-4 (:inherit 'org-level-4))
+ '(markdown-header-face-5 (:inherit 'org-level-5))
+ '(markdown-header-face-6 (:inherit 'org-level-6))))
;;; Autopair
(require 'autopair)
@@ -199,9 +213,9 @@
`((".*" ,temporary-file-directory t)))
(setq default-frame-alist ; default frame settings
- (append '((font . "DejaVu Sans Mono-10:antialias=true"))))
+ (append '((font . "DejaVu Sans Mono-11:antialias=true"))))
(setq initial-frame-alist ; initial frame settings
- (append '((font . "DejaVu Sans Mono-10:antialias=true"))))
+ (append '((font . "DejaVu Sans Mono-11:antialias=true"))))
(if window-system
(x-init)
diff --git a/.emacs.d/ryuslash-load-path.el b/.emacs.d/ryuslash-load-path.el
index 298c9e9..771772b 100644
--- a/.emacs.d/ryuslash-load-path.el
+++ b/.emacs.d/ryuslash-load-path.el
@@ -6,5 +6,6 @@
(add-to-list 'load-path "~/.emacs.d/elisp/rainbow")
(add-to-list 'load-path "~/.emacs.d/elisp/rainbow-delimiters")
(add-to-list 'load-path "~/.emacs.d/elisp/zencoding")
+(add-to-list 'load-path "~/.emacs.d/naquadah-theme")
(provide 'ryuslash-load-path)