summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--init.el31
1 files changed, 19 insertions, 12 deletions
diff --git a/init.el b/init.el
index 8449569..75ec3a3 100644
--- a/init.el
+++ b/init.el
@@ -107,15 +107,6 @@
;;; Package management
-;; (progn ; `borg'
-;; (add-to-list 'load-path
-;; (expand-file-name "lib/borg" user-emacs-directory))
-;; (require 'borg)
-;; (borg-initialize)
-;; (setq borg-rewrite-urls-alist
-;; '(("git@github.com:" . "https://github.com/")
-;; ("git@gitlab.com:" . "https://gitlab.com/"))))
-
;; variables of interest:
;; package-archive-priorities
;; package-load-list
@@ -130,8 +121,23 @@
(csetq
package-archives
`(,@package-archives
- ("org" . "https://orgmode.org/elpa/")
- ("bndl" . "https://p.bndl.org/elpa/"))))
+ ;; ("bndl" . "https://p.bndl.org/elpa/")
+ ("org" . "https://orgmode.org/elpa/"))
+ package-load-list
+ '(;; GNU ELPA
+ (ivy "0.13.1")
+ (counsel "0.13.1")
+ (swiper "0.13.1")
+ (debbugs "0.26")
+ (delight "1.7")
+ (ebdb "0.6.19")
+ (orgalist "1.12")
+ (rt-liberation "1.31")
+ (yasnippet "0.14.0")
+ ;; bndl
+ (refinery-theme "0.1.1")
+ ;; Org ELPA
+ (org-plus-contrib "20200921"))))
(package-initialize))
(csetq package-archive-upload-base "/ssh:caffeine:~/www/p/elpa")
@@ -374,7 +380,8 @@
(global-set-key (kbd "C-x v C-=") #'vc-ediff)
(with-eval-after-load 'vc-git
- (csetq vc-git-print-log-follow t))
+ (csetq vc-git-print-log-follow t
+ vc-git-show-stash 0))
(csetq ediff-window-setup-function 'ediff-setup-windows-plain
ediff-split-window-function 'split-window-horizontally)