ink/.emacs.d
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed part of the theme

Browse Source
This commit is contained in:
Iñaki
2016-09-15 21:04:49 +02:00
parent 5314948f66
commit 7e11d44f92
5 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
init.el
View File

@@ -7,7 +7,8 @@
(byte-compile-init-dir) (byte-compile-init-dir)
(load "~/.emacs.d/my-loadpackages.elc") (load "~/.emacs.d/my-loadpackages.elc")
(add-hook 'after-init-hook '(lambda () (add-hook 'after-init-hook
'(lambda ()
(load "~/.emacs.d/my-noexternals.elc") (load "~/.emacs.d/my-noexternals.elc")
(load "~/.emacs.d/my-setkeys.elc") (load "~/.emacs.d/my-setkeys.elc")
(load "~/.emacs.d/my-modeline.elc") (load "~/.emacs.d/my-modeline.elc")

6
my-modeline.el
View File

@@ -37,8 +37,7 @@
(let ((bufname (buffer-file-name (current-buffer)))) (let ((bufname (buffer-file-name (current-buffer))))
(when bufname (when bufname
(when (vc-working-revision bufname) (when (vc-working-revision bufname)
(concat (propertize (concat (format "  %s" (magit-get-current-branch))
(format "  %s" (magit-get-current-branch)) 'face 'bold)
(format " [%s]" (vc-state bufname))))))) (format " [%s]" (vc-state bufname)))))))
(setq-default mode-line-format (setq-default mode-line-format
@@ -48,8 +47,7 @@
;; left ;; left
(format-mode-line (format-mode-line
(concat (concat
(propertize (evil-mode-state) (evil-mode-state)
'face 'bold)
"[%b] [%*]" "[%b] [%*]"
(vc-mode-branch-state))) (vc-mode-branch-state)))
;; right ;; right

15
my-noexternals.el
View File

@@ -1,8 +1,11 @@
(when (fboundp 'menu-bar-mode) (menu-bar-mode -1)) (when (fboundp 'menu-bar-mode) (menu-bar-mode -1))
(when (fboundp 'tool-bar-mode) (tool-bar-mode -1)) (when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
(when (fboundp 'scroll-bar-mode) (scroll-bar-mode -1)) (when (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
(add-to-list 'default-frame-alist '(font . "Iosevka Term-10")) (add-to-list
(set-frame-font "Iosevka Term-10") 'default-frame-alist
'(font . "-ypn-envypn-medium-r-normal--15-150-75-75-c-90-iso8859-1"))
(set-frame-font
"-ypn-envypn-medium-r-normal--15-150-75-75-c-90-iso8859-1")
(setq inhibit-startup-screen t) (setq inhibit-startup-screen t)
(setq vc-follow-symlinks t) (setq vc-follow-symlinks t)
(global-auto-revert-mode 1) (global-auto-revert-mode 1)
@@ -14,7 +17,9 @@
(setq scroll-step 1 (setq scroll-step 1
scroll-conservatively 10000) ;; keyboard scroll one line at a time scroll-conservatively 10000) ;; keyboard scroll one line at a time
(setq-default indent-tabs-mode nil) (setq-default indent-tabs-mode nil)
(setq tab-width 2) (setq-default tab-width 2)
(setq-default c-default-style "linux"
c-basic-offset 2)
(defvaralias 'c-basic-offset 'tab-width) (defvaralias 'c-basic-offset 'tab-width)
(defvaralias 'cperl-indent-level 'tab-width) (defvaralias 'cperl-indent-level 'tab-width)
(setq backup-by-copying t ; don't clobber symlinks (setq backup-by-copying t ; don't clobber symlinks
@@ -55,6 +60,10 @@
(add-hook 'term-mode-hook (lambda () (add-hook 'term-mode-hook (lambda ()
(setq-local global-hl-line-mode nil))) (setq-local global-hl-line-mode nil)))
(defadvice term-handle-exit
(after term-kill-buffer-on-exit activate)
(kill-buffer))
(defun my-term-paste (&optional string) (defun my-term-paste (&optional string)
(interactive) (interactive)
(process-send-string (process-send-string

4
my-themes.el
View File

@@ -8,7 +8,7 @@
(select-frame frame) (select-frame frame)
(when (window-system frame) (when (window-system frame)
(set-frame-parameter (set-frame-parameter
(selected-frame) 'internal-border-width 10) (selected-frame) 'internal-border-width 7)
(unless my:theme-window-loaded (unless my:theme-window-loaded
(if my:theme-terminal-loaded (if my:theme-terminal-loaded
(enable-theme my:theme) (enable-theme my:theme)
@@ -24,7 +24,7 @@
(if (display-graphic-p) (if (display-graphic-p)
(setq my:theme-window-loaded t) (setq my:theme-window-loaded t)
(setq my:theme-terminal-loaded t))) (setq my:theme-terminal-loaded t)))
(set-frame-parameter (selected-frame) 'internal-border-width 10)) (set-frame-parameter (selected-frame) 'internal-border-width 7))
(custom-set-faces (custom-set-faces
;; term ;; term

58
themes/nothing-rhymes-with-orange-theme.el
View File

@@ -9,7 +9,7 @@
:options '(soft medium hard)) :options '(soft medium hard))
(deftheme nothing-rhymes-with-orange "Testt") (deftheme nothing-rhymes-with-orange "Testt")
(let* ((nrwo-dark0_hard (if (display-graphic-p) "#1d2021" "color-234")) (let* ((nrwo-dark0_hard (if (display-graphic-p) "#181818" "color-234"))
(nrwo-dark0 (if (display-graphic-p) "#282828" "color-235")) (nrwo-dark0 (if (display-graphic-p) "#282828" "color-235"))
(nrwo-dark0_soft (if (display-graphic-p) "#32302f" "color-236")) (nrwo-dark0_soft (if (display-graphic-p) "#32302f" "color-236"))
(nrwo-dark1 (if (display-graphic-p) "#3c3836" "color-237")) (nrwo-dark1 (if (display-graphic-p) "#3c3836" "color-237"))
@@ -20,29 +20,29 @@
(nrwo-medium (if (display-graphic-p) "#928374" "color-245")) ;; or 244 (nrwo-medium (if (display-graphic-p) "#928374" "color-245")) ;; or 244
(nrwo-light0_hard (if (display-graphic-p) "#ffffc8" "color-230")) (nrwo-light0_hard (if (display-graphic-p) "#ffffc8" "color-230"))
(nrwo-light0 (if (display-graphic-p) "#fdf4c1" "color-229")) (nrwo-light0 (if (display-graphic-p) "#ede4b1" "color-229"))
(nrwo-light0_soft (if (display-graphic-p) "#f4e8ba" "color-228")) (nrwo-light0_soft (if (display-graphic-p) "#f4e8ba" "color-228"))
(nrwo-light1 (if (display-graphic-p) "#ebdbb2" "color-223")) (nrwo-light1 (if (display-graphic-p) "#ebdbb2" "color-223"))
(nrwo-light2 (if (display-graphic-p) "#d5c4a1" "color-250")) (nrwo-light2 (if (display-graphic-p) "#d5c4a1" "color-250"))
(nrwo-light3 (if (display-graphic-p) "#bdae93" "color-248")) (nrwo-light3 (if (display-graphic-p) "#bdae93" "color-248"))
(nrwo-light4 (if (display-graphic-p) "#a89984" "color-246")) (nrwo-light4 (if (display-graphic-p) "#a89984" "color-246"))
(nrwo-color0 (if (display-graphic-p) "#262626" "color-0")) (nrwo-color0 (if (display-graphic-p) "#262322" "color-0"))
(nrwo-color1 (if (display-graphic-p) "#525252" "color-1")) (nrwo-color1 (if (display-graphic-p) "#665752" "color-1"))
(nrwo-color2 (if (display-graphic-p) "#626262" "color-2")) (nrwo-color2 (if (display-graphic-p) "#75645e" "color-2"))
(nrwo-color3 (if (display-graphic-p) "#727272" "color-3")) (nrwo-color3 (if (display-graphic-p) "#85716a" "color-3"))
(nrwo-color4 (if (display-graphic-p) "#828282" "color-4")) (nrwo-color4 (if (display-graphic-p) "#947e76" "color-4"))
(nrwo-color5 (if (display-graphic-p) "#929292" "color-5")) (nrwo-color5 (if (display-graphic-p) "#a38b83" "color-5"))
(nrwo-color6 (if (display-graphic-p) "#a2a2a2" "color-6")) (nrwo-color6 (if (display-graphic-p) "#b89c93" "color-6"))
(nrwo-color7 (if (display-graphic-p) "#bfbfbf" "color-7")) (nrwo-color7 (if (display-graphic-p) "#ccada3" "color-7"))
(nrwo-color8 (if (display-graphic-p) "#424242" "color-8")) (nrwo-color8 (if (display-graphic-p) "#524b49" "color-8"))
(nrwo-color9 (if (display-graphic-p) "#ff6633" "color-9")) (nrwo-color9 (if (display-graphic-p) "#ff6633" "color-9"))
(nrwo-color10 (if (display-graphic-p) "#bf4c26" "color-10")) (nrwo-color10 (if (display-graphic-p) "#bf4c26" "color-10"))
(nrwo-color11 (if (display-graphic-p) "#803319" "color-11")) (nrwo-color11 (if (display-graphic-p) "#803319" "color-11"))
(nrwo-color12 (if (display-graphic-p) "#33ddff" "color-12")) (nrwo-color12 (if (display-graphic-p) "#80ecff" "color-12"))
(nrwo-color13 (if (display-graphic-p) "#26a6bf" "color-13")) (nrwo-color13 (if (display-graphic-p) "#60b4bf" "color-13"))
(nrwo-color14 (if (display-graphic-p) "#196f80" "color-14")) (nrwo-color14 (if (display-graphic-p) "#406d80" "color-14"))
(nrwo-color15 (if (display-graphic-p) "#e9e9e9" "color-15")) (nrwo-color15 (if (display-graphic-p) "#e8d7d1" "color-15"))
(nrwo-delimiter-one (if (display-graphic-p) "#458588" "color-30")) (nrwo-delimiter-one (if (display-graphic-p) "#458588" "color-30"))
(nrwo-delimiter-two (if (display-graphic-p) "#b16286" "color-168")) (nrwo-delimiter-two (if (display-graphic-p) "#b16286" "color-168"))
@@ -57,11 +57,7 @@
(nrwo-aquamarine4 (if (display-graphic-p) "#83A598" "aquamarine4")) (nrwo-aquamarine4 (if (display-graphic-p) "#83A598" "aquamarine4"))
(nrwo-turquoise4 (if (display-graphic-p) "#61ACBB" "turquoise4")) (nrwo-turquoise4 (if (display-graphic-p) "#61ACBB" "turquoise4"))
(nrwo-bg (cl-case nrwo-contrast (nrwo-bg nrwo-dark0_hard))
(hard nrwo-dark0_hard)
(soft nrwo-dark0_soft)
;; Medium by default.
(t nrwo-dark0))))
(custom-theme-set-faces (custom-theme-set-faces
'nothing-rhymes-with-orange 'nothing-rhymes-with-orange
@@ -73,24 +69,24 @@
`(mode-line-inactive ((t (:box nil :background ,nrwo-dark1 :foreground ,nrwo-light4)))) `(mode-line-inactive ((t (:box nil :background ,nrwo-dark1 :foreground ,nrwo-light4))))
`(fringe ((t (:background ,nrwo-bg)))) `(fringe ((t (:background ,nrwo-bg))))
`(linum ((t (:background ,nrwo-bg :foreground ,nrwo-dark4)))) `(linum ((t (:background ,nrwo-bg :foreground ,nrwo-dark4))))
`(hl-line ((t (:background ,nrwo-dark1)))) `(hl-line ((t (:background ,nrwo-color0))))
`(region ((t (:background ,nrwo-dark2)))) ;;selection `(region ((t (:background ,nrwo-dark2)))) ;;selection
`(secondary-selection ((t (:background ,nrwo-dark1)))) `(secondary-selection ((t (:background ,nrwo-dark1))))
`(minibuffer-prompt ((t (:background ,nrwo-bg :foreground ,nrwo-color4 :bold t)))) `(minibuffer-prompt ((t (:background ,nrwo-bg :foreground ,nrwo-color4 t))))
`(vertical-border ((t (:foreground ,nrwo-dark2)))) `(vertical-border ((t (:foreground ,nrwo-dark2))))
`(link ((t (:foreground ,nrwo-color7 :underline t)))) `(link ((t (:foreground ,nrwo-color7 :underline t))))
`(shadow ((t (:foreground ,nrwo-dark4)))) `(shadow ((t (:foreground ,nrwo-dark4))))
;; Built-in syntax ;; Built-in syntax
`(font-lock-builtin-face ((t (:foreground ,nrwo-light0 :bold t)))) `(font-lock-builtin-face ((t (:foreground ,nrwo-light0 t))))
`(font-lock-constant-face ((t (:foreground ,nrwo-color10 :bold t)))) `(font-lock-constant-face ((t (:foreground ,nrwo-color10 t))))
`(font-lock-comment-face ((t (:foreground ,nrwo-dark4)))) `(font-lock-comment-face ((t (:foreground ,nrwo-dark4))))
`(font-lock-function-name-face ((t (:foreground ,nrwo-color15 )))) `(font-lock-function-name-face ((t (:foreground ,nrwo-color15 ))))
`(font-lock-keyword-face ((t (:foreground ,nrwo-light0 :bold t)))) `(font-lock-keyword-face ((t (:foreground ,nrwo-light0 t))))
`(font-lock-string-face ((t (:foreground ,nrwo-color4)))) `(font-lock-string-face ((t (:foreground ,nrwo-color5))))
`(font-lock-variable-name-face ((t (:foreground ,nrwo-color9)))) `(font-lock-variable-name-face ((t (:foreground ,nrwo-color9))))
`(font-lock-type-face ((t (:foreground ,nrwo-color12)))) `(font-lock-type-face ((t (:foreground ,nrwo-color12))))
`(font-lock-warning-face ((t (:foreground ,nrwo-color15 :bold t)))) `(font-lock-warning-face ((t (:foreground ,nrwo-color15 t))))
;; whitespace-mode ;; whitespace-mode
`(whitespace-space ((t (:background ,nrwo-bg :foreground ,nrwo-dark4)))) `(whitespace-space ((t (:background ,nrwo-bg :foreground ,nrwo-dark4))))
@@ -144,7 +140,7 @@
`(ag-match-face ((t (:foreground ,nrwo-color15)))) `(ag-match-face ((t (:foreground ,nrwo-color15))))
;; Diffs ;; Diffs
`(diff-changed ((t (:background nil :foreground ,nrwo-light1)))) `(diff-changed ((t (:background ,nrwo-color0 :foreground ,nrwo-light1))))
`(diff-added ((t (:background nil :foreground ,nrwo-color12)))) `(diff-added ((t (:background nil :foreground ,nrwo-color12))))
`(diff-removed ((t (:background nil :foreground ,nrwo-color9)))) `(diff-removed ((t (:background nil :foreground ,nrwo-color9))))
`(diff-indicator-changed ((t (:inherit diff-changed)))) `(diff-indicator-changed ((t (:inherit diff-changed))))
@@ -174,14 +170,14 @@
;; message-mode ;; message-mode
`(message-header-to ((t (:inherit font-lock-variable-name-face)))) `(message-header-to ((t (:inherit font-lock-variable-name-face))))
`(message-header-cc ((t (:inherit font-lock-variable-name-face)))) `(message-header-cc ((t (:inherit font-lock-variable-name-face))))
`(message-header-subject ((t (:foreground ,nrwo-color10 :weight bold)))) `(message-header-subject ((t (:foreground ,nrwo-color10 ))))
`(message-header-newsgroups ((t (:foreground ,nrwo-color9 :weight bold)))) `(message-header-newsgroups ((t (:foreground ,nrwo-color9 ))))
`(message-header-other ((t (:inherit font-lock-variable-name-face)))) `(message-header-other ((t (:inherit font-lock-variable-name-face))))
`(message-header-name ((t (:inherit font-lock-keyword-face)))) `(message-header-name ((t (:inherit font-lock-keyword-face))))
`(message-header-xheader ((t (:foreground ,nrwo-color12)))) `(message-header-xheader ((t (:foreground ,nrwo-color12))))
`(message-separator ((t (:inherit font-lock-comment-face)))) `(message-separator ((t (:inherit font-lock-comment-face))))
`(message-cited-text ((t (:inherit font-lock-comment-face)))) `(message-cited-text ((t (:inherit font-lock-comment-face))))
`(message-mml ((t (:foreground ,nrwo-color1 :weight bold)))) `(message-mml ((t (:foreground ,nrwo-color1 ))))
) )
) )