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

Final *final* update :P

Browse source
This commit is contained in:
Henrik Lissner 2015-06-06 06:38:16 -04:00
parent 5506ba122e
commit de70863bed
11 changed files with 162 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

32
core/autoloads.el
View file

@ -164,7 +164,7 @@ Rotate word at point based on sets in `rotate-text-rotations'.
;;;***
;;;### (autoloads nil "defuns-buffers" "defuns-buffers.el" (21869
;;;;;; 35086 0 0))
;;;;;; 43589 0 0))
;;; Generated autoloads from defuns-buffers.el
(autoload 'narf:narrow-to-region-indirect "defuns-buffers" "\
@ -240,7 +240,7 @@ Kill buffer (but only bury scratch buffer)
;;;***
;;;### (autoloads nil "defuns-code" "defuns-code.el" (21869 24069
;;;### (autoloads nil "defuns-code" "defuns-code.el" (21871 23781
;;;;;; 0 0))
;;; Generated autoloads from defuns-code.el
@ -283,7 +283,7 @@ Tells you the name of the face (point) is on.
;;;***
;;;### (autoloads nil "defuns-edit" "defuns-edit.el" (21866 40579
;;;### (autoloads nil "defuns-edit" "defuns-edit.el" (21869 43444
;;;;;; 0 0))
;;; Generated autoloads from defuns-edit.el
@ -317,7 +317,7 @@ Link with anchor
;;;***
;;;### (autoloads nil "defuns-extern" "defuns-extern.el" (21866 18425
;;;### (autoloads nil "defuns-extern" "defuns-extern.el" (21869 43359
;;;;;; 0 0))
;;; Generated autoloads from defuns-extern.el
@ -351,7 +351,7 @@ Select the current block of text between blank lines.
;;;***
;;;### (autoloads nil "defuns-org" "defuns-org.el" (21866 45401 0
;;;### (autoloads nil "defuns-org" "defuns-org.el" (21869 43512 0
;;;;;; 0))
;;; Generated autoloads from defuns-org.el
@ -389,7 +389,7 @@ Inserts a new heading or item, depending on the context.
;;;***
;;;### (autoloads nil "defuns-search" "defuns-search.el" (21866 51196
;;;### (autoloads nil "defuns-search" "defuns-search.el" (21869 45131
;;;;;; 0 0))
;;; Generated autoloads from defuns-search.el
@ -506,19 +506,19 @@ spaces on either side of the point if so. Resorts to
;;;;;; "../contrib/ruby-mode-indent-fix.el" "../contrib/shaderlab-mode.el"
;;;;;; "../contrib/unityjs-mode.el" "../init/autoloads.el" "../init/init-auto-insert.el"
;;;;;; "../init/init-cc.el" "../init/init-cscope.el" "../init/init-csharp.el"
;;;;;; "../init/init-eshell.el" "../init/init-fly.el" "../init/init-go.el"
;;;;;; "../init/init-helm.el" "../init/init-ido.el" "../init/init-java.el"
;;;;;; "../init/init-js.el" "../init/init-lisp.el" "../init/init-lua.el"
;;;;;; "../init/init-org.el" "../init/init-php.el" "../init/init-project.el"
;;;;;; "../init/init-python.el" "../init/init-r.el" "../init/init-regex.el"
;;;;;; "../init/init-ruby.el" "../init/init-rust.el" "../init/init-scss.el"
;;;;;; "../init/init-sh.el" "../init/init-swift.el" "../init/init-text.el"
;;;;;; "../init/init-vc.el" "../init/init-vim.el" "../init/init-web.el"
;;;;;; "../init/init-workgroups.el" "../init/init-yasnippet.el"
;;;;;; "../init/init-data.el" "../init/init-eshell.el" "../init/init-fly.el"
;;;;;; "../init/init-go.el" "../init/init-helm.el" "../init/init-ido.el"
;;;;;; "../init/init-java.el" "../init/init-js.el" "../init/init-lisp.el"
;;;;;; "../init/init-lua.el" "../init/init-org.el" "../init/init-php.el"
;;;;;; "../init/init-project.el" "../init/init-python.el" "../init/init-r.el"
;;;;;; "../init/init-regex.el" "../init/init-ruby.el" "../init/init-rust.el"
;;;;;; "../init/init-scss.el" "../init/init-sh.el" "../init/init-swift.el"
;;;;;; "../init/init-text.el" "../init/init-vc.el" "../init/init-vim.el"
;;;;;; "../init/init-web.el" "../init/init-workgroups.el" "../init/init-yasnippet.el"
;;;;;; "../init/narf-bindings.el" "../init/narf-commands.el" "../init/narf-settings.el"
;;;;;; "benchmark.el" "core-company.el" "core-editor.el" "core-evil.el"
;;;;;; "core-linux.el" "core-osx.el" "core-splash.el" "core-ui.el"
;;;;;; "core.el" "defuns.el" "startup.el") (21869 35551 604587 0))
;;;;;; "core.el" "defuns.el" "startup.el") (21873 3804 549513 0))
;;;***

10
core/core-editor.el
View file

@ -33,11 +33,11 @@
(after "isearch" (diminish 'isearch-mode))
;; Fix code folding
(defun narf|init-hs-minor-mode-maybe ()
(unless (bound-and-true-p hs-minor-mode)
(hs-minor-mode 1)
(diminish 'hs-minor-mode)))
(add-hook 'prog-mode-hook 'narf|init-hs-minor-mode-maybe)
;; (defun narf|init-hs-minor-mode-maybe ()
;; (unless (bound-and-true-p hs-minor-mode)
;; (hs-minor-mode 1)
;; (diminish 'hs-minor-mode)))
;; (add-hook 'prog-mode-hook 'narf|init-hs-minor-mode-maybe)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

75
core/core-evil.el
View file

@ -34,7 +34,6 @@
(interactive "P")
(if count (hs-hide-level count) (evil-close-folds))))
(evil-select-search-module 'evil-search-module 'evil-search)
(setq evil-magic t
evil-want-C-u-scroll t ; enable C-u for scrolling
evil-ex-visual-char-range t ; column range for ex commands
@ -50,8 +49,9 @@
evil-visual-state-cursor '("white" hollow)
evil-iedit-state-cursor '("orange" box))
(add-to-list 'evil-overriding-maps 'narf-mode-map)
(add-to-list 'evil-overriding-maps '(narf-mode-map))
(evil-mode 1)
(evil-select-search-module 'evil-search-module 'evil-search)
(defadvice evil-ex-hl-do-update-highlight (around evil-ex-hl-shut-up activate)
(ignore-errors ad-do-it))
@ -98,10 +98,11 @@
"za" 'iedit-toggle-unmatched-lines-visible
visual "SPC" (λ (if (iedit-current-occurrence-string)
(progn
(let ((current-prefix-arg '(4)))
(iedit-done)
(call-interactively 'iedit-mode)
(save-excursion (iedit-restrict-region (region-beginning) (region-end)))
(evil-previous-line)
(evil-iedit-state/iedit-mode))
(evil-previous-line))
(call-interactively 'evil-ret))))))
@ -185,70 +186,54 @@
(use-package evil-visualstar
:commands (global-evil-visualstar-mode
evil-visualstar/begin-search
evil-visualstar/begin-search-forward
evil-visualstar/begin-search-backward)
:config
(progn
;; I cut this down because the original visualstar wouldn't remember
;; the last search if evil-search-module was 'evil-search.
(defun narf/evil-visualstar/begin-search (beg end direction)
(when (evil-visual-state-p)
(evil-exit-visual-state)
(let ((selection (regexp-quote (buffer-substring-no-properties beg end))))
(setq isearch-forward direction)
(evil-search selection direction t))))
(advice-add 'evil-visualstar/begin-search :override 'narf/evil-visualstar/begin-search)
(global-evil-visualstar-mode 1)))
(global-evil-visualstar-mode 1))
(use-package evil-snipe
:diminish evil-snipe-mode
:init
(setq evil-snipe-smart-case t
evil-snipe-scope 'line
evil-snipe-repeat-scope 'buffer
evil-snipe-symbol-groups '((?\[ "[[{(]")
(?\] "[]})]")))
:config
(progn
(setq evil-snipe-smart-case t
evil-snipe-scope 'line
evil-snipe-repeat-scope 'buffer
evil-snipe-override-evil-repeat-keys nil)
(setq-default evil-snipe-symbol-groups
'((?\[ "[[{(]")
(?\] "[]})]")))
(evil-snipe-mode 1)
(evil-snipe-override-mode 1)))
(evil-snipe-override-mode 1)
(bind motion :map evil-snipe-mode-map
"C-;" 'evil-snipe-repeat
"C-," 'evil-snipe-repeat-reverse)))
(use-package evil-space
:disabled t
:diminish (evil-space-mode . "_")
:config
(progn
(add-to-list 'evil-overriding-maps 'evil-space-mode-map)
(evil-space-mode 1)
(evil-space-setup "/" "n" "N")
(evil-space-setup "?" "N" "n")
(evil-space-setup "?" "n" "N")
(after "evil-snipe"
(evil-space-setup evil-snipe-f evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-F evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-t evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-T evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-s evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-S evil-snipe-repeat evil-snipe-repeat-reverse))
(after "evil-numbers"
(let ((map (evil-get-auxiliary-keymap narf-mode-map 'normal)))
(evil-space-setup "g=" "g=" "g-" map)
(evil-space-setup "g-" "g-" "g=" map)))
(after "evil-snipe"
(let ((map (evil-get-auxiliary-keymap evil-snipe-override-mode-map 'motion)))
(evil-space-setup "t" "C-;" "C-," map)
(evil-space-setup "f" "C-;" "C-," map)
(evil-space-setup "T" "C-," "C-;" map)
(evil-space-setup "F" "C-," "C-;" map))
(let ((map (evil-get-auxiliary-keymap evil-snipe-mode-map 'motion)))
(evil-space-setup "s" "C-;" "C-," map)
(evil-space-setup "S" "C-," "C-;" map)))
(after "evil-visualstar"
(let ((map (evil-get-auxiliary-keymap evil-visualstar-mode-map 'visual)))
(message "VISUALSTAR")
(evil-space-setup "*" "n" "N" map)
(evil-space-setup "#" "n" "N" map)))
(evil-space-mode))))
(evil-space-setup "*" "*" "#" map)
(evil-space-setup "#" "#" "*" map))))))
(progn ; evil hacks
(defadvice evil-force-normal-state (before evil-esc-quit activate)

2
core/defuns-code.el
View file

@ -51,7 +51,7 @@ If ARG is nil this function calls `recompile', otherwise it calls
(insert out)
(beginning-of-buffer)
(read-only-mode 1)
(popwin:popup-buffer buf :height lines))))))
(popwin:popup-buffer buf :height (if (> lines 25) 25 (1+ lines))))))))
(t (quickrun-region beg end))))
;;;###autoload (autoload 'narf::eval-buffer "defuns-code")

