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

Clean up

Browse source
This commit is contained in:
Henrik Lissner 2015-10-06 20:27:18 -04:00
parent 714738bfc8
commit 50d6de0600
8 changed files with 39 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Cask
View file

@ -10,6 +10,7 @@
(depends-on "use-package")
(depends-on "popwin")
(depends-on "help-fns+")
(depends-on "esup")
;; OSX --- core/core-os-osx.el
(depends-on "exec-path-from-shell")
@ -147,10 +148,10 @@
(depends-on "cmake-mode")
(depends-on "glsl-mode")
;; Org
;; (depends-on "org-plus-contrib")
;; (depends-on "org-opml" :git "https://github.com/edavis/org-opml")
;; (depends-on "org-bullets")
;; (depends-on "org-tree-slide")
(depends-on "org-plus-contrib")
(depends-on "org-opml" :git "https://github.com/edavis/org-opml")
(depends-on "org-bullets")
;;(depends-on "org-tree-slide")
;; Rust
(depends-on "rust-mode")
(depends-on "company-racer")
@ -161,8 +162,5 @@
(depends-on "vimrc-mode")
(depends-on "crystal-mode" :git "https://github.com/jpellerin/emacs-crystal-mode/")
;; (depends-on "haxe-mode")
;; (depends-on "d-mode")
;; (depends-on "shaderlab-mode" :git "https://bitbucket.org/bbbscarter/emacs-shaderlab-mode")
(depends-on "unityjs-mode" :git "https://github.com/naruse/EmacsUnityScript")

1
core/core-company.el
View file

