 	   'silent 'inhibit-cookies)
 	(goto-char (point-max))
 	(eval-print-last-sexp)))
-    (load bootstrap-file nil 'nomessage)))
-
-(aim/straight-bootstrap)
-
-;; Bootstrap use-package
-(straight-use-package 'use-package)
-
-(setq use-package-always-defer t)
-;;(straight-use-package '(org :type built-in))
-
-;; https://github.com/cpitclaudel/easy-escape
-;; avoid toothpicks.
-(use-package easy-escape)
-
-(use-package term
-  :init
-  ;; prevent cursor blinking in remote terminal sessions.
-  (setq visible-cursor nil))
+    (load bootstrap-file nil 'nomessage)
+    (straight-use-package 'use-package)))
+
+(require 'package)
+
+(if (package-installed-p 'use-package)
+    (progn
+      (setq use-package-always-defer nil
+	    use-package-always-ensure t
+	    use-package-ignore-unknown-keywords t)
+      (require 'use-package))
+  (progn
+    (aim/straight-bootstrap)))
+
+(require 'term)
+;; prevent cursor blinking in remote terminal sessions.
+(setq visible-cursor nil)
 
 (use-package pinentry
-  :ensure t
   :config
   (setq epa-pinentry-mode 'loopback) ; prevent GUI input
   (pinentry-start))
 
-(use-package gcmh
-  :defer nil
-  :ensure t
-  :config
-  (gcmh-mode 1))
+;; (use-package gcmh
+;;   :defer nil
+;;   :config
+;;   (gcmh-mode 1))
 
 (use-package lua-mode)
 
 (use-package clipetty
-  :ensure t
   ;; You can invoke Clipetty explicitly from a key binding to copy a
   ;; region to the clipboard rather than using either the local or
   ;; global minor modes. To that end, Clipetty has a function called

(defvar browse-url-mosaic-program nil)

(use-package browse-at-remote)
(use-package browse-url)
(use-package cmake-mode)
(use-package hl-line)
(use-package json-mode)
(use-package markdown-mode)
(use-package pass)

  :hook
  (prog-mode . ws-butler-mode))

(require 'ibuffer)

;; (use-package ibuffer
;;   :bind
;;   (:map ibuffer-mode-map
;;	("SPC" . ibuffer-visit-buffer)))

(use-package ibuffer-vc
  :after (ibuffer vc)
