ソースを参照

Move default visual customizations out of custom.el

Josh Bicking 7 年 前
コミット
2f2248430d
2 ファイル変更20 行追加5 行削除
  1. 16 3
      emacs.d/init.el
  2. 4 2
      emacs.d/packages/packages.el

+ 16 - 3
emacs.d/init.el

@@ -147,14 +147,27 @@
       (t (message "")))
 
 
+;;;; Default face customizations
+
+(set-face-attribute 'default nil :height 120 :family "Ubuntu Mono")
+(set-face-attribute 'evil-goggles-delete-face nil :inherit 'diff-removed)
+(set-face-attribute 'evil-goggles-paste-face nil :inherit 'diff-added)
+(set-face-attribute 'evil-goggles-undo-redo-add-face nil :inherit 'diff-added)
+(set-face-attribute 'evil-goggles-undo-redo-change-face nil :inherit 'diff-changed)
+(set-face-attribute 'evil-goggles-undo-redo-remove-face nil :inherit 'diff-removed)
+(set-face-attribute 'evil-goggles-yank-face nil :inherit 'diff-changed)
+(set-face-attribute 'linum-relative-current-face nil :inherit 'linum :background "dim gray" :foreground "white" :underline nil)
+(set-face-attribute 'mode-line-buffer-id-inactive nil :inherit 'mode-line-buffer-id :background "#fdf6e3")
+(set-face-attribute 'show-paren-match nil :background "light gray" :foreground "#d33682" :weight 'bold)
+
+
 ;;;; Custom
+
 (defconst custom-file (expand-file-name "custom.el" user-emacs-directory))
 
 ;; if no custom file exists, write a default one
 (unless (file-exists-p custom-file)
-  (write-region "(custom-set-faces
- '(linum-relative-current-face ((t (:inherit linum :background \"dim gray\" :foreground \"white\" :underline nil))))
- '(show-paren-match ((t (:background \"light gray\" :foreground \"#d33682\" :weight bold)))))
+  (write-region "(custom-set-faces)
 (custom-set-variables
  '(custom-enabled-themes (quote (solarized-light)))
  '(custom-safe-themes

+ 4 - 2
emacs.d/packages/packages.el

@@ -483,7 +483,8 @@
 
 	(org-agenda nil "z" 'buffer)))
   ;; Not sure if this can be placed in a :bind statement
-  (evil-define-key 'motion org-agenda-mode-map (kbd "RET") '(lambda () (interactive) (org-agenda-switch-to t))))
+  (evil-define-key 'motion org-agenda-mode-map (kbd "RET") '(lambda () (interactive) (org-agenda-switch-to t)))
+  (setq org-agenda-files (quote ("~/Owncloud/org/organizer.org"))))
 
 (use-package org-preview-html
   :commands org-preview-html/preview
@@ -557,7 +558,6 @@
 			("*Help*" :align t :size 0.4 :select t)
 			("\\`\\*intero:.*:repl\\*\\'" :regexp t :align t :size 0.4))))
 
-
 (use-package which-key
   :ensure t
   :diminish which-key-mode
@@ -737,6 +737,8 @@
 
 (defvar gdb-many-windows t)
 
+(setq tramp-syntax (quote default))
+
 (use-package flyspell
   :config
   ;; move point to previous error