use straight.el and add scad-mode

2 files changed, 24 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 2b7cbb0..e7927dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 # no-littering
 /etc/
 /var/
+/straight/
diff --git a/init.el b/init.el
index 6cc5212..2c35f52 100644
--- a/init.el
+++ b/init.el
@@ -1,6 +1,18 @@
-(with-eval-after-load 'package
-  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
-(package-initialize)
+(defvar bootstrap-version)
+(let ((bootstrap-file
+       (expand-file-name
+        "straight/repos/straight.el/bootstrap.el"
+        (or (bound-and-true-p straight-base-dir)
+            user-emacs-directory)))
+      (bootstrap-version 7))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
 
 (setopt inhibit-splash-screen t)
 (setopt make-backup-files nil)
@@ -62,6 +74,9 @@
 (add-to-list 'tab-bar-format 'tab-bar-format-align-right 'append)
 (add-to-list 'tab-bar-format 'tab-bar-format-global 'append)
 
+(straight-use-package 'use-package)
+(setq straight-use-package-by-default t)
+
 (use-package emacs
   :hook
   ((prog-mode . electric-pair-mode))
@@ -69,19 +84,16 @@
   (load-theme 'modus-operandi-tinted t))
 
 (use-package consult
-  :ensure t
   :bind
   (("C-x b" . consult-buffer)
    ("C-s"   . consult-line)))
 
 (use-package orderless
-  :ensure t
   :custom
   (completion-styles '(orderless))
   (completion-category-overrides '((file (styles partial-completion)))))
 
 (use-package magit
-  :ensure t
   :bind (("C-x g" . magit-status)))
 
 (use-package which-key
@@ -95,22 +107,18 @@
   (fset #'jsonrpc--log-event #'ignore))
 
 (use-package git-gutter
-  :ensure t
   :config
   (global-git-gutter-mode 1))
 
 (use-package marginalia
-  :ensure t
   :config
   (marginalia-mode))
 
 (use-package vertico
-  :ensure t
   :init
   (vertico-mode))
 
 (use-package eat
-  :ensure t
   :custom
   (eat-term-name "xterm")
   :bind
@@ -120,12 +128,14 @@
   (eat-eshell-visual-command-mode))
 
 (use-package no-littering
-  :ensure t
   :custom
   (custom-file (no-littering-expand-etc-file-name "custom.el")))
 
+(use-package scad-mode
+  :defer t)
+
 (use-package org-publish-rss
-  :vc (:url "https://git.sr.ht/~taingram/org-publish-rss"
-	    :rev :newest))
+  :straight (org-publish-rss :type git :host nil
+			     :repo "https://git.sr.ht/~taingram/org-publish-rss"))
 
 (load-file (expand-file-name "org.el" user-emacs-directory))