@ -24,7 +24,6 @@
company-echo-metadata-frontend
company-preview-if-just-one-frontend)
company-dict-dir (concat narf-private-dir "dict/"))
;; (add-hook! after-init 'global-company-mode)
:config
;; (use-package company-dict :defer t)
;; (setq-default company-backends (append '(company-dict company-keywords) company-backends))

17
core/core-editor.el
View file

@ -92,7 +92,7 @@ enable multiple minor modes for the same regexp.")
;; (global-whitespace-mode 1) ; Show whitespace
(global-font-lock-mode t) ; Enable syntax highlighting for older emacs
(global-auto-revert-mode -1) ; revert buffers for changed files
(global-auto-revert-mode 1) ; revert buffers for changed files
(electric-indent-mode -1)
;; window config undo/redo
@ -105,12 +105,14 @@ enable multiple minor modes for the same regexp.")
(use-package undo-tree
:defer t
:diminish undo-tree-mode
:config
;; Shut up undo-tree's constant complaining: http://youtu.be/Z6woIRLnbmE
(defadvice undo-tree-load-history-hook (around undo-tree-load-history-shut-up activate)
(shut-up! ad-do-it))
(defadvice undo-tree-save-history-hook (around undo-tree-save-history-shut-up activate)
(shut-up! ad-do-it)))
;; (defadvice undo-tree-load-history-hook (around undo-tree-load-history-shut-up activate)
;; (shut-up! ad-do-it))
;; (defadvice undo-tree-save-history-hook (around undo-tree-save-history-shut-up activate)
;; (shut-up! ad-do-it))
)
(use-package avy
:commands (avy-goto-char-2 avy-goto-line)
@ -168,8 +170,7 @@ enable multiple minor modes for the same regexp.")
:diminish smartparens-mode
:functions sp-insert-pair
:config
(setq blink-matching-paren t
sp-autowrap-region nil ; let evil-surround handle this
(setq sp-autowrap-region nil ; let evil-surround handle this
sp-highlight-pair-overlay nil
sp-autoescape-string-quote nil
sp-show-pair-delay 0)
@ -216,7 +217,7 @@ enable multiple minor modes for the same regexp.")
(use-package smex
:commands (smex smex-major-mode-commands smex-initialize smex-update)
:init (setq smex-save-file (! (concat narf-temp-dir "smex-items")))
:init (setq smex-save-file (concat narf-temp-dir "smex-items"))
:config (smex-initialize)
;; Hook up smex to auto-update, rather than update on every run
(defun smex-update-after-load (unused)

5
core/core-evil.el
View file

@ -44,7 +44,7 @@
(progn ; evil hacks
(defadvice evil-force-normal-state (before evil-esc-quit activate)
(ignore-errors
(popwin:close-popup-window) ; close popups, if any
(popwin:close-popup-window) ; close popups, if any
(evil-ex-nohighlight)
;; Exit minibuffer if alive
(if (minibuffer-window-active-p (minibuffer-window))
@ -112,10 +112,12 @@
evil-jumper-auto-save-interval 3600))
(use-package evil-matchit
:defer 1
:commands (evilmi-jump-items global-evil-matchit-mode)
:config (global-evil-matchit-mode 1))
(use-package evil-easymotion
:defer 1
:config
(evilem-default-keybindings "g SPC")
(evilem-define (kbd "g SPC n") 'evil-ex-search-next)
@ -162,6 +164,7 @@
(evil-snipe-override-mode 1))
(use-package evil-space
:defer 1
:diminish (evil-space-mode . "_")
:init (setq evil-space-auto-setup nil)
:config

2
core/core-vars.el
View file

@ -8,8 +8,6 @@
;; Buffers/Files ;;;;;;;;;;;;;;;;;;;;;;;
(defconst narf--splash-buffer-name "*narf*")
(defvar narf-unreal-buffers '("^ ?\\*.+\\*"
image-mode
dired-mode

52
core/core.el
View file

@ -49,11 +49,11 @@
;; In case I want to reactivate backup files
make-backup-files nil
create-lockfiles nil
backup-directory-alist `((".*" . ,(! (concat narf-temp-dir "backup/"))))
backup-directory-alist `((".*" . ,(concat narf-temp-dir "backup/")))
;; Remember undo history
undo-tree-auto-save-history t
undo-tree-history-directory-alist `(("." . ,(! (concat narf-temp-dir "undo/")))))
undo-tree-history-directory-alist `(("." . ,(concat narf-temp-dir "undo/"))))
;;; UTF-8 please
(setq locale-coding-system 'utf-8) ; pretty
@ -73,15 +73,11 @@
(require 'core-defuns)
(require 'diminish)
;; NARF!
(define-minor-mode narf-mode "Narf, yoink, poit."
:global t :init-value t :keymap (make-sparse-keymap))
(eval-when-compile
(defvar use-package-verbose narf-debug-mode)
(require 'dash)
(require 'use-package)
(require 'defuns-use-package)
(setq use-package-verbose narf-debug-mode)
;; Make any folders needed
(dolist (file '("" "undo" "backup"))
@ -90,31 +86,27 @@
(make-directory path t)))))
;; Save history across sessions
(use-package savehist
:config
(setq savehist-file (! (concat narf-temp-dir "savehist"))
savehist-additional-variables
'(kill-ring global-mark-ring search-ring regexp-search-ring extended-command-history))
(savehist-mode 1))
(require 'savehist)
(setq savehist-file (concat narf-temp-dir "savehist")
savehist-additional-variables
'(kill-ring global-mark-ring search-ring regexp-search-ring extended-command-history))
(savehist-mode 1)
(use-package recentf
:config
(setq recentf-save-file (! (concat narf-temp-dir "recentf"))
recentf-exclude '("/tmp/" "/ssh:" "\\.?ido\\.last$" "\\.revive$" "/TAGS$"
"emacs\\.d/private/cache/.+" "emacs\\.d/workgroups/.+$" "wg-default"
"/company-statistics-cache.el$")
recentf-max-menu-items 0
recentf-max-saved-items 250
recentf-auto-cleanup 600)
(recentf-mode 1))
(require 'recentf)
(setq recentf-save-file (concat narf-temp-dir "recentf")
recentf-exclude '("/tmp/" "/ssh:" "\\.?ido\\.last$" "\\.revive$" "/TAGS$"
"emacs\\.d/private/cache/.+" "emacs\\.d/workgroups/.+$" "wg-default"
"/company-statistics-cache.el$")
recentf-max-menu-items 0
recentf-max-saved-items 250
recentf-auto-cleanup 600)
(recentf-mode 1)
(use-package popwin :config (popwin-mode 1))
;; Save cursor location across sessions. Only save for files that exist.
(use-package saveplace
:defer t
:config (setq save-place-file (! (concat narf-temp-dir "saveplace")))
:config (setq save-place-file (concat narf-temp-dir "saveplace"))
:init
;; Save cursor location across sessions. Only save for files that exist.
(add-hook! find-file
(if (file-exists-p (buffer-file-name))
(require 'saveplace)
@ -124,12 +116,10 @@
:commands (describe-buffer describe-command describe-file
describe-keymap describe-option describe-option-of-type))
(add-hook! after-init
(defun narf-init ()
(defadvice save-buffers-kill-emacs (around no-query-kill-emacs activate)
"Prevent annoying \"Active processes exist\" query when you quit Emacs."
(flet ((process-list ())) ad-do-it)))
(defun narf-init ()
(flet ((process-list ())) ad-do-it))
(defun display-startup-echo-area-message ()
(message ">>> Loaded in %s" (emacs-init-time)))
(require 'server)

8
core/lib/macros-buffers.el
View file

@ -1,8 +0,0 @@
;;; defuns-buffers.el
;;;###autoload
(defun add-unreal-buffer! (regexp)
(add-to-list 'narf-unreal-buffers regexp))
(provide 'defuns-buffers)
;;; defuns-buffers.el ends here

13
core/lib/macros-popwin.el
View file

@ -1,13 +0,0 @@
;;; macros-popwin.el
;;;###autoload
(defmacro add-popwin-rule! (&rest forms)
"Register a rule for popwin. See `popwin:special-display-config'.
Example:
(add-popwin-rule! \"^\\*Flycheck.*\\*$\" :regexp t :position bottom :height 0.25 :noselect t)"
(declare (indent defun))
`(push '(,@forms) popwin:special-display-config))
(provide 'macros-popwin)
;;; macros-popwin.el ends here