wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

[Emacs] Updates for new versions of straight and use-package

Browse Source
This commit is contained in:
Kat Huang 2017-12-14 13:57:26 -08:00
parent 7e4cd192bc
commit ee6cceb7d9
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
dotfiles/emacs.d/README.org
View File

@ -133,7 +133,7 @@ file uses lexical scoping.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package auto-compile (use-package auto-compile
:demand t :demand t
:ensure t :straight t
:config :config
(progn (progn
(auto-compile-on-load-mode) (auto-compile-on-load-mode)
@ -352,7 +352,7 @@ but provide support for writing custom elisp.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package gh (use-package gh
:defer t :defer t
:recipe (gh :type git :host github :repo "IvanMalison/gh.el")) :straight (gh :type git :host github :repo "IvanMalison/gh.el"))
#+END_SRC #+END_SRC
*** shut-up *** shut-up
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -369,7 +369,7 @@ but provide support for writing custom elisp.
*** emit *** emit
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package emit (use-package emit
:recipe (emit :type git :host github :repo "IvanMalison/emit")) :straight (emit :type git :host github :repo "IvanMalison/emit"))
#+END_SRC #+END_SRC
*** request *** request
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -1695,7 +1695,7 @@ I use helm for almost all emacs completion
#+BEGIN_SRC emacs-lisp -n -r #+BEGIN_SRC emacs-lisp -n -r
(use-package helm-config (use-package helm-config
:demand t :demand t
:ensure helm :straight helm
:bind (("M-y" . helm-show-kill-ring) :bind (("M-y" . helm-show-kill-ring)
("M-x" . helm-M-x) ("M-x" . helm-M-x)
("C-x C-i" . helm-imenu) ("C-x C-i" . helm-imenu)
@ -1706,7 +1706,7 @@ I use helm for almost all emacs completion
(progn (progn
(setq helm-split-window-default-side 'same) (setq helm-split-window-default-side 'same)
(use-package helm-org (use-package helm-org
:ensure nil :straight nil
:defer 10 :defer 10
:config :config
(progn (progn
@ -2527,28 +2527,29 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
(match-end 1) "∈"))))))) (match-end 1) "∈")))))))
#+END_SRC #+END_SRC
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package clojure-mode (use-package clojure-mode
:commands clojure-mode :commands clojure-mode
:preface :preface
(progn (progn
(add-to-list 'magic-mode-alist '("#!.*boot\\s-*$" . clojure-mode)) (add-to-list 'magic-mode-alist '("#!.*boot\\s-*$" . clojure-mode))
(add-to-list 'auto-mode-alist '("\\.boot\\'" . clojure-mode)) (add-to-list 'auto-mode-alist '("\\.boot\\'" . clojure-mode))
(defun imalison:clojure-mode-hook () (defun imalison:clojure-mode-hook ()
;; (cljr-add-keybindings-with-prefix "C-c C-m") ;; (cljr-add-keybindings-with-prefix "C-c C-m")
(clj-refactor-mode 1) ;; This is disabled because seq-25 can't be loaded
;;for adding require/use/import statements ;; (clj-refactor-mode 1)
(yas-minor-mode 1)) ;;for adding require/use/import statements
(yas-minor-mode 1))
(defvar imalison:clojure-level-1-symobls (defvar imalison:clojure-level-1-symobls
'(describe it))) '(describe it)))
:config :config
(progn (progn
(cl-loop for symbol in imalison:clojure-level-1-symobls (cl-loop for symbol in imalison:clojure-level-1-symobls
do (put-clojure-indent symbol 1)) do (put-clojure-indent symbol 1))
(add-hook 'clojure-mode-hook 'imalison:clojure-mode-hook) (add-hook 'clojure-mode-hook 'imalison:clojure-mode-hook)
(dolist (m '(clojure-mode clojurescript-mode clojurec-mode clojurex-mode)) (dolist (m '(clojure-mode clojurescript-mode clojurec-mode clojurex-mode))
(imalison:clojure-fancify-symbols m)))) (imalison:clojure-fancify-symbols m))))
#+END_SRC #+END_SRC
**** cider **** cider
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -3286,7 +3287,7 @@ separately. This means that I need to load this file in init.el.
**** Disable yasnippet in org-mode **** Disable yasnippet in org-mode
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package org (use-package org
:ensure nil :straight nil
:config :config
(progn (progn
(defun imalison:disable-yas () (defun imalison:disable-yas ()
@ -3344,7 +3345,7 @@ This function replaces the default naming scheme with a call to
#+BEGIN_SRC emacs-lisp :tangle org-config.el #+BEGIN_SRC emacs-lisp :tangle org-config.el
(use-package ox (use-package ox
:defer t :defer t
:ensure nil :straight nil
:config :config
(defun org-export-get-reference (datum info) (defun org-export-get-reference (datum info)
"Return a unique reference for DATUM, as a string. "Return a unique reference for DATUM, as a string.
@ -3372,7 +3373,7 @@ alphanumeric characters only."
#+BEGIN_SRC emacs-lisp :tangle org-config.el #+BEGIN_SRC emacs-lisp :tangle org-config.el
(use-package ox-html (use-package ox-html
:commands (org-html-export-as-html org-html-export-as-html) :commands (org-html-export-as-html org-html-export-as-html)
:ensure nil :straight nil
:preface :preface
(progn (progn
(defvar imalison:link-svg-html (defvar imalison:link-svg-html
@ -3404,7 +3405,7 @@ alphanumeric characters only."
#+BEGIN_SRC emacs-lisp :tangle org-config.el #+BEGIN_SRC emacs-lisp :tangle org-config.el
(use-package ox-html (use-package ox-html
:defer t :defer t
:ensure nil :straight nil
:config :config
(setq org-html-inline-image-rules (setq org-html-inline-image-rules
'(("file" . "\\.\\(jpeg\\|jpg\\|png\\|gif\\|svg\\)\\(\\?.*?\\)?\\'") '(("file" . "\\.\\(jpeg\\|jpg\\|png\\|gif\\|svg\\)\\(\\?.*?\\)?\\'")
@ -3534,7 +3535,7 @@ alphanumeric characters only."
*** TeX *** TeX
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package tex (use-package tex
:ensure auctex :straight auctex
:commands TeX-mode :commands TeX-mode
:preface :preface
(progn (progn
@ -3556,7 +3557,7 @@ alphanumeric characters only."
**** latex **** latex
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package latex (use-package latex
:ensure auctex :straight auctex
:after tex :after tex
:config :config
(progn (progn
@ -3870,7 +3871,7 @@ in term-mode. This makes term-mode 1000% more useful
:config :config
(progn (progn
(use-package helm-ring (use-package helm-ring
:ensure nil :straight nil
:defer 1 :defer 1
:config :config
(progn (progn
@ -4228,7 +4229,7 @@ I have currently disabled key-chord because it may cause typing lag.
** calc-mode ** calc-mode
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package calc-mode (use-package calc-mode
:ensure nil :straight nil
:commands calc :commands calc
:config :config
(progn (progn
@ -4321,7 +4322,7 @@ Not really sure what this is
(s-trim (shell-command-to-string "mu4e_directory")))) (s-trim (shell-command-to-string "mu4e_directory"))))
(use-package mu4e (use-package mu4e
:load-path mu4e-elisp-directory :load-path mu4e-elisp-directory
:ensure nil :straight nil
:commands (mu4e mu4e-view-message-with-msgid mu4e-update-index email) :commands (mu4e mu4e-view-message-with-msgid mu4e-update-index email)
:bind ("C-c 0" . email) :bind ("C-c 0" . email)
:config :config
@ -4754,7 +4755,7 @@ Ensure all themes that I use are installed:
*** config *** config
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package spaceline-config (use-package spaceline-config
:ensure spaceline :straight spaceline
:commands spaceline-compile :commands spaceline-compile
:preface :preface
(progn (progn

8
dotfiles/emacs.d/init.el
View File

@ -10,11 +10,13 @@
(eval-print-last-sexp))) (eval-print-last-sexp)))
(load bootstrap-file nil 'nomessage)) (load bootstrap-file nil 'nomessage))
(setq straight-vc-git-default-protocol 'ssh) (setq package-enable-at-startup nil
straight-use-package-by-default t
straight-vc-git-default-protocol 'ssh)
(straight-use-package 'use-package) (straight-use-package 'use-package)
(require 'use-package) (require 'use-package)
(setq use-package-enable-imenu-support t (setq use-package-enable-imenu-support t)
use-package-always-ensure t) (setq use-package-ensure-function 'straight-use-package-ensure-function)
(defvar imalison:do-benchmark nil) (defvar imalison:do-benchmark nil)