From e30eb7950e99b007bc5851a93a5433dbab40db63 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Tue, 20 Apr 2021 08:35:07 +0300
Subject: [PATCH] Move around themes, change theme to dark

---
 init.el                          |  7 +++--
 lang/javascript.el               |  8 ++++-
 themes/themes.el => pkg/fonts.el | 51 +++++++-------------------------
 pkg/themes.el                    | 43 +++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 44 deletions(-)
 rename themes/themes.el => pkg/fonts.el (59%)
 create mode 100644 pkg/themes.el

diff --git a/init.el b/init.el
index 917fa65..2d503d1 100644
--- a/init.el
+++ b/init.el
@@ -48,7 +48,8 @@
 (require '+custom-pkg-speed-type "$HOME/.emacs.d/pkg/speed-type.el")
 
 ;; Themes
-(require '+custom-themes "$HOME/.emacs.d/themes/themes.el")
+(require '+custom-pkg-themes "$HOME/.emacs.d/pkg/themes.el")
+(require '+custom-pkg-fonts "$HOME/.emacs.d/pkg/fonts.el")
 
 ;; Actual supported languages and file syntax.
 (require '+custom-lang-elisp "$HOME/.emacs.d/lang/elisp.el")
@@ -92,8 +93,8 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(font-lock-constant-face ((((type graphic)) (:foreground "#dfaf8f")) (((min-colors 256)) (:foreground "brightred")) (t (:foreground "brightred"))))
- '(font-lock-type-face ((t (:foreground "#ffcb6b" :family "Hack"))))
- '(markdown-code-face ((t (:inherit fixed-pitch :family "Hack"))))
+ '(font-lock-type-face ((t (:foreground "#ffcb6b" :family "JetBrains Mono"))))
+ '(markdown-code-face ((t (:inherit fixed-pitch :family "JetBrains Mono"))))
  '(mmm-default-submode-face ((t nil))))
 
 ;; Restore GC to normal, but still high
diff --git a/lang/javascript.el b/lang/javascript.el
index 0e11d6f..2cf7492 100644
--- a/lang/javascript.el
+++ b/lang/javascript.el
@@ -43,7 +43,13 @@
                '(company-capf company-yasnippet)))
 
 (add-hook 'js2-mode-hook 'activate-js2-mode)
-(add-hook 'vue-mode-hook 'lsp)
+
+(defun activate-vue-mode ()
+  "VueJS overrides."
+  (lsp-deferred)
+  (setq-local lsp-ui-show-code-actions f))
+
+(add-hook 'vue-mode-hook 'activate-vue-mode)
 
 (provide '+custom-lang-javascript)
 ;;; javascript.el ends here
diff --git a/themes/themes.el b/pkg/fonts.el
similarity index 59%
rename from themes/themes.el
rename to pkg/fonts.el
index d364299..5a1eee8 100644
--- a/themes/themes.el
+++ b/pkg/fonts.el
@@ -1,44 +1,15 @@
-;;; themes -- summary
+;;; fonts.el --- summary
+
+;; Author: Maciej Szlosarczyk
+;; Maintainer: Maciej Szlosarczyk
+;; Version: 0.1-snapshot
+
 ;;; Commentary:
+
+;; Set font stuff
+
 ;;; Code:
 
-;; Use smart-mode-line
-(use-package smart-mode-line
-  :straight t
-  :config
-  (setq-default sml/no-confirm-load-theme t)
-  (setq-default display-time-format "%H:%M") ;; time format to display on mode line
-  (sml/setup))
-
-(use-package base16-theme :straight t :defer t)
-(use-package flatui-theme :straight t :defer t)
-(use-package planet-theme :straight t :defer t)
-(use-package apropospriate-theme :straight t :defer t)
-
-;; Disable cursor blinking
-(blink-cursor-mode 0)
-
-;; Light themes
-(load-theme 'base16-atelier-forest-light t t)
-(load-theme 'base16-harmonic-light t t)
-(load-theme 'apropospriate-light t t)
-(load-theme 'base16-tomorrow t t)
-
-;; Dark themes
-(load-theme 'base16-solarflare t t)
-(load-theme 'base16-snazzy t t)
-(load-theme 'base16-gruvbox-dark-hard t t)
-
-(if (display-graphic-p)
-    (progn
-      (sml/apply-theme 'respectful)
-      (enable-theme (nth
-                     (random 2)
-                     '(base16-tomorrow base16-harmonic-light))))
-  (progn
-    (defvar base16-theme-256-color-source "base16-shell")
-    (enable-theme 'apropospriate-light)))
-
 ;; Set font face
 ;;;;;;;;;;;;;;;;;;;;;; Font configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defun set-font (name size)
@@ -77,5 +48,5 @@
                     :foreground (face-foreground 'default)
                     :background (face-background 'default))
 
-(provide '+custom-themes)
-;;; themes.el ends here
+(provide '+custom-pkg-fonts)
+;;; fonts.el ends here
diff --git a/pkg/themes.el b/pkg/themes.el
new file mode 100644
index 0000000..b34d107
--- /dev/null
+++ b/pkg/themes.el
@@ -0,0 +1,43 @@
+;;; themes -- summary
+;;; Commentary:
+;;; Code:
+
+;; Use smart-mode-line
+(use-package smart-mode-line
+  :straight t
+  :config
+  (setq-default sml/no-confirm-load-theme t)
+  (setq-default display-time-format "%H:%M") ;; time format to display on mode line
+  (sml/setup))
+
+(use-package base16-theme :straight t :defer t)
+(use-package flatui-theme :straight t :defer t)
+(use-package planet-theme :straight t :defer t)
+(use-package apropospriate-theme :straight t :defer t)
+
+;; Disable cursor blinking
+(blink-cursor-mode 0)
+
+;; Light themes
+(load-theme 'base16-atelier-forest-light t t)
+(load-theme 'base16-harmonic-light t t)
+(load-theme 'apropospriate-light t t)
+(load-theme 'base16-tomorrow t t)
+
+;; Dark themes
+(load-theme 'base16-solarflare t t)
+(load-theme 'base16-snazzy t t)
+(load-theme 'base16-gruvbox-dark-hard t t)
+
+(if (display-graphic-p)
+    (progn
+      (sml/apply-theme 'respectful)
+      (enable-theme (nth
+                     (random 2)
+                     '(base16-solarflare base16-snazzy))))
+  (progn
+    (defvar base16-theme-256-color-source "base16-shell")
+    (enable-theme 'apropospriate-light)))
+
+(provide '+custom-pkg-themes)
+;;; themes.el ends here