emacs: add theme and fix init
This commit is contained in:
alex
parent
6437dec024
commit
71dcf4e143
|
|
@ -12,6 +12,9 @@
|
||||||
(when (not (package-installed-p 'use-package))
|
(when (not (package-installed-p 'use-package))
|
||||||
(package-install 'use-package))
|
(package-install 'use-package))
|
||||||
|
|
||||||
|
(require 'use-package)
|
||||||
|
(setq use-package-always-ensure t)
|
||||||
|
|
||||||
;; Add personal elisp lib dir
|
;; Add personal elisp lib dir
|
||||||
(add-to-list 'load-path "~/.emacs.d/lisp/")
|
(add-to-list 'load-path "~/.emacs.d/lisp/")
|
||||||
|
|
||||||
|
|
@ -19,7 +22,10 @@
|
||||||
(global-auto-revert-mode t)
|
(global-auto-revert-mode t)
|
||||||
|
|
||||||
;; Theme
|
;; Theme
|
||||||
|
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
|
||||||
|
|
||||||
(use-package gruvbox-theme)
|
(use-package gruvbox-theme)
|
||||||
|
(load-theme 'gruvbox t)
|
||||||
|
|
||||||
;; Set the font size
|
;; Set the font size
|
||||||
(set-face-attribute 'default nil :height 140)
|
(set-face-attribute 'default nil :height 140)
|
||||||
|
|
@ -85,18 +91,20 @@
|
||||||
(add-to-list 'org-babel-load-languages '(java . t))
|
(add-to-list 'org-babel-load-languages '(java . t))
|
||||||
|
|
||||||
;; Configure Language Server Protocol
|
;; Configure Language Server Protocol
|
||||||
(require 'lsp-mode)
|
(use-package lsp-mode)
|
||||||
(require 'dap-mode)
|
(use-package dap-mode)
|
||||||
(require 'company-lsp)
|
(use-package company)
|
||||||
(require 'lsp-ui)
|
(use-package lsp-ui)
|
||||||
(require 'lsp-treemacs)
|
(use-package lsp-treemacs)
|
||||||
(require 'lsp-java)
|
(use-package lsp-java)
|
||||||
(require 'rust-mode)
|
(use-package rust-mode)
|
||||||
(add-hook 'java-mode-hook #'lsp)
|
(add-hook 'java-mode-hook #'lsp)
|
||||||
|
|
||||||
;; Automatically open some files in a buffer
|
;; Automatically open some files in a buffer
|
||||||
(require 'treemacs)
|
(use-package treemacs
|
||||||
(treemacs)
|
:ensure t
|
||||||
|
:defer t)
|
||||||
|
|
||||||
(find-file "/home/alex/.emacs.d/init.el")
|
(find-file "/home/alex/.emacs.d/init.el")
|
||||||
(custom-set-variables
|
(custom-set-variables
|
||||||
;; custom-set-variables was added by Custom.
|
;; custom-set-variables was added by Custom.
|
||||||
|
|
@ -124,24 +132,4 @@
|
||||||
'(org-tag-faces nil)
|
'(org-tag-faces nil)
|
||||||
'(org-tags-column 0)
|
'(org-tags-column 0)
|
||||||
'(package-selected-packages
|
'(package-selected-packages
|
||||||
'(rust-mode yaml-mode visual-fill-column nov use-package org-bullets lsp-ui lsp-java htmlize gruvbox-theme flycheck-rust dap-mode company-lsp)))
|
'(rust-mode yaml-mode visual-fill-column nov use-package org-bullets lsp-ui lsp-java htmlize gruvbox-theme flycheck-rust dap-mode company-capf)))
|
||||||
(custom-set-faces
|
|
||||||
;; custom-set-faces was added by Custom.
|
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
|
||||||
;; Your init file should contain only one such instance.
|
|
||||||
;; If there is more than one, they won't work right.
|
|
||||||
'(fixed-pitch ((t (:family "Inconsolata" :slant normal :weight normal :height 1.0 :width normal))))
|
|
||||||
'(markdown-code-face ((t (:family "Monospace"))))
|
|
||||||
'(org-document-title ((t (:inherit default :font "Verdana" :height 1.25 :underline nil))))
|
|
||||||
'(org-indent ((t (:inherit (org-hide fixed-pitch)))))
|
|
||||||
'(org-level-1 ((t (:inherit default :font "Verdana" :height 1.12))))
|
|
||||||
'(org-level-2 ((t (:inherit default :font "Verdana" :height 1.05))))
|
|
||||||
'(org-level-3 ((t (:inherit default :font "Verdana"))))
|
|
||||||
'(org-level-4 ((t (:inherit default :font "Verdana"))))
|
|
||||||
'(org-level-5 ((t (:inherit default :font "Verdana"))))
|
|
||||||
'(org-level-6 ((t (:inherit default :font "Verdana"))))
|
|
||||||
'(org-level-7 ((t (:inherit default :font "Verdana"))))
|
|
||||||
'(org-level-8 ((t (:inherit default :font "Verdana"))))
|
|
||||||
'(org-tag ((((class color) (min-colors 16777215)) (:foreground "rosy brown" :bold t :weight bold)) (((class color) (min-colors 255)) (:bold t :weight bold))))
|
|
||||||
'(org-tag-group ((t (:inherit org-tag :foreground "lawn green"))))
|
|
||||||
'(variable-pitch ((t (:family "Source Sans Pro" :height 180 :weight light)))))
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,191 @@
|
||||||
|
;;; clues-theme.el --- an Emacs 24 theme which may well be fully awesome...
|
||||||
|
;;
|
||||||
|
;; Author: Jason Milkins <jasonm23@gmail.com>
|
||||||
|
;; Url: https://github.com/emacsfodder/emacs-clues-theme
|
||||||
|
;; Version: 1.0.1
|
||||||
|
;; Package-Requires: ((emacs "24.0"))
|
||||||
|
;;
|
||||||
|
;;; Changelog
|
||||||
|
;;
|
||||||
|
;; 1.0.1 - Source URL fixed
|
||||||
|
;;
|
||||||
|
;; 1.0.0 - tagged for Debian.
|
||||||
|
;;
|
||||||
|
;; 20140923.1012: Remove change to linum height, fix rainbow delimiters faces settings.
|
||||||
|
;;
|
||||||
|
;; 20140922.1722: Add highlight-indentation-mode support
|
||||||
|
;;
|
||||||
|
;; 20140417.1000: Improve visibility of diff backgrounds
|
||||||
|
;;
|
||||||
|
;; 20140410.1055: Improve visibility of linenums
|
||||||
|
;;
|
||||||
|
;; 20140228.0154: Improve visibility of region and secondary-selection
|
||||||
|
;;
|
||||||
|
;; 20140227.0115: Improve visibility of header-line
|
||||||
|
;;
|
||||||
|
;; 20130908.0801: Added git-gutter, diff support
|
||||||
|
;;
|
||||||
|
;; 20130908.0722: Update Js3 theming
|
||||||
|
;;
|
||||||
|
;; 20130906.1159: Fix commentary block
|
||||||
|
;;
|
||||||
|
;; 20130906.0211: Fix Magit item hightlight
|
||||||
|
;;
|
||||||
|
;; 20130905.2230: Updated header and minor changes
|
||||||
|
;;
|
||||||
|
;; 20130820.0702: Flymake/Flyspell error/warn to
|
||||||
|
;; underlines. Desaturated function name font lock fg.
|
||||||
|
;;
|
||||||
|
;; 20130720.559: Added rainbow mode switch (for editing) and fixed
|
||||||
|
;; default for terminal friendly use
|
||||||
|
;;
|
||||||
|
;; 20130715.0319: Modified keyword color
|
||||||
|
;;
|
||||||
|
;; 20130715.0252: Modifications for various colors. Added CUA
|
||||||
|
;; rectangle coloring. Highlight background and Button colors changed
|
||||||
|
;; for better visibility, reduced garish-icity ... That, is not a word.
|
||||||
|
;;
|
||||||
|
;; 20130714.2351: Background color normalised, based on pull by
|
||||||
|
;; Kaustav Das Modak (Github: kaustavdm) Added Rainbow delimeters
|
||||||
|
;;
|
||||||
|
;; 0.1.0: Basic start, the theme is really a note to myself -> Make
|
||||||
|
;; theme editor
|
||||||
|
;;
|
||||||
|
;; This program 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, version 3 of the License.
|
||||||
|
;;
|
||||||
|
;; This file 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.
|
||||||
|
;;
|
||||||
|
;; This file is not a part of Emacs
|
||||||
|
|
||||||
|
;;; Commentary:
|
||||||
|
;;
|
||||||
|
;; Clues was initially based on a Visual Studio theme called 'Blues 'n
|
||||||
|
;; Roots' however it's a long way from looking much like it, aside
|
||||||
|
;; from the occasional color accent, Blues (despite it's name) has a
|
||||||
|
;; more toasted caramel flavor. Clues on the other hand is made up of
|
||||||
|
;; cooling colors with a couple of flecks of light cream/brown/orange
|
||||||
|
;; to break up any monotony, with yellow/gold rainbow-delimiters.
|
||||||
|
;;
|
||||||
|
;; Clues has become my working theme of choice since about 7/20/2013,
|
||||||
|
;; and when used with xterm-frobs.el, it looks great in the terminal
|
||||||
|
;; as well as the GUI.
|
||||||
|
;;
|
||||||
|
|
||||||
|
(deftheme clues
|
||||||
|
"clues theme - an Emacs 24 theme which may well be fully awesome...")
|
||||||
|
|
||||||
|
(custom-theme-set-variables
|
||||||
|
'clues
|
||||||
|
'(fringe-mode 10 nil (fringe))
|
||||||
|
'(linum-format " %6d " )
|
||||||
|
'(main-line-color1 "#222232")
|
||||||
|
'(main-line-color2 "#333343")
|
||||||
|
'(powerline-color1 "#222232")
|
||||||
|
'(powerline-color2 "#333343"))
|
||||||
|
|
||||||
|
(custom-theme-set-faces
|
||||||
|
'clues
|
||||||
|
'(cursor ((t ( :background "orange" ))))
|
||||||
|
'(default
|
||||||
|
(
|
||||||
|
(((class color) (min-colors 16777216)) (:foreground "#C0E9F6" :background "#110B14"))
|
||||||
|
(((class color) (min-colors 88)) (:foreground "#fff" :background "#000"))
|
||||||
|
(((class color) (min-colors 16)) (:foreground "#fff" :background "#000"))
|
||||||
|
(((class color) (min-colors 8)) (:foreground "#fff" :background "#000")))
|
||||||
|
)
|
||||||
|
'(linum ((t (:foreground "#6a6a6a" :background "#110B14" ))))
|
||||||
|
'(minibuffer-prompt ((t (:foreground "#1278A8" :background nil :weight bold ))))
|
||||||
|
'(escape-glyph ((t (:foreground "orange" :background nil ))))
|
||||||
|
'(highlight ((t (:foreground "orange" :background nil ))))
|
||||||
|
'(region ((t ( :background "#342858" ))))
|
||||||
|
'(shadow ((t (:foreground "#777777" :background nil ))))
|
||||||
|
'(secondary-selection ((t ( :background "#342858" ))))
|
||||||
|
'(trailing-whitespace ((t (:foreground "#FFFFFF" :background "#C74000" ))))
|
||||||
|
'(font-lock-builtin-face ((t (:foreground "#55B1E2" :background nil ))))
|
||||||
|
'(font-lock-comment-face ((t (:foreground "#90A0A0" :background nil :slant italic ))))
|
||||||
|
'(font-lock-constant-face ((t (:foreground "#CFC5A9" :background nil ))))
|
||||||
|
`(font-lock-doc-string-face ((t (:foreground "#DFD3E9" :background nil ))))
|
||||||
|
'(font-lock-function-name-face ((t (:foreground "#BFC3A9" :background nil ))))
|
||||||
|
'(font-lock-keyword-face ((t (:foreground "#55C0D2" :background nil ))))
|
||||||
|
'(font-lock-negation-char-face ((t (:foreground "#C75311" :background nil ))))
|
||||||
|
'(font-lock-string-face ((t (:foreground "#94D4D9" :background nil ))))
|
||||||
|
'(font-lock-variable-name-face ((t (:foreground "#BDBA9F" :background nil ))))
|
||||||
|
'(font-lock-comment-delimiter-face ((t (:foreground "#3499aa" :background nil :inherit (font-lock-comment-face) ))))
|
||||||
|
'(font-lock-preprocessor-face ((t (:foreground "#A16C26" :background nil :inherit (font-lock-builtin-face) ))))
|
||||||
|
'(font-lock-regexp-grouping-backslash ((t (:foreground "#f66500" :background nil :inherit (bold) ))))
|
||||||
|
'(font-lock-regexp-grouping-construct ((t (:foreground "red" :background nil :inherit (bold) ))))
|
||||||
|
'(font-lock-doc-face ((t (:foreground "#90A0A0" :background nil :inherit (font-lock-string-face) ))))
|
||||||
|
'(font-lock-warning-face ((t (:foreground "#008000" :background nil :inherit (error) ))))
|
||||||
|
'(font-lock-type-face ((t (:foreground "#55aadd" :background nil :inherit (default) ))))
|
||||||
|
'(link ((t (:foreground "#00b7f0" :background nil :underline t ))))
|
||||||
|
'(link-visited ((t (:foreground "#4488cc" :underline t :inherit (link) ))))
|
||||||
|
'(button ((t (:foreground "#FFFFFF" :background "#444444" :underline t :inherit (link) ))))
|
||||||
|
'(fringe ((t ( :background "#1B0F1f" ))))
|
||||||
|
'(next-error ((t ( :inherit (region) ))))
|
||||||
|
'(query-replace ((t ( :inherit (isearch) ))))
|
||||||
|
'(header-line ((t (:foreground "#EEEEEE" :background "#444444" :box nil :inherit (mode-line) ))))
|
||||||
|
'(mode-line-highlight ((t ( :box nil ))))
|
||||||
|
'(mode-line-emphasis ((t ( :weight bold ))))
|
||||||
|
'(mode-line-buffer-id ((t ( :box nil :weight bold ))))
|
||||||
|
'(mode-line-inactive ((t (:foreground "#555555" :background "#111111" :box nil :weight light :inherit (mode-line) ))))
|
||||||
|
'(mode-line ((t (:foreground "#777777" :background "#111111" :box nil :inherit (variable-pitch) ))))
|
||||||
|
'(isearch ((t (:foreground "#99ccee" :background "#444444" ))))
|
||||||
|
'(isearch-fail ((t ( :background "#ffaaaa" ))))
|
||||||
|
'(lazy-highlight ((t ( :background "#77bbdd" ))))
|
||||||
|
'(match ((t ( :background "#3388cc" ))))
|
||||||
|
'(tooltip ((t (:foreground "black" :background "LightYellow" :inherit (variable-pitch) ))))
|
||||||
|
'(highlight-indentation-face ((t ( :background "#122930" ))))
|
||||||
|
'(js3-function-param-face ((t (:foreground "#BFC3A9" ))))
|
||||||
|
'(js3-external-variable-face ((t (:foreground "#F0B090" :bold t ))))
|
||||||
|
'(cua-rectangle ((t (:foreground "#E0E4CC" :background "#342858" ))))
|
||||||
|
;; flyspell-mode
|
||||||
|
`(flyspell-incorrect ((t (:underline "#AA0000" :background nil :inherit nil ))))
|
||||||
|
`(flyspell-duplicate ((t (:underline "#009945" :background nil :inherit nil ))))
|
||||||
|
;; flymake-mode
|
||||||
|
`(flymake-errline ((t (:underline "#AA0000" :background nil :inherit nil ))))
|
||||||
|
`(flymake-warnline ((t (:underline "#009945" :background nil :inherit nil ))))
|
||||||
|
;; Magit hightlight
|
||||||
|
`(magit-item-highlight ((t (:foreground "white" :background "#1278A8" :inherit nil ))))
|
||||||
|
;;git-gutter
|
||||||
|
'(git-gutter:added ((t (:foreground "#609f60" :bold t))))
|
||||||
|
'(git-gutter:modified ((t (:foreground "#3388cc" :bold t))))
|
||||||
|
'(git-gutter:deleted ((t (:foreground "#cc3333" :bold t))))
|
||||||
|
'(diff-added ((t (:background "#305030"))))
|
||||||
|
'(diff-removed ((t (:background "#903010"))))
|
||||||
|
'(diff-changed ((t (:background "#103090"))))
|
||||||
|
'(diff-file-header ((t (:background "#362145"))))
|
||||||
|
'(diff-context ((t (:foreground "#E0E4CC"))))
|
||||||
|
'(diff-hunk-header ((t (:background "#242130"))))
|
||||||
|
|
||||||
|
'(rainbow-delimiters-depth-1-face ((t (:foreground "#99998A" ))))
|
||||||
|
'(rainbow-delimiters-depth-2-face ((t (:foreground "#776644" ))))
|
||||||
|
'(rainbow-delimiters-depth-3-face ((t (:foreground "#888866" ))))
|
||||||
|
'(rainbow-delimiters-depth-4-face ((t (:foreground "#AAAA88" ))))
|
||||||
|
'(rainbow-delimiters-depth-5-face ((t (:foreground "#CCCCAA" ))))
|
||||||
|
'(rainbow-delimiters-depth-6-face ((t (:foreground "#DEDEAA" ))))
|
||||||
|
'(rainbow-delimiters-depth-7-face ((t (:foreground "#EFEFBB" ))))
|
||||||
|
'(rainbow-delimiters-depth-8-face ((t (:foreground "#FFFFCC" ))))
|
||||||
|
'(rainbow-delimiters-depth-9-face ((t (:foreground "#FFFFEE" ))))
|
||||||
|
'(rainbow-delimiters-depth-unmatched-face ((t (:foreground "#AA0000" ))))
|
||||||
|
)
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(when load-file-name
|
||||||
|
(add-to-list 'custom-theme-load-path
|
||||||
|
(file-name-as-directory (file-name-directory load-file-name))))
|
||||||
|
|
||||||
|
(provide-theme 'clues)
|
||||||
|
|
||||||
|
;; Local Variables:
|
||||||
|
;; eval: (when (fboundp 'rainbow-mode) (rainbow-mode +1))
|
||||||
|
;; End:
|
||||||
|
|
||||||
|
;;; clues-theme.el ends here
|
||||||
Loading…
Reference in New Issue