From f38e5f359816e5e2110cdeb1161304c6155ef80b Mon Sep 17 00:00:00 2001 From: Zelong Kuang Date: Sun, 14 Dec 2025 04:52:31 +1100 Subject: [PATCH] Update --- .gitignore | 7 +---- init.el | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 init.el diff --git a/.gitignore b/.gitignore index 907145a..a2f1801 100644 --- a/.gitignore +++ b/.gitignore @@ -5,12 +5,6 @@ /profiles/*.el /.local*/ -# possible user config files -/profiles.el -/init.el -/config.el -/packages.el - # generated by elisp packages in sub-directories *~ *.*~ @@ -45,6 +39,7 @@ flycheck_*.el /ede-projects.el /eln-cache/ /elpa/ +/elpaca/ /eshell/ /network-security.data /places diff --git a/init.el b/init.el new file mode 100644 index 0000000..10efb34 --- /dev/null +++ b/init.el @@ -0,0 +1,76 @@ +;; -*- lexical-binding: t -*- + +;;;;;;;;;;;; elpaca initialise ;;;;;;;;;;;;;;;;;; +(defvar elpaca-installer-version 0.11) +(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 :depth 1 :inherit ignore + :files (:defaults "elpaca-test.el" (:exclude "extensions")) + :build (:not elpaca--activate-package))) +(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) + (build (expand-file-name "elpaca/" elpaca-builds-directory)) + (order (cdr elpaca-order)) + (default-directory repo)) + (add-to-list 'load-path (if (file-exists-p build) build repo)) + (unless (file-exists-p repo) + (make-directory repo t) + (when (<= emacs-major-version 28) (require 'subr-x)) + (condition-case-unless-debug err + (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) + ((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)) + ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch" + "--eval" "(byte-recompile-directory \".\" 0 'force)"))) + ((require 'elpaca)) + ((elpaca-generate-autoloads "elpaca" repo))) + (progn (message "%s" (buffer-string)) (kill-buffer buffer)) + (error "%s" (with-current-buffer buffer (buffer-string)))) + ((error) (warn "%s" err) (delete-directory repo 'recursive)))) + (unless (require 'elpaca-autoloads nil t) + (require 'elpaca) + (elpaca-generate-autoloads "elpaca" repo) + (let ((load-source-file-function nil)) (load "./elpaca-autoloads")))) +(add-hook 'after-init-hook #'elpaca-process-queues) +(elpaca `(,@elpaca-order)) + +;; Install a package via the elpaca macro +;; See the "recipes" section of the manual for more details. + +;; (elpaca example-package) + +;; Install use-package support +(elpaca elpaca-use-package + ;; Enable use-package :ensure support for Elpaca. + (elpaca-use-package-mode)) + +;;When installing a package used in the init file itself, +;;e.g. a package which adds a use-package key word, +;;use the :wait recipe keyword to block until that package is installed/configured. +;;For example: +;;(use-package general :ensure (:wait t) :demand t) + +(setq use-package-always-ensure t) +(setq use-package-expand-minimally t) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + + +(add-to-list 'load-path (expand-file-name "lisp/" user-emacs-directory)) +(require 'init-better-default) +(require 'init-completion) +(require 'init-meow) +(require 'init-edit) +(require 'init-ui) +(require 'init-bindings) + +(require 'init-coding) +(require 'init-org)