diff --git a/init.el b/init.el index 6153f42..9c002e5 100644 --- a/init.el +++ b/init.el @@ -287,47 +287,15 @@ If the current window occupies the whole frame, split it." (end (- (re-search-forward "\n```") 3))) (write-region start end elpaca-bootstrap-file)))) (load-file elpaca-bootstrap-file) - (elpaca 'dash) + (elpaca 'dash (require 'dash)) (elpaca elpaca-use-package (elpaca-use-package-mode) (setq elpaca-use-package-by-default t)) - (elpaca-wait) - (require 'dash) - ;; (setq use-package-git-keyword :ensure) + ;; (elpaca-wait) ) -(defun nix-bootstrap () - "placeholder function. Ideally, load nix packages" - (message "you never set up nix packages, baka!") - (require 'dash) - ;(setq use-package-git-keyword :nix) - (straight-bootstrap) - ) -(defun plist-remove (key plist) - "Remove KEY and its immediately following value from PLIST." - (if (member key plist) - (let ((index (cl-position key plist))) - (-remove-at-indices `(,index ,(1+ index)) plist)) - plist)) -;; (plist-remove :ensure '(use-package package)) -;; (if (executable-find "home-manager") -;; ;; (nix-bootstrap) -;; (straight-bootstrap) -;; (if (eq system-type 'windows-nt) -;; (straight-bootstrap) -;; (elpaca-bootstrap))) -;; (straight-bootstrap) (elpaca-bootstrap) -;; (fset #'use-package--orig (symbol-function #'use-package)) -;; (defmacro use-package (&rest args) -;; "re-definition of use-package to replace the downloader depending on system" -;; ;; (require 'dash) -;; (if (eq use-package-git-keyword :nix) -;; `(use-package--orig ,@(plist-remove :ensure args)) -;; `(use-package--orig ,@(-replace :ensure use-package-git-keyword args)))) -;; (use-package lua-mode :ensure nil) - (setq init-hook 'elpaca-after-init-hook) ;; do the things (add-hook 'server-after-make-frame-hook #'mir/graphical-setup)