ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean use-package directives

This commit is contained in:
petrucci4prez 2018-07-15 00:04:47 -04:00
parent c5edb38141
commit 716cebbf30
2 changed files with 128 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
conf.el
View File

@ -51,21 +51,6 @@
(setq my:theme-window-loaded t) (setq my:theme-window-loaded t)
(setq my:theme-terminal-loaded t)))) (setq my:theme-terminal-loaded t))))
(use-package spaceline
:ensure t
:config
(require 'spaceline-config)
(setq powerline-default-separator (quote arrow))
(spaceline-spacemacs-theme)
(setq spaceline-buffer-size-p nil))
;; (use-package dashboard
;; :ensure t
;; :config
;; (dashboard-setup-startup-hook)
;; (setq dashboard-banner-logo-title "Emacs"))
;; (setq dashboard-items '((recents . 10))))
(use-package delight (use-package delight
:ensure t) :ensure t)
@ -86,45 +71,44 @@
:delight :delight
:init :init
(helm-mode 1) (helm-mode 1)
:custom
(helm-autoresize-max-height 0)
(helm-autoresize-max-height 40)
(helm-M-x-fuzzy-match t)
(helm-buffers-fuzzy-matching t)
(helm-recentf-fuzzy-match t)
(helm-semantic-fuzzy-match t)
(helm-imenu-fuzzy-match t)
(helm-scroll-amount 8)
:config :config
(setq helm-autoresize-max-height 0
helm-autoresize-max-height 40
helm-M-x-fuzzy-match t
helm-buffers-fuzzy-matching t
helm-recentf-fuzzy-match t
helm-semantic-fuzzy-match t
helm-imenu-fuzzy-match t
helm-scroll-amount 8)
;; I liked the way ido-veritcal worked
;; less invasive...
(add-to-list 'display-buffer-alist (add-to-list 'display-buffer-alist
`(,(rx bos "*helm" (* not-newline) "*" eos) `(,(rx bos "*helm" (* not-newline) "*" eos)
(display-buffer-in-side-window) (display-buffer-in-side-window)
(inhibit-same-window . t) (inhibit-same-window . t)
(window-height . 0.4)))) (window-height . 0.4)))
(helm-autoresize-mode 1) (helm-autoresize-mode 1)
(require 'helm-config) (require 'helm-config))
(use-package rainbow-delimiters (use-package rainbow-delimiters
:ensure t :ensure t
:delight :delight
:init :hook
(add-hook 'prog-mode-hook #'rainbow-delimiters-mode) ((prog-mode . rainbow-delimiters-mode)
(add-hook 'inferior-ess-mode-hook #'rainbow-delimiters-mode) (inferior-ess-mode . rainbow-delimiters-mode)
(add-hook 'ess-mode-hook #'rainbow-delimiters-mode)) (ess-mode . rainbow-delimiters-mode)))
(use-package ace-window (use-package ace-window
:ensure t :ensure t
:config :custom
(setq aw-background t) (aw-background t)
:custom-face :custom-face
(aw-leading-char-face ((t (:foreground "#292b2e" :background "#bc6ec5":height 1.0 :box nil))))) (aw-leading-char-face ((t (:foreground "#292b2e" :background "#bc6ec5":height 1.0 :box nil)))))
(use-package avy (use-package avy
:ensure t :ensure t
:config (setq avy-background t)) :custom
(avy-background t))
(use-package sudo-edit (use-package sudo-edit
:ensure t) :ensure t)
@ -140,20 +124,31 @@
(use-package undo-tree (use-package undo-tree
:ensure t :ensure t
:delight :delight
:custom
(undo-tree-visualizer-diff t)
:config :config
(global-undo-tree-mode) (global-undo-tree-mode))
(setq undo-tree-visualizer-diff t))
(use-package fill-column-indicator (use-package fill-column-indicator
:ensure t :ensure t
:init :init
:config :custom
(setq fci-rule-use-dashes t) (fci-rule-use-dashes t)
(add-hook 'prog-mode-hook #'fci-mode)) :hook
(prog-mode . fci-mode))
(use-package rainbow-mode (use-package rainbow-mode
:ensure t) :ensure t)
(use-package spaceline
:ensure t
:custom
(powerline-default-separator 'arrow)
(spaceline-buffer-size-p nil)
:config
(require 'spaceline-config)
(spaceline-spacemacs-theme))
;; lovingly stolen from aaron harris ;; lovingly stolen from aaron harris
(defmacro nd/with-advice (adlist &rest body) (defmacro nd/with-advice (adlist &rest body)
"Execute BODY with temporary advice in ADLIST. "Execute BODY with temporary advice in ADLIST.
@ -215,10 +210,11 @@ event of an error or nonlocal exit."
(use-package haskell-mode (use-package haskell-mode
:ensure t :ensure t
:config :custom
;; enable dynamic linking by default (haskell-compile-command
(setq haskell-compile-command "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s") "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s"
(setq haskell-interactive-popup-errors nil)) "enable dynamic linking by default")
(haskell-interactive-popup-errors nil))
(setq org-startup-indented t) (setq org-startup-indented t)
(delight 'org-indent-mode) (delight 'org-indent-mode)
@ -236,8 +232,8 @@ event of an error or nonlocal exit."
(use-package org-bullets (use-package org-bullets
:ensure t :ensure t
:config :hook
(add-hook 'org-mode-hook (lambda () (org-bullets-mode)))) (org-mode . org-bullets-mode))
(defun nd/org-ui-heading-same-font-height () (defun nd/org-ui-heading-same-font-height ()
(let ((heading-height 1.15)) (let ((heading-height 1.15))
@ -1201,16 +1197,16 @@ and reverts all todo keywords to TODO"
(org-remove-empty-drawer-at (point))))) (org-remove-empty-drawer-at (point)))))
(use-package calfw-org (use-package calfw-org
:init
:ensure t :ensure t
:config (setq cfw:fchar-junction ?╋ :custom
cfw:fchar-vertical-line ?┃ (cfw:fchar-junction ?╋)
cfw:fchar-horizontal-line ?━ (cfw:fchar-vertical-line ?┃)
cfw:fchar-left-junction ?┣ (cfw:fchar-horizontal-line ?━)
cfw:fchar-right-junction ?┫ (cfw:fchar-left-junction ?┣)
cfw:fchar-top-junction ?┯ (cfw:fchar-right-junction ?┫)
cfw:fchar-top-left-corner ?┏ (cfw:fchar-top-junction ?┯)
cfw:fchar-top-right-corner ?┓)) (cfw:fchar-top-left-corner ?┏)
(cfw:fchar-top-right-corner ?┓))
(require 'mu4e) (require 'mu4e)
(setq mail-user-agent 'mu4e-user-agent (setq mail-user-agent 'mu4e-user-agent

158
conf.org
View File

@ -85,48 +85,29 @@ NOTE: this only works if we start term after gui, and term has light bg. not big
(setq my:theme-window-loaded t) (setq my:theme-window-loaded t)
(setq my:theme-terminal-loaded t)))) (setq my:theme-terminal-loaded t))))
#+END_SRC #+END_SRC
* modeline
#+BEGIN_SRC emacs-lisp
(use-package spaceline
:ensure t
:config
(require 'spaceline-config)
(setq powerline-default-separator (quote arrow))
(spaceline-spacemacs-theme)
(setq spaceline-buffer-size-p nil))
#+END_SRC
** dashboard
#+BEGIN_SRC emacs-lisp
;; (use-package dashboard
;; :ensure t
;; :config
;; (dashboard-setup-startup-hook)
;; (setq dashboard-banner-logo-title "Emacs"))
;; (setq dashboard-items '((recents . 10))))
#+END_SRC
* printing * printing
** **
* packages * packages
** delight ** delight
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package delight (use-package delight
:ensure t) :ensure t)
#+END_SRC #+END_SRC
** beacon ** beacon
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package beacon (use-package beacon
:ensure t :ensure t
:delight :delight
:init :init
(beacon-mode 1)) (beacon-mode 1))
#+END_SRC #+END_SRC
** whichkey ** whichkey
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package which-key (use-package which-key
:ensure t :ensure t
:delight :delight
:init :init
(which-key-mode)) (which-key-mode))
#+END_SRC #+END_SRC
** helm ** helm
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -135,43 +116,41 @@ NOTE: this only works if we start term after gui, and term has light bg. not big
:delight :delight
:init :init
(helm-mode 1) (helm-mode 1)
:custom
(helm-autoresize-max-height 0)
(helm-autoresize-max-height 40)
(helm-M-x-fuzzy-match t)
(helm-buffers-fuzzy-matching t)
(helm-recentf-fuzzy-match t)
(helm-semantic-fuzzy-match t)
(helm-imenu-fuzzy-match t)
(helm-scroll-amount 8)
:config :config
(setq helm-autoresize-max-height 0
helm-autoresize-max-height 40
helm-M-x-fuzzy-match t
helm-buffers-fuzzy-matching t
helm-recentf-fuzzy-match t
helm-semantic-fuzzy-match t
helm-imenu-fuzzy-match t
helm-scroll-amount 8)
;; I liked the way ido-veritcal worked
;; less invasive...
(add-to-list 'display-buffer-alist (add-to-list 'display-buffer-alist
`(,(rx bos "*helm" (* not-newline) "*" eos) `(,(rx bos "*helm" (* not-newline) "*" eos)
(display-buffer-in-side-window) (display-buffer-in-side-window)
(inhibit-same-window . t) (inhibit-same-window . t)
(window-height . 0.4)))) (window-height . 0.4)))
(helm-autoresize-mode 1) (helm-autoresize-mode 1)
(require 'helm-config) (require 'helm-config))
#+END_SRC #+END_SRC
** rainbow-delimiters ** rainbow-delimiters
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package rainbow-delimiters (use-package rainbow-delimiters
:ensure t :ensure t
:delight :delight
:init :hook
(add-hook 'prog-mode-hook #'rainbow-delimiters-mode) ((prog-mode . rainbow-delimiters-mode)
(add-hook 'inferior-ess-mode-hook #'rainbow-delimiters-mode) (inferior-ess-mode . rainbow-delimiters-mode)
(add-hook 'ess-mode-hook #'rainbow-delimiters-mode)) (ess-mode . rainbow-delimiters-mode)))
#+END_SRC #+END_SRC
** ace-window ** ace-window
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package ace-window (use-package ace-window
:ensure t :ensure t
:config :custom
(setq aw-background t) (aw-background t)
:custom-face :custom-face
(aw-leading-char-face ((t (:foreground "#292b2e" :background "#bc6ec5":height 1.0 :box nil))))) (aw-leading-char-face ((t (:foreground "#292b2e" :background "#bc6ec5":height 1.0 :box nil)))))
#+END_SRC #+END_SRC
@ -179,7 +158,8 @@ NOTE: this only works if we start term after gui, and term has light bg. not big
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package avy (use-package avy
:ensure t :ensure t
:config (setq avy-background t)) :custom
(avy-background t))
#+END_SRC #+END_SRC
** sudo edit ** sudo edit
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -200,27 +180,40 @@ NOTE: this only works if we start term after gui, and term has light bg. not big
#+END_SRC #+END_SRC
** undo tree ** undo tree
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package undo-tree (use-package undo-tree
:ensure t :ensure t
:delight :delight
:config :custom
(global-undo-tree-mode) (undo-tree-visualizer-diff t)
(setq undo-tree-visualizer-diff t)) :config
(global-undo-tree-mode))
#+END_SRC #+END_SRC
** fill-column-indicator ** fill-column-indicator
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package fill-column-indicator (use-package fill-column-indicator
:ensure t :ensure t
:init :init
:config :custom
(setq fci-rule-use-dashes t) (fci-rule-use-dashes t)
(add-hook 'prog-mode-hook #'fci-mode)) :hook
(prog-mode . fci-mode))
#+END_SRC #+END_SRC
** rainbow ** rainbow
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package rainbow-mode (use-package rainbow-mode
:ensure t) :ensure t)
#+END_SRC #+END_SRC
** spaceline
#+BEGIN_SRC emacs-lisp
(use-package spaceline
:ensure t
:custom
(powerline-default-separator 'arrow)
(spaceline-buffer-size-p nil)
:config
(require 'spaceline-config)
(spaceline-spacemacs-theme))
#+END_SRC
* library * library
A place for duct tape code that I developed (or lovingly stole from others) A place for duct tape code that I developed (or lovingly stole from others)
** macros ** macros
@ -292,7 +285,7 @@ event of an error or nonlocal exit."
#+END_SRC #+END_SRC
* languages * languages
** python ** python
#+BEGIN_SRC #+BEGIN_SRC
(elpy-enable) (elpy-enable)
;; make python tabs 4 chars ;; make python tabs 4 chars
@ -307,10 +300,11 @@ event of an error or nonlocal exit."
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package haskell-mode (use-package haskell-mode
:ensure t :ensure t
:config :custom
;; enable dynamic linking by default (haskell-compile-command
(setq haskell-compile-command "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s") "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s"
(setq haskell-interactive-popup-errors nil)) "enable dynamic linking by default")
(haskell-interactive-popup-errors nil))
#+END_SRC #+END_SRC
* org-mode * org-mode
** basic ** basic
@ -338,8 +332,8 @@ event of an error or nonlocal exit."
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package org-bullets (use-package org-bullets
:ensure t :ensure t
:config :hook
(add-hook 'org-mode-hook (lambda () (org-bullets-mode)))) (org-mode . org-bullets-mode))
#+END_SRC #+END_SRC
*** font height *** font height
The fonts in org headings bug me, make them smaller and less invasive The fonts in org headings bug me, make them smaller and less invasive
@ -1476,17 +1470,17 @@ and reverts all todo keywords to TODO"
#+END_SRC #+END_SRC
** calfw ** calfw
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package calfw-org (use-package calfw-org
:init :ensure t
:ensure t :custom
:config (setq cfw:fchar-junction ?╋ (cfw:fchar-junction ?╋)
cfw:fchar-vertical-line ?┃ (cfw:fchar-vertical-line ?┃)
cfw:fchar-horizontal-line ?━ (cfw:fchar-horizontal-line ?━)
cfw:fchar-left-junction ?┣ (cfw:fchar-left-junction ?┣)
cfw:fchar-right-junction ?┫ (cfw:fchar-right-junction ?┫)
cfw:fchar-top-junction ?┯ (cfw:fchar-top-junction ?┯)
cfw:fchar-top-left-corner ?┏ (cfw:fchar-top-left-corner ?┏)
cfw:fchar-top-right-corner ?┓)) (cfw:fchar-top-right-corner ?┓))
#+END_SRC #+END_SRC
* mu4e * mu4e
only for gmail now only for gmail now