feat(packages): Replace package.el with straight.el

modules/editor/siren-display-fill-column.el

@@ -9,7 +9,7 @@
 ;; Emacs 27.x and later: Use native display-fill-column-indicator
 (when (not (version< emacs-version "27.0"))
   (use-package display-fill-column-indicator
-    :ensure nil ;; loaded from emacs built-ins
+    :straight (:type built-in)
 
     :hook
     (prog-mode . display-fill-column-indicator-mode)

modules/editor/siren-display-line-numbers.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package display-line-numbers
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
 
   :hook
   (prog-mode . display-line-numbers-mode))
@@ -20,7 +20,7 @@ Optional ARG is passed directly to mode toggle function."
 ;; Fix issue were the left fringe's is cut off by one pixel on the left side.
 ;; from: https://github.com/dgutov/diff-hl/issues/94#issuecomment-334168416
 (use-package frame
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :defer t
   :config
   (progn

modules/editor/siren-folding.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package hideshow
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :demand
 
   :bind
@@ -43,8 +43,8 @@ Borrowed from: http://www.emacswiki.org/emacs/HideShow"
            (1+ (current-column)))))))
 
 (use-package hideshowvis
-  :ensure nil ;; loaded from vendor
-  :demand)
+  :demand
+  :after hideshow)
 
 (provide 'siren-folding)
 ;;; siren-folding.el ends here

modules/editor/siren-helm-command.el

@@ -1,23 +0,0 @@
-;;; siren-helm-command.el --- jimeh's Emacs Siren: helm-command.
-
-;;; Commentary:
-
-;; Configure helm-command.
-
-;;; Code:
-
-(require 'siren-helm)
-
-(use-package helm-command
-  :ensure helm
-  :defer t
-
-  :bind
-  ("M-x" . helm-M-x)
-
-  :custom
-  (helm-M-x-always-save-history t)
-  (helm-M-x-fuzzy-match t))
-
-(provide 'siren-helm-command)
-;;; siren-helm-command.el ends here

modules/editor/siren-ido.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package ido
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
 
   :custom
   (ido-auto-merge-work-directories-length -1)

modules/languages/siren-js.el

@@ -12,7 +12,7 @@
 (require 'siren-prettier-js)
 
 (use-package js-mode
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :mode
   "\\.js\\'"
   "\\.pac\\'"

modules/languages/siren-makefile.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package make-mode
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :hook
   (makefile-mode . siren-makefile-mode-setup)
 

modules/languages/siren-prog-mode.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package prog-mode
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :hook
   (prog-mode . siren-prog-mode-setup)
 

modules/languages/siren-ruby.el

@@ -17,7 +17,7 @@
 (add-to-list 'projectile-globally-ignored-directories "vendor/ruby")
 
 (use-package ruby-mode
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :interpreter "ruby"
   :mode
   "Appraisals\\'"
@@ -156,10 +156,6 @@
 (use-package ruby-compilation
   :defer t)
 
-(use-package ruby-guard
-  :ensure nil ;; loaded from vendor
-  :commands ruby-guard)
-
 (use-package ruby-refactor
   :defer t
   :hook

modules/languages/siren-sh.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package sh-script
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :mode
   "\\.tmux"
   "\\.tmuxsh"

modules/languages/siren-sql.el

@@ -9,7 +9,7 @@
 (require 'siren-rainbow)
 
 (use-package sql-mode
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :mode "\\.sql\\'"
   :hook (sql-mode . siren-sql-mode-setup)
 

modules/languages/siren-text-mode.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package text-mode
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :hook (text-mode . siren-text-mode-setup)
   :init
   (defun siren-text-mode-setup ()

modules/languages/siren-toml.el

@@ -9,10 +9,10 @@
 (require 'siren-prettier-js)
 (require 'siren-prog-mode)
 
-(use-package toml-mode
-  :ensure nil ;; loaded from emacs built-ins
+(use-package conf-toml-mode
+  :straight (:type built-in)
   :mode "\\.toml\\'"
-  :hook (toml-mode . siren-toml-mode-setup)
+  :hook (conf-toml-mode . siren-toml-mode-setup)
 
   :init
   (defun siren-toml-mode-setup ()

modules/languages/siren-xml.el

@@ -10,7 +10,7 @@
 (require 'siren-prog-mode)
 
 (use-package nxml-mode
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :hook (nxml-mode . siren-xml-setup)
 
   :custom

modules/misc/siren-zone.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package zone
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :init
   (defun zone-choose (pgm)
     "Choose a PGM to run for `zone'."

modules/navigation/siren-dired.el

@@ -7,8 +7,6 @@
 ;;; Code:
 
 (use-package dired+
-  :ensure nil ;; loaded from vendor
-  :demand
   :bind (:map dired-mode-map
               ("c" . dired-create-directory)
               ("C-l" . diredp-up-directory-reuse-dir-buffer))

modules/navigation/siren-helm-ag.el

@@ -25,6 +25,7 @@
                              "elpa"
                              "node_modules"
                              "sorbet"
+                             "straight"
                              "vendor/assets")))
 
 (provide 'siren-helm-ag)

modules/navigation/siren-helm-files.el

@@ -1,24 +0,0 @@
-;;; siren-helm-files.el --- jimeh's Emacs Siren: helm-files configuration.
-
-;;; Commentary:
-
-;; Basic configuration for helm-files.
-
-;;; Code:
-
-(require 'siren-helm)
-
-(use-package helm-files
-  :ensure helm
-  :defer t
-  :bind
-  ("C-x C-f" . helm-find-files)
-  ("C-c f f" . helm-for-files)
-  ("C-c f r" . helm-recentf)
-
-  :custom
-  (helm-ff-file-name-history-use-recentf t)
-  (helm-ff-search-library-in-sexp t))
-
-(provide 'siren-helm-files)
-;;; siren-helm-files.el ends here

modules/navigation/siren-helm-imenu.el

@@ -1,25 +0,0 @@
-;;; siren-helm-imenu.el --- jimeh's Emacs Siren: helm-imenu configuration.
-
-;;; Commentary:
-
-;; Basic configuration for helm-imenu.
-
-;;; Code:
-
-(require 'imenu)
-(require 'siren-helm)
-
-(use-package imenu-anywhere
-  :config
-  (set-default 'imenu-auto-rescan t)
-  (set-default 'imenu-max-item-length 160)
-  (set-default 'imenu-max-items 400))
-
-(use-package helm-imenu
-  :ensure helm
-  :bind
-  ("C-t" . helm-imenu)
-  ("C-c t" . helm-imenu-anywhere))
-
-(provide 'siren-helm-imenu)
-;;; siren-helm-imenu.el ends here

modules/navigation/siren-helm.el

@@ -6,8 +6,15 @@
 
 ;;; Code:
 
+(require 'imenu)
+
+(use-package imenu-anywhere
+  :config
+  (set-default 'imenu-auto-rescan t)
+  (set-default 'imenu-max-item-length 160)
+  (set-default 'imenu-max-items 400))
+
 (use-package helm
-  :defer t
   :hook
   (helm-minibuffer-set-up . siren-helm--hide-minibuffer-maybe)
   (helm-after-initialize . siren-helm--toggle-source-header-line)
@@ -16,13 +23,26 @@
   (helm-cleanup . siren-helm--show-neotree-maybe)
   (helm-cleanup . siren-helm--show-treemacs-maybe)
 
+  :bind
+  ("M-x" . helm-M-x)
+  ("C-t" . helm-imenu)
+  ("C-c t" . helm-imenu-anywhere)
+  ("C-x C-f" . helm-find-files)
+  ("C-c f f" . helm-for-files)
+  ("C-c f r" . helm-recentf)
+
   :custom
+  (helm-M-x-always-save-history t)
+  (helm-M-x-fuzzy-match t)
   (helm-autoresize-max-height 30)
   (helm-autoresize-min-height 30)
   (helm-autoresize-mode t)
   (helm-buffer-max-length 64)
   (helm-case-fold-search 'smart)
+  (helm-command-prefix-key "C-c h")
   (helm-echo-input-in-header-line t)
+  (helm-ff-file-name-history-use-recentf t)
+  (helm-ff-search-library-in-sexp t)
   (helm-file-name-case-fold-search 'smart)
   (helm-split-window-default-side 'below)
   (siren-helm--did-hide-neotree nil)
@@ -90,15 +110,15 @@
         (select-window win))))
 
   :config
+  (require 'helm-config)
+
+  (require 'helm-command)
+  (require 'helm-files)
+  (require 'helm-imenu)
+
   (advice-add 'helm :before 'siren-helm--hide-neotree)
   (advice-add 'helm :before 'siren-helm--hide-treemacs))
 
-(use-package helm-config
-  :ensure helm
-
-  :custom
-  (helm-command-prefix-key "C-c h"))
-
 (use-package helm-descbinds
   :defer t)
 

modules/org-mode/siren-org-mode.el

@@ -12,8 +12,7 @@
 (require 'siren-flyspell)
 (require 'siren-smartparens)
 
-(use-package org-mode
-  :ensure nil ;; loaded from emacs built-ins
+(use-package org
   :bind (:map org-mode-map
               ("C-j" . newline-and-indent)
               ("RET" . newline-and-indent)

modules/org-mode/siren-org-mouse.el

@@ -7,8 +7,7 @@
 ;;; Code:
 
 (use-package org-mouse
-  :ensure nil ;; loaded from emacs built-ins
-  )
+  :straight (:type built-in))
 
 (provide 'siren-org-mouse)
 ;;; siren-org-mouse.el ends here

modules/projects/siren-dired-sidebar.el

@@ -24,7 +24,7 @@
   (setq dired-sidebar-use-term-integration t))
 
 (use-package all-the-icons-dired
-  :requires dired-sidebar
+  :after dired-sidebar
   :commands (all-the-icons-dired-mode))
 
 (provide 'siren-dired-sidebar)

modules/projects/siren-projectile.el

@@ -7,7 +7,9 @@
 ;;; Code:
 
 (use-package projectile
-  :demand
+  :hook
+  (after-init . projectile-mode)
+
   :bind
   ("C-c p p" . projectile-switch-project)
   ("C-c p k" . projectile-kill-buffers)
@@ -45,6 +47,7 @@
                                              "logs"
                                              "node_modules"
                                              "sorbet"
+                                             "straight"
                                              "tmp"
                                              "vendor/assets"))
   (projectile-globally-ignored-files '("TAGS" "*.log"))
@@ -55,9 +58,7 @@
   :config
   ;; Treat separate directories with Gemfiles within a single git repo as
   ;; separate projects.
-  (push "Gemfile" projectile-project-root-files-bottom-up)
-
-  (projectile-mode t))
+  (push "Gemfile" projectile-project-root-files-bottom-up))
 
 (provide 'siren-projectile)
 ;;; siren-projectile.el ends here

modules/projects/siren-treemacs.el

@@ -48,17 +48,17 @@
 
 (use-package treemacs-projectile
   :demand
-  :requires (treemacs projectile)
+  :after (treemacs projectile)
   :custom
   (treemacs-header-function #'treemacs-projectile-create-header))
 
 (use-package treemacs-persp
   :demand
-  :requires treemacs persp-mode)
+  :after treemacs persp-mode)
 
 (use-package treemacs-magit
   :demand
-  :requires treemacs magit)
+  :after treemacs magit)
 
 (use-package lsp-treemacs
   :config

modules/spelling/siren-flyspell.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package flyspell
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :demand
   :diminish flyspell-mode
   :bind

modules/text-editing/siren-yasnippet.el

@@ -9,10 +9,8 @@
 (use-package yasnippet-snippets)
 
 (use-package yasnippet
-  :demand
-  :diminish yas-minor-mode
-  :config
-  (yas-global-mode t))
+  :hook (after-init . yas-global-mode)
+  :diminish yas-minor-mode)
 
 (provide 'siren-yasnippet)
 ;;; siren-yasnippet.el ends here

modules/version-control/siren-diff-hl.el

@@ -9,13 +9,11 @@
 (require 'siren-magit)
 
 (use-package diff-hl
-  :demand
-  :hook ((dired-mode . diff-hl-dired-mode)
-         (magit-post-refresh . diff-hl-magit-post-refresh))
-
-  :config
-  (global-diff-hl-mode +1)
-  (diff-hl-flydiff-mode +1))
+  :hook
+  (after-init . global-diff-hl-mode)
+  (after-init . diff-hl-flydiff-mode)
+  (dired-mode . diff-hl-dired-mode)
+  (magit-post-refresh . diff-hl-magit-post-refresh))
 
 (provide 'siren-diff-hl)
 ;;; siren-diff-hl.el ends here

modules/version-control/siren-magit.el

@@ -11,7 +11,6 @@
 (require 'siren-flyspell)
 
 (use-package magit
-  :demand
   :bind
   ("C-x g". magit-status)
 

modules/windows/siren-windmove.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package windmove
-  :ensure nil ;; loaded from emacs built-ins
+  :straight (:type built-in)
   :config
   (global-set-key (kbd "M-k") (siren-ignore-error-wrapper 'windmove-down))
   (global-set-key (kbd "M-i") (siren-ignore-error-wrapper 'windmove-up))

modules/workspaces/siren-escreen.el

@@ -7,22 +7,23 @@
 ;;; Code:
 
 (use-package escreen
-  :ensure nil ;; loaded from vendor
+  :straight (:type git :host github :repo "renard/escreen-el")
   :demand
 
-  :bind (("s-}" . escreen-goto-next-screen)
-         ("s-{" . escreen-goto-prev-screen)
-         :map escreen-map
-         ("C-z" . escreen-goto-last-screen)
-         ("l" . escreen-goto-last-screen)
-         ("C-l" . escreen-goto-last-screen)
-         (";" . siren-escreen-get-active-screen)
-         ("C-;" . siren-escreen-get-active-screen)
-         ("C-c" . escreen-create-screen)
-         ("C-g" . escreen-goto-screen)
-         ("C-k" . escreen-kill-screen)
-         ("C-n" . escreen-goto-next-screen)
-         ("C-p" . escreen-goto-prev-screen))
+  :bind
+  ("s-}" . escreen-goto-next-screen)
+  ("s-{" . escreen-goto-prev-screen)
+  (:map escreen-map
+        ("C-z" . escreen-goto-last-screen)
+        ("l" . escreen-goto-last-screen)
+        ("C-l" . escreen-goto-last-screen)
+        (";" . siren-escreen-get-active-screen)
+        ("C-;" . siren-escreen-get-active-screen)
+        ("C-c" . escreen-create-screen)
+        ("C-g" . escreen-goto-screen)
+        ("C-k" . escreen-kill-screen)
+        ("C-n" . escreen-goto-next-screen)
+        ("C-p" . escreen-goto-prev-screen))
 
   :hook
   (escreen-goto-screen . siren-escreen-get-active-screen)

modules/workspaces/siren-persp-mode.el

@@ -7,7 +7,6 @@
 ;;; Code:
 
 (use-package persp-mode
-  :demand
   :hook
   (after-init . persp-mode)