diff --git a/home/emacs/init.el b/home/emacs/init.el index 237713d..357ca2a 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -45,12 +45,12 @@ ;;;;; Installation -(defvar elpaca-installer-version 0.6) +(defvar elpaca-installer-version 0.7) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" - :ref nil + :ref nil :depth 1 :files (:defaults "elpaca-test.el" (:exclude "extensions")) :build (:not elpaca--activate-package))) (let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) @@ -63,8 +63,10 @@ (when (< emacs-major-version 28) (require 'subr-x)) (condition-case-unless-debug err (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) - ((zerop (call-process "git" nil buffer t "clone" - (plist-get order :repo) repo))) + ((zerop (apply #'call-process `("git" nil ,buffer t "clone" + ,@(when-let ((depth (plist-get order :depth))) + (list (format "--depth=%d" depth) "--no-single-branch")) + ,(plist-get order :repo) ,repo)))) ((zerop (call-process "git" nil buffer t "checkout" (or (plist-get order :ref) "--")))) (emacs (concat invocation-directory invocation-name)) @@ -112,7 +114,6 @@ ;;;; Emacs (use-package emacs - :elpaca nil :after org :custom (completion-cycle-threshold 10) @@ -186,13 +187,12 @@ ;;;; Org Mode (use-package org - :elpaca nil :preface (defun cc/org-local-stuff () (setq-local visual-fill-column-center-text t)) - :elpaca (:repo "https://git.savannah.gnu.org/git/emacs/org-mode.git" :branch "emacs-sync") + ;; TODO: WTF was that for? + ;;:elpaca (:repo "https://git.savannah.gnu.org/git/emacs/org-mode.git" :branch "emacs-sync") :after visual-fill-column - :ensure t :custom (org-babel-load-languages '((emacs-lisp . t) (scheme . t) @@ -253,7 +253,6 @@ ) (use-package unicode-fonts - :ensure t :config (unicode-fonts-setup)) @@ -261,7 +260,7 @@ (add-to-list 'default-frame-alist '(alpha-background . 90)) (use-package lambda-line - :elpaca (:host github :repo "lambda-emacs/lambda-line") + :ensure (:host github :repo "lambda-emacs/lambda-line") :custom (lambda-line-icon-time t) ;; requires ClockFace font (see below) (lambda-line-clockface-update-fontset "ClockFaceRect") ;; set clock icon @@ -297,7 +296,7 @@ (setq mode-line-format (list "%_")))) (use-package lambda-themes - :elpaca (:host github :repo "lambda-emacs/lambda-themes") + :ensure (:host github :repo "lambda-emacs/lambda-themes") :custom (lambda-themes-set-italic-comments t) (lambda-themes-set-italic-keywords t) @@ -335,7 +334,6 @@ ;;;; Evil Mode (use-package evil - :ensure t :init (setq evil-want-keybinding nil evil-emacs-state-tag " 󰯸 " @@ -366,7 +364,6 @@ ;;;; Search, Completion, Execution ;;;;; Preliminary Packages (use-package savehist - :elpaca nil :init (savehist-mode)) @@ -519,7 +516,6 @@ (use-package tempel) (use-package xref-union - :elpaca t :custom (xref-union-excluded-backends (lambda (b) (eq b #'etags--xref-backend))) :hook @@ -656,7 +652,7 @@ Point must be at the beginning of balanced expression (sexp)." (setq-default eglot-workspace-configuration '((clojure-lsp (maxCompletions . 300)))) (add-to-list 'eglot-server-programs - '((clojure-mode clojurec-mode clojurescript-mode) + '((clojure-mode clojurec-mode clojurescript-mode clojure-ts-mode) "clojure-lsp" :initializationOptions (:preferences @@ -749,7 +745,6 @@ Point must be at the beginning of balanced expression (sexp)." ;;;;;; Chicken Scheme (use-package scheme - :elpaca nil :hook (scheme-mode . (lambda () (setq-local prettify-symbols-alist @@ -852,8 +847,6 @@ Point must be at the beginning of balanced expression (sexp)." ;;;; Communication ;;;;; IRC (use-package rcirc - :elpaca nil - :ensure t :after password-store :custom (rcirc-server-alist