From ad5f44144d34bc54602da282f1b6b221a8d6e71c Mon Sep 17 00:00:00 2001 From: tastytea Date: Tue, 19 Mar 2019 07:08:27 +0100 Subject: [PATCH] Switched to doom-modeline and new theme. --- init.el | 75 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/init.el b/init.el index 727fc9c..8ff8973 100644 --- a/init.el +++ b/init.el @@ -248,6 +248,44 @@ ;; Auto-type closing brackets (electric-pair-mode t) +;;;;;;;;;;;;;;;;;;;; Appearance ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Theme +;; (unless slow-computer +;; (use-package monokai-theme +;; :init +;; (setq monokai-highlight-line "#34342F") +;; :config +;; (load-theme 'monokai t))) + +;; Icons (required by doom) +(use-package all-the-icons + :config + (unless (file-exists-p "~/.local/share/fonts/all-the-icons.ttf") + (all-the-icons-install-fonts t))) + +;; Theme +(unless slow-computer + (use-package doom-themes + :after all-the-icons + :config + (load-theme 'doom-molokai t) + (doom-themes-neotree-config) + )) + +;; Modeline +(use-package doom-modeline + :after all-the-icons + :config + (setq doom-modeline-minor-modes t) + :hook (after-init . doom-modeline-mode)) + +;; Misc +(set-face-font 'default "Source Code Pro") +(global-hl-line-mode t) +(global-display-line-numbers-mode) +(setq show-trailing-whitespace t) +(show-paren-mode t) + ;;;;;;;;;;;;;;;;;;;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Directory tree (use-package neotree @@ -263,19 +301,6 @@ ("C-x g" . magit-status) ("C-x M-g" . magit-dispatch)) -;; Appearance -(unless slow-computer - (use-package monokai-theme - :init - (setq monokai-highlight-line "#34342F") - :config - (load-theme 'monokai t))) -(set-face-font 'default "Source Code Pro") -(global-hl-line-mode t) -(global-display-line-numbers-mode) -(setq show-trailing-whitespace t) -(show-paren-mode t) - ;; Draw line in column 80 (use-package fill-column-indicator :after company @@ -316,10 +341,16 @@ ;; (tabbar-ruler-group-buffer-groups) ; Group by file type (tabbar-ruler-group-user-buffers) ; Group by frame ;; (mode-icons-mode 0) ; Disable modeline symbols - (setq tabbar-ruler-swap-faces t) ; Swap tab colors + (setq tabbar-ruler-swap-faces nil) ; Swap tab colors :bind ("C-" . 'tabbar-ruler-tabbar-backward-tab) - ("C-" . 'tabbar-ruler-tabbar-forward-tab))) + ("C-" . 'tabbar-ruler-tabbar-forward-tab) + :custom-face + (tabbar-selected (nil + :foreground "LightGray" :background "#333638" :bold t)) + (tabbar-unselected (nil + :foreground "DarkGray" :background "#1C1E1F" :italic t)) + )) ;; Keybinding for whitespace, don't visualise newlines (use-package whitespace @@ -415,3 +446,17 @@ (provide 'init) ;;; init.el ends here +(custom-set-variables + ;; custom-set-variables 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. + '(package-selected-packages + (quote + (doom-themes doom-modeline all-the-icons zenburn-theme use-package tabbar-ruler spaceline smart-comment realgud projectile popup nginx-mode neotree multiple-cursors monokai-theme markdown-mode magit irony-eldoc hl-todo flycheck-rtags flycheck-irony flx-ido fill-column-indicator crontab-mode counsel company-rtags company-nginx company-irony-c-headers company-irony company-flx cmake-ide benchmark-init base16-theme autothemer auto-package-update adoc-mode)))) +(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. + )