From 10dcc2ae6f06027636347690a4f4b83a33dcdf54 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Thu, 28 Mar 2019 00:14:34 +0100 Subject: Emacs: Bootstrap use-package via package.el --- .gitmodules | 3 --- dot.emacs.d/elisp/use-package | 1 - dot.emacs.d/init.el | 8 +++++--- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 160000 dot.emacs.d/elisp/use-package diff --git a/.gitmodules b/.gitmodules index 9a1bc98..d1be526 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "dot.vim/bundle/cisco.vim"] path = dot.vim/bundle/cisco.vim url = git://github.com/momota/cisco.vim -[submodule "dot.emacs.d/elisp/use-package"] - path = dot.emacs.d/elisp/use-package - url = git://github.com/jwiegley/use-package [submodule "dot.emacs.d/elisp/git-commit-mode"] path = dot.emacs.d/elisp/git-commit-mode url = git://github.com/rafl/git-commit-mode diff --git a/dot.emacs.d/elisp/use-package b/dot.emacs.d/elisp/use-package deleted file mode 160000 index 82d1596..0000000 --- a/dot.emacs.d/elisp/use-package +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82d15961a0f2dc7842a98030d6daee0061ef63dc diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index da13a27..3764f86 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -1,8 +1,12 @@ -(package-initialize) (require 'package) +(setq package-enable-at-startup nil) (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("gnu" . "https://elpa.gnu.org/packages/"))) +(package-initialize) +(unless (package-installed-p 'use-package) + (package-refresh-contents) + (package-install 'use-package)) (defvar --backup-directory (concat user-emacs-directory "backups")) (if (not (file-exists-p --backup-directory)) @@ -26,8 +30,6 @@ (normal-top-level-add-to-load-path '(".")) (normal-top-level-add-subdirs-to-load-path)) -(require 'use-package) - (load "server") (unless (server-running-p) (server-start)) -- cgit v1.2.3