diff options
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index f1076672..777b6f95 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -32,24 +32,11 @@ the buffer to be empty. ** Use-package #+BEGIN_SRC emacs-lisp - (let ((trustfile - (replace-regexp-in-string - "\\\\" "/" - (replace-regexp-in-string - "\n" "" - (shell-command-to-string "python -m certifi"))))) - (setq tls-checktrust t - tls-program - (list - (format "gnutls-cli%s --x509cafile %s -p %%p %%h" - (if (eq window-system 'w32) ".exe" "") trustfile))) - (setq gnutls-verify-error t) - (setq gnutls-trustfiles (list trustfile))) (eval-and-compile - (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/") - ("marmalade" . "https://marmalade-repo.org/packages/") - ("melpa" . "https://melpa.org/packages/") - ("melpa-stable" . "https://stable.melpa.org/packages/")) + (setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/") + ("marmalade" . "http://marmalade-repo.org/packages/") + ("melpa-stable" . "http://stable.melpa.org/packages/") + ("melpa" . "http://melpa.org/packages/")) package-user-dir (concat "~/.emacs.d/packages/" emacs-version "/elpa")) (package-initialize) (unless (package-installed-p 'use-package) @@ -57,7 +44,9 @@ the buffer to be empty. (package-install 'use-package)) (require 'use-package)) (setq use-package-verbose t - use-package-ensure-always-ensure t) + use-package-always-ensure t) + (use-package benchmark-init + :config (benchmark-init/activate)) #+END_SRC * Customize @@ -209,7 +198,8 @@ in the past. I often find it useful when I remember writing something a particular way, but it changed later. #+BEGIN_SRC emacs-lisp - (use-package git-timemachine) + (use-package git-timemachine + :commands git-timemachine) #+END_SRC * Styles @@ -1229,6 +1219,9 @@ don’t use it directly. #+BEGIN_SRC emacs-lisp (use-package smex + :commands (smex + smex-update + smex-initialize) :config (progn (setq smex-key-advice-ignore-menu-bar t smex-auto-update nil) @@ -1628,6 +1621,7 @@ Go has a few packages to inter-operate with other emacs packages. #+BEGIN_SRC emacs-lisp (use-package company-go + :commands company-go :config (progn (setq company-go-show-annotation t)) :init (progn @@ -1637,6 +1631,7 @@ Go has a few packages to inter-operate with other emacs packages. (add-hook 'go-mode-hook #'ap/company-go-setup))) (use-package go-eldoc + :commands go-eldoc-setup :init (progn (add-hook 'go-mode-hook #'go-eldoc-setup))) @@ -1992,6 +1987,7 @@ good for embedded SQL though. #+BEGIN_SRC emacs-lisp (use-package mmm-auto :ensure mmm-mode + :defer 20 :config (progn (mmm-add-classes '((php-sql @@ -2408,9 +2404,10 @@ the =org=-document after changes. Start a server if possible. A daemon is already a server. #+BEGIN_SRC emacs-lisp -(unless (daemonp) - (require 'server) - (if (server-running-p server-name) - (message "Server already appears to be running") - (server-start))) + (unless (daemonp) + (require 'server) + (if (server-running-p server-name) + (message "Server already appears to be running") + (server-start))) + (benchmark-init/deactivate) #+END_SRC |