2
core/defuns.el
View file

@ -58,7 +58,7 @@
(defmacro add-hook! (hook &rest body)
"A shortcut macro for `add-hook' that auto-wraps `body' in a lambda"
(declare (indent defun))
(declare (indent 1))
`(add-hook ,hook (lambda() ,@body)))
;; Keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;

8
core/startup.el
View file

@ -14,11 +14,11 @@
(defmacro narf/init-load-path ()
"Collect and verify `load-path'. Compile me!"
(let (paths '())
(dolist (dir (append (directory-files CONTRIB-DIR t "^[^.]" t)
(directory-files ELPA-DIR t "^[^.]" t)))
(dolist (dir (append (directory-files ELPA-DIR t "^[^.]" t)
(directory-files CONTRIB-DIR t "^[^.]" t)))
(when (file-directory-p dir)
(push dir paths)))
`(setq load-path ',(append (list CORE-DIR MODULES-DIR CONTRIB-DIR)
`(setq load-path ',(append (list CORE-DIR CONTRIB-DIR MODULES-DIR)
(if (listp load-path) load-path (list load-path))
paths))))
@ -32,7 +32,7 @@
(setq custom-theme-directory THEMES-DIR)
(setq use-package-verbose DEBUG-MODE)
(setq use-package-expand-minimally (not DEBUG-MODE))
;;(setq use-package-expand-minimally (not DEBUG-MODE))
(eval-when-compile (require 'use-package))
(require 'diminish)