 	(goto-char (point-max))
 	(eval-print-last-sexp)))
     (load bootstrap-file nil 'nomessage)
+    (setq use-package-always-ensure t)
     (straight-use-package 'use-package)))
 
 (require 'package)
 
 (if (package-installed-p 'use-package)
     (progn
-      (setq use-package-always-defer nil
+      (setq use-package-always-defer t
 	    use-package-always-ensure t
 	    use-package-ignore-unknown-keywords t)
-      (require 'use-package))
+      (eval-when-compile
+	(add-to-list 'load-path
+		     (expand-file-name "~/src/github.com/frobware/emacs.d/use-package"))
+	(require 'use-package)))
   (progn
+    (setq use-package-always-defer t
+	  use-package-always-ensure t)
     (aim/straight-bootstrap)))
 
 (require 'term)


;; Load the theme of your choice:
(modus-themes-load-vivendi)
(define-key global-map (kbd "<f5>") #'modus-themes-toggle)
(custom-set-variables
 ;; custom-set-variables was added by Custom.
 ;; If you edit it by hand, you could mess it up, so be careful.
 ;; Your init file should contain only one such instance.
 ;; If there is more than one, they won't work right.
 '(package-selected-packages
   '(xterm-color x509-mode ws-butler which-key wgrep-ag vterm use-package unfill toml-mode smex rust-mode protobuf-mode pinentry pass notmuch nix-mode major-mode-hydra magit lua-mode lsp-ui langtool keychain-environment json-mode ibuffer-vc helm-projectile helm-lsp helm-ls-git helm-company go-mode go-add-tags git-timemachine git-gutter flycheck exec-path-from-shell dumb-jump dockerfile-mode docker-compose-mode direnv dired-narrow copy-as-format company-shell cmake-mode clipetty cargo browse-at-remote avy atomic-chrome ag)))
(custom-set-faces
 ;; custom-set-faces was added by Custom.
 ;; If you edit it by hand, you could mess it up, so be careful.
 ;; Your init file should contain only one such instance.
 ;; If there is more than one, they won't work right.
 )

(setq x-select-enable-clipboard t
      x-select-enable-primary t
      save-interprogram-paste-before-kill t)

(require 'uniquify)
(setq uniquify-buffer-name-style 'reverse
