diff --git a/.emacs.d/config.el b/.emacs.d/config.el index 8b05587..161c1ba 100755 --- a/.emacs.d/config.el +++ b/.emacs.d/config.el @@ -1,102 +1,3 @@ -;;(defvar elpaca-installer-version 0.4) -;;(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 -;; :files (:defaults (: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 (call-process "git" nil buffer t "clone" -;; (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))) -;; (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) -;; (load "./elpaca-autoloads"))) -;;(add-hook 'after-init-hook #'elpaca-process-queues) -;;(elpaca `(,@elpaca-order)) - -;; Install use-package support - -;;(elpaca elpaca-use-package - ;; Enable :elpaca use-package keyword. -;; (elpaca-use-package-mode) - ;; Assume :elpaca t unless otherwise specified. - ;; (setq elpaca-use-package-by-default t)) - -;; Block until current queue processed. -#(elpaca-wait) - -;;When installing a package which modifies a form used at the top-level -;;(e.g. a package which adds a use-package key word), -;;use `elpaca-wait' to block until that package has been installed/configured. -;;For example: -;;(use-package general :demand t) -;;(elpaca-wait) - -;; Expands to: (elpaca evil (use-package evil :demand t)) -(use-package evil - :init ;; tweak evil's configuration before loading it - (setq evil-want-integration t) ;; This is optional since it's already set to t by default. - (setq evil-want-keybinding nil) - (setq evil-vsplit-window-right t) - (setq evil-split-window-below t) - (evil-mode)) - (use-package evil-collection - :after evil - :config - (setq evil-collection-mode-list '(dashboard dired ibuffer)) - (evil-collection-init)) - (use-package evil-tutor) - -;;Turns off elpaca-use-package-mode current declartion -;;Note this will cause the declaration to be interpreted immediately (not deferred). -;;Useful for configuring built-in emacs features. -#(use-package emacs :elpaca nil :config (setq ring-bell-function #'ignore)) - -;; Don't install anything. Defer execution of BODY -(elpaca nil (message "deferred")) - -(use-package general - :config - (general-evil-setup) - - ;; set up 'SPC' as the global leader key - (general-create-definer dt/leader-keys - :states '(normal insert visual emacs) - :keymaps 'override - :prefix "SPC" ;; set leader - :global-prefix "M-SPC") ;; access leader in insert mode - - (dt/leader-keys - "b" '(:ignore t :wk "buffer") - "bb" '(switch-to-buffer :wk "Switch buffer") - "bk" '(kill-this-buffer :wk "Kill this buffer") - "bn" '(next-buffer :wk "Next buffer") - "bp" '(previous-buffer :wk "Previous buffer") - "br" '(revert-buffer :wk "Reload buffer")) - -) - (set-face-attribute 'default nil :font "JetBrains Mono" :height 110 @@ -109,17 +10,12 @@ :font "JetBrains Mono" :height 110 :weight 'medium) -;; Makes commented text and keywords italics. -;; This is working in emacsclient but not emacs. -;; Your font must have an italic face available. (set-face-attribute 'font-lock-comment-face nil :slant 'italic) (set-face-attribute 'font-lock-keyword-face nil :slant 'italic) -;; This sets the default font on all graphical frames created after restarting Emacs. -;; Does the same thing as 'set-face-attribute default' above, but emacsclient fonts -;; are not right unless I also add this method of setting the default font. + (add-to-list 'default-frame-alist '(font . "JetBrains Mono-11")) ;; Uncomment the following line if line spacing needs adjusting. diff --git a/.emacs.d/init-packages.el b/.emacs.d/init-packages.el new file mode 100644 index 0000000..25a8f3d --- /dev/null +++ b/.emacs.d/init-packages.el @@ -0,0 +1,39 @@ +(require 'package) + +(add-to-list 'package-archives + '("elpy" . "http://jorgenschaefer.github.io/packages/")) + +(add-to-list 'package-archives + '("marmalade" . "http://marmalade-repo.org/packages/")) + +(add-to-list 'package-archives + '("melpa-stable" . "http://melpa-stable.milkbox.net/packages/") t) + +(add-to-list 'load-path "~/.emacs.d/site-lisp/") + + + +;; (setq package-archive-priorities '(("melpa" . 10) +;; ("gnu" . 5) +;; ("org" . 2) +;; ("marmalade" . 0) +;; )) + +; list the packages you want +(setq package-list + '( + magit + )) + + +; activate all the packages +(package-initialize) + +; fetch the list of packages available +(unless package-archive-contents + (package-refresh-contents)) + +; install the missing packages +(dolist (package package-list) + (unless (package-installed-p package) + (package-install package))) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 35f889e..f35040a 100755 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,8 +1,8 @@ -(org-babel-load-file - (expand-file-name - "config.org" - user-emacs-directory)) - (add-to-list 'custom-theme-load-path "~/.emacs.d/themes") +;;(org-babel-load-file +;; (expand-file-name +;; "config.org" +;; user-emacs-directory)) +(add-to-list 'custom-theme-load-path "~/.emacs.d/themes") (load-theme 'catppuccin t) (setq catppuccin-flavor 'frappe) ;; or 'latte, 'macchiato, or 'mocha (catppuccin-reload)