init.el

@@ -1,10 +1,10 @@
 ;;; init.el --- basic initial declarations
 ;;; Commentary:
-;;    _            _  _                 _
-;;   (_) _  __  (_)|  |_       ___ |  |
-;;   |  || '    \ |  ||   __|   /   _  \| |
-;;   |  || |  |  ||  ||   |   _ |    __/| |
-;;   |_||_|  |_||_| \__| (_)\___|  |_|
+;;      _              _   _                             _
+;;     (_) _ __ (_)|   |_           ___   |    |
+;;    |    || '_  \ |    ||   __|     /    _    \|    |
+;;   |    || |    |  ||    ||   |_   _|        __/|    |
+;;  |_||_|    |_||_|  \__|(_)\___|     |_|
 ;;
 ;; '((above text graphic generated with command `figlet -k "init.el"'))
 
@@ -287,15 +287,47 @@ 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 (require 'dash))
+  (elpaca 'dash)
   (elpaca elpaca-use-package
 	  (elpaca-use-package-mode)
 	  (setq elpaca-use-package-by-default t))
-  ;; (elpaca-wait)
+  (elpaca-wait)
+  (require 'dash)
+  ;; (setq use-package-git-keyword :ensure)
   )
 
+(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)
@@ -505,7 +537,7 @@ If the current window occupies the whole frame, split it."
   (dirvish-side-display-alist '((window-width . 0.15)
 				(slot . -1)
 				(side . left)))
-  :init (dirvish-override-dired-mode t)
+  ;; :init (dirvish-override-dired-mode t)
   :config
   (general-define-key
    :states 'normal
@@ -1000,18 +1032,18 @@ Return nil if DIR is not in a hugo project at all."
 (use-package pcmpl-args
   :after eshell)
 
-(unless (display-graphic-p)
-  (use-package popon
-    :ensure ( :type git
-	      :repo "https://codeberg.org/akib/emacs-popon"))
-  (use-package corfu-terminal
-    :ensure (corfu-terminal
-	     :type git
-	     :repo "https://codeberg.org/akib/emacs-corfu-terminal")
-    :after popon
-    :init (unless
-	      (display-graphic-p)
-	    (corfu-terminal-mode +1))))
+(use-package popon
+  :ensure (:type git
+	      :repo "https://codeberg.org/akib/emacs-popon")
+  :if (not (display-graphic-p)))
+(use-package corfu-terminal
+  :ensure (corfu-terminal
+	   :type git
+	   :repo "https://codeberg.org/akib/emacs-corfu-terminal")
+  :after popon
+  :init (unless
+	    (display-graphic-p)
+	  (corfu-terminal-mode +1)))
 
 (use-package transient :ensure t)
 (use-package magit