emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

General refactor & cleanup

Browse source
This commit is contained in:
Henrik Lissner 2017-09-02 16:39:51 +02:00
parent 20fd0e6778
commit d28c64b4fa
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
6 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/completion/ivy/config.el
View file

@ -25,7 +25,8 @@ session)."
;; ;;
(def-package! ivy (def-package! ivy
:demand t :commands ivy-mode
:init (add-hook 'doom-init-hook #'ivy-mode)
:config :config
(setq ivy-height 12 (setq ivy-height 12
ivy-do-completion-in-region nil ivy-do-completion-in-region nil
@ -43,8 +44,6 @@ session)."
(after! magit (setq magit-completing-read-function #'ivy-completing-read)) (after! magit (setq magit-completing-read-function #'ivy-completing-read))
(after! yasnippet (push #'+ivy-yas-prompt yas-prompt-functions)) (after! yasnippet (push #'+ivy-yas-prompt yas-prompt-functions))
(add-hook 'doom-init-hook #'ivy-mode)
(map! :map ivy-mode-map (map! :map ivy-mode-map
[remap apropos] #'counsel-apropos [remap apropos] #'counsel-apropos
[remap describe-face] #'counsel-describe-face [remap describe-face] #'counsel-describe-face

2
modules/feature/workspaces/config.el
View file

@ -10,7 +10,7 @@
;; load the last autosaved session. You can give sessions a custom name so they ;; load the last autosaved session. You can give sessions a custom name so they
;; can be loaded later. ;; can be loaded later.
;; ;;
;; FYI persp-mode requires `workgroups' for file persistence in Emacs 24.4. ;; NOTE persp-mode requires `workgroups' for file persistence in Emacs 24.4.
(defvar +workspaces-main "main" (defvar +workspaces-main "main"
"The name of the primary and initial workspace, which cannot be deleted or "The name of the primary and initial workspace, which cannot be deleted or

2
modules/lang/cc/config.el
View file

@ -76,7 +76,7 @@
(c-set-offset 'inclass #'+cc--c-lineup-inclass) (c-set-offset 'inclass #'+cc--c-lineup-inclass)
;; Certain mappings interfere with smartparens and custom bindings, ;; Certain electric mappings interfere with smartparens and custom bindings,
;; so unbind them ;; so unbind them
(map! :map c-mode-map (map! :map c-mode-map
"DEL" nil "DEL" nil

5
modules/lang/javascript/config.el
View file

@ -119,8 +119,9 @@
(set! :electric 'rjsx-mode :chars '(?\} ?\) ?. ?>)) (set! :electric 'rjsx-mode :chars '(?\} ?\) ?. ?>))
;; disable electric keys (I use snippets and `emmet-mode' instead) ;; disable electric keys (I use snippets and `emmet-mode' instead)
(define-key rjsx-mode-map "<" nil) (map! :map rjsx-mode-map
(define-key rjsx-mode-map (kbd "C-d") nil) "<" nil
"C-d" nil)
(add-hook! rjsx-mode (add-hook! rjsx-mode
;; jshint doesn't really know how to deal with jsx ;; jshint doesn't really know how to deal with jsx
(push 'javascript-jshint flycheck-disabled-checkers))) (push 'javascript-jshint flycheck-disabled-checkers)))

4
modules/lang/markdown/config.el
View file

@ -1,9 +1,9 @@
;;; lang/markdown/config.el -*- lexical-binding: t; -*- ;;; lang/markdown/config.el -*- lexical-binding: t; -*-
(def-package! markdown-mode (def-package! markdown-mode
:mode ("/README\\.md$" . gfm-mode)
:mode "\\.m\\(d\\|arkdown\\)$"
:mode "/README$" :mode "/README$"
:mode "\\.m\\(d\\|arkdown\\)$"
:mode ("/README\\.md$" . gfm-mode)
:init :init
(setq markdown-enable-wiki-links t (setq markdown-enable-wiki-links t
markdown-enable-math t markdown-enable-math t

7
modules/private/hlissner/config.el
View file

@ -4,11 +4,8 @@
(load! +bindings) ; my key bindings (load! +bindings) ; my key bindings
(load! +commands)) ; my custom ex commands (load! +commands)) ; my custom ex commands
(defvar +hlissner-dir (defvar +hlissner-dir (file-name-directory load-file-name))
(file-name-directory load-file-name)) (defvar +hlissner-snippets-dir (expand-file-name "snippets/" +hlissner-dir))
(defvar +hlissner-snippets-dir
(expand-file-name "snippets/" +hlissner-dir))
(setq epa-file-encrypt-to user-mail-address (setq epa-file-encrypt-to user-mail-address
auth-sources (list (expand-file-name ".authinfo.gpg" +hlissner-dir))) auth-sources (list (expand-file-name ".authinfo.gpg" +hlissner-dir)))