Better theming and prettifying

4 files changed, 7 insertions, 170 deletions

diff --git a/init.el b/init.el
index 6542eb7..f064b80 100644
--- a/init.el
+++ b/init.el
@@ -3,7 +3,6 @@
 
 ;; Load path
 (add-to-list 'load-path "~/.emacs.d/lisp/")
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
 
 ;; Melpa support
 (require 'package)
@@ -14,7 +13,7 @@
 
 
 (setq package-list
-	  '(hl-todo python-mode org-bullets good-scroll counsel smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org neotree minimap vterm vterm-toggle drag-stuff))
+	  '(doom-themes hl-todo python-mode org-bullets good-scroll counsel smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org neotree minimap vterm vterm-toggle drag-stuff))
 
 ;; Fetch the list of packages available
 (unless package-archive-contents
@@ -36,8 +35,9 @@
                      gcs-done)))
 
 ;; Theme
-(load-theme 'vs-light t)
-(set-face-attribute 'region nil :background "#ffffcd")
+(require 'doom-themes)
+(load-theme 'doom-material t)
+(doom-themes-org-config)
 ;; (setq debug-on-error t) Uncomment if you would liek to debug errors!
 
 (require 'general)
@@ -57,7 +57,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
-   '("5859f61b502aa335b502b231c86a051210cb5974f74966e620c31be3a966659f" "32a9fa0f3722e679ed77a28aed3ae99161ef54dc27c35fd19e68e0410633960b" default))
+   '("2721b06afaf1769ef63f942bf3e977f208f517b187f2526f0e57c1bd4a000350" "70b596389eac21ab7f6f7eb1cf60f8e60ad7c34ead1f0244a577b1810e87e58c" "2853dd90f0d49439ebd582a8cbb82b9b3c2a02593483341b257f88add195ad76" "467dc6fdebcf92f4d3e2a2016145ba15841987c71fbe675dcfe34ac47ffb9195" "512ce140ea9c1521ccaceaa0e73e2487e2d3826cc9d287275550b47c04072bc4" "2078837f21ac3b0cc84167306fa1058e3199bbd12b6d5b56e3777a4125ff6851" "b99e334a4019a2caa71e1d6445fc346c6f074a05fcbb989800ecbe54474ae1b0" "4ff1c4d05adad3de88da16bd2e857f8374f26f9063b2d77d38d14686e3868d8d" "bf948e3f55a8cd1f420373410911d0a50be5a04a8886cabe8d8e471ad8fdba8e" "a138ec18a6b926ea9d66e61aac28f5ce99739cf38566876dc31e29ec8757f6e2" "7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "adaf421037f4ae6725aa9f5654a2ed49e2cd2765f71e19a7d26a454491b486eb" "be84a2e5c70f991051d4aaf0f049fa11c172e5d784727e0b525565bb1533ec78" "a44e2d1636a0114c5e407a748841f6723ed442dc3a0ed086542dc71b92a87aee" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "5859f61b502aa335b502b231c86a051210cb5974f74966e620c31be3a966659f" "32a9fa0f3722e679ed77a28aed3ae99161ef54dc27c35fd19e68e0410633960b" default))
  '(git-gutter:added-sign "++")
  '(git-gutter:deleted-sign "--")
  '(git-gutter:modified-sign "  ")
diff --git a/lisp/general.el b/lisp/general.el
index b1dbc29..d3d9f62 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -45,7 +45,6 @@
 ;; Fringe
 (setq-default left-fringe-width  20)
 (setq-default right-fringe-width  20)
-(set-face-attribute 'fringe nil :background "white")
 
 ;; Initialization screen
 (setq inhibit-splash-screen t)
@@ -98,7 +97,7 @@
 	"Set the colors of neotree to match my personal taste."
 	(setq left-fringe-width 0)
 	(setq right-fringe-width 0)
-	(face-remap-add-relative 'default :background "gray97" ))
+  )
 (add-hook 'neotree-mode-hook 'my-neotree-mode-hook)
 (setq neo-window-width 36)
 
@@ -111,7 +110,7 @@
 
 ;; Line highlighting
 (global-hl-line-mode 1)
-(set-face-background 'hl-line "gray97")
+
 
 ;; Git
 (use-package git-gutter
diff --git a/themes/vs-light-theme.el b/themes/vs-light-theme.el
deleted file mode 100644
index 203d5dc..0000000
--- a/themes/vs-light-theme.el
+++ /dev/null
@@ -1,81 +0,0 @@
-;;; vs-light-theme.el --- Visual Studio IDE light theme
-
-;; Copyright (C) 2019-2021 , Jen-Chieh Shen
-
-;; Author: Jen-Chieh Shen
-;; URL: https://github.com/emacs-vs/vs-light-theme
-;; Version: 0.2
-;; Package-Requires: ((emacs "24.1"))
-;; Created with emacs-theme-generator, https://github.com/mswift42/theme-creator.
-
-;; This file is NOT part of GNU Emacs.
-
-;; 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, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Visual Studio IDE light theme.
-;;
-
-;;; Code:
-
-(deftheme vs-light
-  "Visual Studio IDE light theme.")
-
-(let ((class '((class color) (min-colors 89)))
-      (fg1 "#000000")
-      (bg1 "#ffffff")
-      (builtin "#B0C4DE")
-      (keyword "#0000FF")
-      (const   "#2B91AF")
-      (comment "#6B8E23")
-      (func    "#74534B")
-      (str     "#B21515")
-      (type    "#2B91AF")
-      (var     "#000000")
-      (prep "#8D9B99")
-      (ln-color-fg "#2B91AF")
-      (ln-color-bg "#EEEEEE"))
-  (custom-theme-set-faces
-   'vs-light
-   `(default ((,class (:background ,bg1 :foreground ,fg1))))
-   `(font-lock-builtin-face ((,class (:foreground ,builtin))))
-   `(font-lock-comment-face ((,class (:foreground ,comment))))
-   `(font-lock-negation-char-face ((,class (:foreground ,const))))
-   `(font-lock-reference-face ((,class (:foreground ,const))))
-   `(font-lock-constant-face ((,class (:foreground ,const))))
-   `(font-lock-doc-face ((,class (:foreground ,comment))))
-   `(font-lock-function-name-face ((,class (:foreground ,func))))
-   `(font-lock-keyword-face ((,class (:foreground ,keyword))))
-   `(font-lock-string-face ((,class (:foreground ,str))))
-   `(font-lock-type-face ((,class (:foreground ,type ))))
-   `(font-lock-variable-name-face ((,class (:foreground ,var))))
-   `(font-lock-preprocessor-face ((,class (:foreground ,prep))))
-   `(line-number ((,class (:background ,ln-color-bg , :foreground ,ln-color-fg))))))
-
-;;;###autoload
-(when load-file-name
-  (add-to-list 'custom-theme-load-path
-               (file-name-as-directory (file-name-directory load-file-name))))
-
-;;;###autoload
-(defun vs-light-theme ()
-  "Load Visual Studio light theme."
-  (interactive)
-  (load-theme 'vs-light t))
-
-(provide-theme 'vs-light)
-
-(provide 'vs-light-theme)
-;;; vs-light-theme.el ends here
diff --git a/themes/vs-light-theme.el~ b/themes/vs-light-theme.el~
deleted file mode 100644
index 203d5dc..0000000
--- a/themes/vs-light-theme.el~
+++ /dev/null
@@ -1,81 +0,0 @@
-;;; vs-light-theme.el --- Visual Studio IDE light theme
-
-;; Copyright (C) 2019-2021 , Jen-Chieh Shen
-
-;; Author: Jen-Chieh Shen
-;; URL: https://github.com/emacs-vs/vs-light-theme
-;; Version: 0.2
-;; Package-Requires: ((emacs "24.1"))
-;; Created with emacs-theme-generator, https://github.com/mswift42/theme-creator.
-
-;; This file is NOT part of GNU Emacs.
-
-;; 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, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Visual Studio IDE light theme.
-;;
-
-;;; Code:
-
-(deftheme vs-light
-  "Visual Studio IDE light theme.")
-
-(let ((class '((class color) (min-colors 89)))
-      (fg1 "#000000")
-      (bg1 "#ffffff")
-      (builtin "#B0C4DE")
-      (keyword "#0000FF")
-      (const   "#2B91AF")
-      (comment "#6B8E23")
-      (func    "#74534B")
-      (str     "#B21515")
-      (type    "#2B91AF")
-      (var     "#000000")
-      (prep "#8D9B99")
-      (ln-color-fg "#2B91AF")
-      (ln-color-bg "#EEEEEE"))
-  (custom-theme-set-faces
-   'vs-light
-   `(default ((,class (:background ,bg1 :foreground ,fg1))))
-   `(font-lock-builtin-face ((,class (:foreground ,builtin))))
-   `(font-lock-comment-face ((,class (:foreground ,comment))))
-   `(font-lock-negation-char-face ((,class (:foreground ,const))))
-   `(font-lock-reference-face ((,class (:foreground ,const))))
-   `(font-lock-constant-face ((,class (:foreground ,const))))
-   `(font-lock-doc-face ((,class (:foreground ,comment))))
-   `(font-lock-function-name-face ((,class (:foreground ,func))))
-   `(font-lock-keyword-face ((,class (:foreground ,keyword))))
-   `(font-lock-string-face ((,class (:foreground ,str))))
-   `(font-lock-type-face ((,class (:foreground ,type ))))
-   `(font-lock-variable-name-face ((,class (:foreground ,var))))
-   `(font-lock-preprocessor-face ((,class (:foreground ,prep))))
-   `(line-number ((,class (:background ,ln-color-bg , :foreground ,ln-color-fg))))))
-
-;;;###autoload
-(when load-file-name
-  (add-to-list 'custom-theme-load-path
-               (file-name-as-directory (file-name-directory load-file-name))))
-
-;;;###autoload
-(defun vs-light-theme ()
-  "Load Visual Studio light theme."
-  (interactive)
-  (load-theme 'vs-light t))
-
-(provide-theme 'vs-light)
-
-(provide 'vs-light-theme)
-;;; vs-light-theme.el ends here