From e703f4ef53b00f1148e8ca97ecdc262a461a5005 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 15 Feb 2020 18:03:36 +0000
Subject: [PATCH] chore(packages): Refactor package setups in within core

And get rid of:

- dash, doesn't need to be, packages which depend on it, should have it
  listed as a dependency
- smart-mode-line, don't need it anymore as I use the doom-modeline
  package to stylize the modeline.
---
 core/siren-core-editor.el   | 3 ++-
 core/siren-core-env.el      | 7 ++++---
 core/siren-core-packages.el | 4 ----
 core/siren-core-ui.el       | 6 ------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/core/siren-core-editor.el b/core/siren-core-editor.el
index f4c2da7..b5ee54d 100644
--- a/core/siren-core-editor.el
+++ b/core/siren-core-editor.el
@@ -66,7 +66,8 @@
 (global-auto-revert-mode t)
 
 ;; diminish keeps the modeline tidy
-(require 'diminish)
+(use-package diminish)
+
 (diminish 'visual-line-mode)
 
 ;; Enable mouse support when running in a console
diff --git a/core/siren-core-env.el b/core/siren-core-env.el
index 3db41d2..638fe11 100644
--- a/core/siren-core-env.el
+++ b/core/siren-core-env.el
@@ -7,9 +7,10 @@
 
 ;;; Code:
 
-(require 'exec-path-from-shell)
-(when (memq window-system '(mac ns x))
-  (exec-path-from-shell-initialize))
+(use-package exec-path-from-shell
+  :config
+  (when (memq window-system '(mac ns x))
+    (exec-path-from-shell-initialize)))
 
 (provide 'siren-core-env)
 ;;; siren-core-env.el ends here
diff --git a/core/siren-core-packages.el b/core/siren-core-packages.el
index 22351be..185e7b2 100644
--- a/core/siren-core-packages.el
+++ b/core/siren-core-packages.el
@@ -35,10 +35,6 @@
                 (not (y-or-n-p (format "Delete repository %S?" repo))))
       (delete-directory (straight--repos-dir repo) 'recursive 'trash))))
 
-(straight-use-package 'dash)
-(straight-use-package 'diminish)
-(straight-use-package 'exec-path-from-shell)
-(straight-use-package 'smart-mode-line)
 (straight-use-package 'use-package)
 
 (provide 'siren-core-packages)
diff --git a/core/siren-core-ui.el b/core/siren-core-ui.el
index 49bf58f..9639cd7 100644
--- a/core/siren-core-ui.el
+++ b/core/siren-core-ui.el
@@ -48,11 +48,5 @@
                               (abbreviate-file-name (buffer-file-name))
                             "%b"))))
 
-(require 'smart-mode-line)
-(setq sml/no-confirm-load-theme t)
-;; delegate theming to the currently active theme
-(setq sml/theme nil)
-(add-hook 'after-init-hook #'sml/setup)
-
 (provide 'siren-core-ui)
 ;;; siren-core-ui.el ends here