remove sublime-themes to doom-themes

3 files changed, 44 insertions, 27 deletions

diff --git a/custom.el b/custom.el
index b9285ac..b22e606 100644
--- a/custom.el
+++ b/custom.el
@@ -11,7 +11,7 @@
  '(ecb-options-version "2.50")
  '(package-selected-packages
    (quote
-    (git-gutter-fringe yaml-mode whitespace-cleanup-mode which-key web-mode vue-mode use-package undo-tree sublime-themes sml-modeline smartparens smart-mode-line-powerline-theme shrink-path sass-mode rjsx-mode rainbow-mode py-autopep8 projectile pkgbuild-mode pip-requirements php-refactor-mode nlinum nginx-mode neotree markdown-mode log4j-mode less-css-mode json-mode js2-refactor ivy-rich ivy-hydra highlight-indent-guides gitignore-mode gitconfig-mode gitattributes-mode git-timemachine flycheck eslintd-fix emmet-mode elpy ecb dotenv-mode dokuwiki-mode diminish crystal-mode counsel company-quickhelp company-php apache-mode anzu all-the-icons))))
+    (git-gutter-fringe yaml-mode whitespace-cleanup-mode which-key web-mode vue-mode use-package undo-tree smartparens sass-mode rjsx-mode rainbow-mode py-autopep8 projectile pkgbuild-mode pip-requirements php-refactor-mode nlinum nginx-mode neotree markdown-mode log4j-mode less-css-mode json-mode js2-refactor ivy-rich ivy-hydra highlight-indent-guides gitignore-mode gitconfig-mode gitattributes-mode git-timemachine flycheck eslintd-fix emmet-mode elpy ecb dotenv-mode doom-themes doom-modeline dokuwiki-mode diminish crystal-mode counsel company-quickhelp company-php apache-mode anzu))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/modules/init-modeline.el b/modules/init-modeline.el
index d0f5bab..1df4019 100644
--- a/modules/init-modeline.el
+++ b/modules/init-modeline.el
@@ -6,26 +6,11 @@
 ;;----------------------------------------------------------------------------
 ;; Modeline configuration
 ;;----------------------------------------------------------------------------
-
-(use-package smart-mode-line
-  :pin "MELPA")
-(use-package smart-mode-line-powerline-theme
-  :pin "MELPA")
-(use-package sml-modeline
+(use-package doom-modeline
   :pin "MELPA"
-  :config
-  ;; Show number of occurrences when searching
-  (setq sml/theme 'powerline)
-
-  (setq sml/no-confirm-load-theme t)
-  (setq sml/shorten-modes t)
-  ;; Show EOL mode
-  (setq sml/show-eol t)
-  ;; Show remote buffers
-  (setq sml/show-remote t)
-
-  (sml/setup)
-  (sml-modeline-mode t))
+  :ensure t
+  :hook (after-init . doom-modeline-mode)
+  )
 
 (use-package anzu
   :config
diff --git a/modules/init-theme.el b/modules/init-theme.el
index 28dec12..848757e 100644
--- a/modules/init-theme.el
+++ b/modules/init-theme.el
@@ -3,15 +3,47 @@
 ;;
 
 ;;; Code:
-(use-package sublime-themes
+(use-package doom-themes
+  :pin "MELPA"
+  :ensure t
+  :bind
+  ("C-x t d" . dark-theme)
+  ("C-x t l" . light-theme)
+
+  :init
+  (defun light-theme ()
+    "Activate light colortheme"
+    (interactive)
+    (load-theme 'doom-one-light)
+    (delete-selection-mode 1)
+    )
+
+  (defun dark-theme ()
+    "Activate dark colortheme"
+    (interactive)
+    (load-theme 'doom-molokai)
+    (delete-selection-mode 1)
+    ;; Invoke customcolors
+    (customcolors)
+    )
+  ;; Invoke theme
+  (load-theme 'doom-molokai t)
+
   :config
-  (load-theme 'spolsky t))
+  (defun customcolors ()
+    "Simple customcolors for theme."
+    (set-cursor-color "#268bd2")
+    (set-face-background 'highlight "#268bd2")
+
+    ;; Fix linum current-line highlight
+    (defface my-linum-hl
+      '((t :background "gray20" :foreground "gold"))
+      "Face for the currently active Line number"
+      :group 'linum))
 
-;; Fix linum current-line highlight. Doesn't looks good with this theme
-(defface my-linum-hl
-  '((t :background "gray30" :foreground "gold"))
-  "Face for the currently active Line number"
-  :group 'linum)
+  ;; Invoke customcolors
+  (customcolors)
+  )
 
 (provide 'init-theme)