From 290b3f2fd7be2b940e892dcaae4ca21367a570e4 Mon Sep 17 00:00:00 2001 From: Michaël Ball Date: Thu, 15 Aug 2019 19:59:18 +0100 Subject: Visual overhaul: use smart-mode-line and set proper colours for 24bit term --- .emacs | 119 +++++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 32 deletions(-) diff --git a/.emacs b/.emacs index c21b0f4..e4dded5 100755 --- a/.emacs +++ b/.emacs @@ -6,7 +6,9 @@ (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3") -(set-frame-font "Iosevka SS10:pixelsize=16") +(add-to-list 'default-frame-alist '(font . "Iosevka SS10:pixelsize=16" )) +(set-face-attribute 'default t :font "Iosevka SS10:pixelsize=16" ) + (set-language-environment "UTF-8") (set-default-coding-systems 'utf-8) @@ -41,7 +43,7 @@ [unspecified "#151515" "#ac4142" "#90a959" "#f4bf75" "#6a9fb5" "#aa759f" "#6a9fb5" "#d0d0d0"] t) '(custom-safe-themes (quote - ("c79c2eadd3721e92e42d2fefc756eef8c7d248f9edefd57c4887fbf68f0a17af" "3eb93cd9a0da0f3e86b5d932ac0e3b5f0f50de7a0b805d4eb1f67782e9eb67a4" "a94f1a015878c5f00afab321e4fef124b2fc3b823c8ddd89d360d710fc2bddfc" "f50f3f6547acd9d127fc51886d0d9492ac1858339bf5c2dfea902dbc7b9bf09b" "23a8142a86e2c77340d514d8186fa128994e344b1d8d0f3e805a2378c6ea1df2" "64ca5a1381fa96cb86fd6c6b4d75b66dc9c4e0fc1288ee7d914ab8d2638e23a9" "1b27e3b3fce73b72725f3f7f040fd03081b576b1ce8bbdfcb0212920aec190ad" "36282815a2eaab9ba67d7653cf23b1a4e230e4907c7f110eebf3cdf1445d8370" "2b8dff32b9018d88e24044eb60d8f3829bd6bbeab754e70799b78593af1c3aba" "b181ea0cc32303da7f9227361bb051bbb6c3105bb4f386ca22a06db319b08882" "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "16dd114a84d0aeccc5ad6fd64752a11ea2e841e3853234f19dc02a7b91f5d661" "9be1d34d961a40d94ef94d0d08a364c3d27201f3c98c9d38e36f10588469ea57" "73ad471d5ae9355a7fa28675014ae45a0589c14492f52c32a4e9b393fcc333fd" "760ce657e710a77bcf6df51d97e51aae2ee7db1fba21bbad07aab0fa0f42f834" "721bb3cb432bb6be7c58be27d583814e9c56806c06b4077797074b009f322509" default))) + ("c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "c79c2eadd3721e92e42d2fefc756eef8c7d248f9edefd57c4887fbf68f0a17af" "3eb93cd9a0da0f3e86b5d932ac0e3b5f0f50de7a0b805d4eb1f67782e9eb67a4" "a94f1a015878c5f00afab321e4fef124b2fc3b823c8ddd89d360d710fc2bddfc" "f50f3f6547acd9d127fc51886d0d9492ac1858339bf5c2dfea902dbc7b9bf09b" "23a8142a86e2c77340d514d8186fa128994e344b1d8d0f3e805a2378c6ea1df2" "64ca5a1381fa96cb86fd6c6b4d75b66dc9c4e0fc1288ee7d914ab8d2638e23a9" "1b27e3b3fce73b72725f3f7f040fd03081b576b1ce8bbdfcb0212920aec190ad" "36282815a2eaab9ba67d7653cf23b1a4e230e4907c7f110eebf3cdf1445d8370" "2b8dff32b9018d88e24044eb60d8f3829bd6bbeab754e70799b78593af1c3aba" "b181ea0cc32303da7f9227361bb051bbb6c3105bb4f386ca22a06db319b08882" "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "16dd114a84d0aeccc5ad6fd64752a11ea2e841e3853234f19dc02a7b91f5d661" "9be1d34d961a40d94ef94d0d08a364c3d27201f3c98c9d38e36f10588469ea57" "73ad471d5ae9355a7fa28675014ae45a0589c14492f52c32a4e9b393fcc333fd" "760ce657e710a77bcf6df51d97e51aae2ee7db1fba21bbad07aab0fa0f42f834" "721bb3cb432bb6be7c58be27d583814e9c56806c06b4077797074b009f322509" default))) '(dap-mode t nil (dap-mode)) '(dap-ui-mode t nil (dap-ui)) '(emamux:completing-read-type (quote normal)) @@ -56,23 +58,94 @@ '(org-agenda-files (quote ("~/orgmode.org"))) '(package-selected-packages (quote - (projectile delight vue-mode writeroom-mode dap-mode ivy-xref counsel ivy ini-mode yaml-mode lsp-python-ms csound-mode git-gutter emamux use-package elixir-mode web-mode multiple-cursors company-lsp lsp-ui lsp-mode company json-mode flycheck cygwin-mount python-mode typescript-mode org highlight-indent-guides magit airline-themes base16-theme go-mode neotree powerline rust-mode))) - '(safe-local-variable-values (quote ((engine . jinja2) (engine . jinja))))) + (xclip smart-mode-line projectile delight vue-mode writeroom-mode dap-mode ivy-xref counsel ivy ini-mode yaml-mode lsp-python-ms csound-mode git-gutter emamux use-package elixir-mode web-mode multiple-cursors company-lsp lsp-ui lsp-mode company json-mode flycheck cygwin-mount python-mode typescript-mode org highlight-indent-guides magit base16-theme go-mode neotree rust-mode))) + '(safe-local-variable-values (quote ((engine . jinja2) (engine . jinja)))) + '(sml/no-confirm-load-theme t) + '(sml/theme (quote respectful))) (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. + '(default ((t (:inherit nil :stipple nil :background "#1c1e26" :foreground "#cbced0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 1 :width normal :foundry "default" :family "default")))) + '(airline-normal-outer ((t (:background "red" :foreground "color-18")))) '(company-tooltip ((t (:inherit tooltip)))) '(company-tooltip-mouse ((t (:inherit highlight)))) - '(highlight ((t (:background "brightgreen" :foreground "color-18")))) + '(custom-group-tag ((t (:foreground "#E93C58")))) + '(custom-variable-tag ((t (:foreground "#E93C58")))) + '(elixir-atom-face ((t (:foreground "#25B2BC")))) + '(elixir-attribute-face ((t (:foreground "#DF5273")))) + '(error ((t (:foreground "#E93C58" :weight bold)))) + '(font-lock-builtin-face ((t (:foreground "#25B2BC")))) + '(font-lock-comment-delimiter-face ((t (:foreground "#6F6F70")))) + '(font-lock-comment-face ((t (:foreground "#6F6F70" :slant oblique)))) + '(font-lock-constant-face ((t (:foreground "#E58D7D" :weight bold)))) + '(font-lock-doc-face ((t (:foreground "#24A8B4" :slant oblique)))) + '(font-lock-function-name-face ((t (:foreground "#25B2BC" :weight bold :height 1.1)))) + '(font-lock-keyword-face ((t (:foreground "#B072D1" :weight bold)))) + '(font-lock-preprocessor-face ((t (:foreground "#25B2BC" :slant italic)))) + '(font-lock-regexp-grouping-backslash ((t (:foreground "#24A8B4" :weight bold)))) + '(font-lock-regexp-grouping-construct ((t (:foreground "#24A8B4" :weight bold)))) + '(font-lock-string-face ((t (:foreground "#EFAF8E")))) + '(font-lock-type-face ((t (:foreground "#EFB993" :weight bold)))) + '(font-lock-variable-name-face ((t (:foreground "#E93C58" :weight bold)))) + '(font-lock-warning-face ((t (:foreground "#E93C58" :weight bold)))) + '(highlight ((t (:background "#6F6F70" :underline t)))) + '(info-xref ((t (:foreground "#25B2BC" :weight bold)))) + '(isearch ((t (:background "#6F6F70" :foreground "#FAB28E" :inverse-video t)))) + '(isearch-fail ((t (:inherit font-lock-warning-face :background "#CBCED0" :inverse-video t)))) + '(ivy-action ((t (:foreground "#25B2BC")))) + '(ivy-confirm-face ((t (:foreground "#27D796")))) + '(ivy-current-match ((t (:background "#6F6F70" :foreground "#CBCED0")))) + '(ivy-match-required-face ((t (:foreground "#E95678")))) + '(ivy-minibuffer-match-face-1 ((t (:foreground "#B877DB")))) + '(ivy-minibuffer-match-face-2 ((t (:foreground "#25B2BC")))) + '(ivy-minibuffer-match-face-3 ((t (:foreground "#24A8B4")))) + '(ivy-minibuffer-match-face-4 ((t (:foreground "#27D796")))) + '(lazy-highlight ((t (:background "#6F6F70")))) + '(link ((t (:foreground "#25B2BC" :underline t)))) + '(link-visited ((t (:foreground "#B877DB" :underline t)))) '(lsp-face-highlight-read ((t (:inherit highlight :foreground "black" :underline t)))) '(lsp-face-highlight-textual ((t (:inherit highlight :foreground "black")))) '(lsp-face-highlight-write ((t (:inherit highlight :foreground "black" :slant italic)))) '(lsp-ui-doc-background ((t (:background "color-19")))) - '(lsp-ui-peek-peek ((t (:background "color-19" :foreground "white")))) - '(region ((t (:background "brightyellow" :foreground "color-18")))) - '(tooltip ((t (:inherit default :background "brightgreen" :foreground "color-18")))) + '(lsp-ui-peek-filename ((t (:foreground "#F09383")))) + '(lsp-ui-peek-header ((t (:background "#232530" :foreground "#9DA0A2")))) + '(lsp-ui-peek-highlight ((t (:background "#232530" :distant-foreground "#DCDFE4" :foreground "#9DA0A2" :box (:line-width -1 :color "#DCDFE4"))))) + '(lsp-ui-peek-line-number ((t (:foreground "#6F6F70")))) + '(lsp-ui-peek-list ((t nil))) + '(lsp-ui-peek-peek ((t nil))) + '(lsp-ui-peek-selection ((t (:background "#2E303E")))) + '(lsp-ui-sideline-code-action ((t (:foreground "#FAC29A")))) + '(lsp-ui-sideline-current-symbol ((t (:box (:line-width -1 :color "#CBCED0") :weight ultra-bold :height 0.99)))) + '(magit-diff-added ((t (:background "#27D796")))) + '(magit-diff-added-highlight ((t (:background "#27D796")))) + '(magit-diff-removed ((t (:background "#E9436F")))) + '(magit-diff-removed-highlight ((t (:background "#E9436F")))) + '(magit-diffstat-added ((t (:foreground "#27D796")))) + '(magit-diffstat-removed ((t (:foreground "#E9436F")))) + '(match ((t (:foreground "#25B2BC" :inverse-video t)))) + '(minibuffer-prompt ((t (:foreground "#25B2BC" :weight bold)))) + '(mode-line ((t (:background "#232530" :foreground "#9DA0A2" :inverse-video nil :box nil :height 0.9)))) + '(mode-line-buffer-id ((t (:foreground "#27D796" :weight bold :height 0.9)))) + '(mode-line-highlight ((t (:foreground "#E95379" :box nil :weight bold)))) + '(mode-line-inactive ((t (:foreground "#6F6F70" :inverse-video nil :box nil :weight light :height 0.9)))) + '(org-document-info ((t (:foreground "#25B2BC")))) + '(org-document-info-keyword ((t (:foreground "#09F7A0")))) + '(org-document-title ((t (:foreground "#CBCED0" :weight bold :height 1.44)))) + '(region ((t (:background "#2E303E")))) + '(show-paren-match ((t (:background "#25B2BC")))) + '(sml/charging ((t (:inherit sml/global :foreground "#27D796")))) + '(sml/discharging ((t (:inherit sml/global :foreground "#E9436F")))) + '(sml/filename ((t (:inherit mode-line-buffer-id :foreground "#EFB993" :weight bold)))) + '(sml/global ((t (:inherit font-lock-preprocessor-face :foreground "#9DA0A2")))) + '(sml/modified ((t (:inherit sml/not-modified :foreground "#E93C58" :weight bold)))) + '(sml/outside-modified ((t (:inherit sml/not-modified :background "#E93C58")))) + '(sml/prefix ((t (:inherit (font-lock-variable-name-face sml/global) :foreground "#9DA0A2")))) + '(sml/read-only ((t (:inherit (font-lock-type-face sml/not-modified) :foreground "#24A8B4")))) + '(success ((t (:foreground "#09F7A0" :weight bold)))) + '(tooltip ((t (:inherit default :background "#6C6F93")))) + '(vertical-border ((t (:background "#1C1E26" :foreground "#6F6F70")))) '(whitespace-line ((t (:background "red" :foreground "black"))))) (show-paren-mode 1) @@ -87,12 +160,6 @@ (emacs-lisp-mode "Elisp" :major) (whitespace-mode nil "whitespace")))) -;;; powerline -(use-package powerline - :ensure powerline) -(require 'powerline) -(powerline-vim-theme) - ;;; base16 (use-package base16-theme :ensure base16-theme @@ -101,14 +168,6 @@ (setq base16-theme-256-color-source 'base16-shell) (load-theme 'base16-horizon-dark t)) -;;; airline-themes -(use-package airline-themes - :ensure airline-themes) -(require 'airline-themes) -(load-theme 'airline-base16-shell-dark :no-confirm) -(when (display-graphic-p) - (load-theme 'airline-base16-gui-dark :no-confirm)) - ;;; neotree (use-package neotree :ensure neotree) @@ -122,16 +181,6 @@ ;; (set-face-attribute 'linum nil :background "#282828") ;; (set-face-attribute 'linum nil :foreground "#b8b8b8") -(setq powerline-utf-8-separator-left #xe0b0 - powerline-utf-8-separator-right #xe0b2 - airline-utf-glyph-separator-left #xe0b0 - airline-utf-glyph-separator-right #xe0b2 - airline-utf-glyph-subseparator-left #xe0b1 - airline-utf-glyph-subseparator-right #xe0b3 - airline-utf-glyph-branch #xe0a0 - airline-utf-glyph-readonly #xe0a2 - airline-utf-glyph-linenumber #xe0a1) - ;;; highlight-indent-guides (use-package highlight-indent-guides :ensure highlight-indent-guides @@ -381,5 +430,11 @@ :ensure t :demand t) +(use-package smart-mode-line + :ensure t + :demand t + :init + (sml/setup)) + (provide '.emacs) ;;; .emacs ends here -- cgit v1.2.3