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

General cleanup

Browse source
This commit is contained in:
Henrik Lissner 2016-05-07 22:05:00 -04:00
parent 0434b79fd3
commit 96f9d1dd44
4 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bootstrap.el
View file

@ -68,20 +68,11 @@
(append (list (expand-file-name "themes/" narf-private-dir)) (append (list (expand-file-name "themes/" narf-private-dir))
custom-theme-load-path)) custom-theme-load-path))
(require 'f) ;; Local settings
(require 'dash) (load "~/.emacs.local.el" t t)
(require 's)
;; Load local settings, if available
(when (file-exists-p "~/.emacs.local.el")
(load "~/.emacs.local.el"))
;; Global settings
(setq narf-current-theme narf-default-theme (setq narf-current-theme narf-default-theme
narf-current-font narf-default-font) narf-current-font narf-default-font)
;; Here we a'go!
;; Load 'em up!
(load-theme narf-current-theme t)
(mapc 'require packages))) (mapc 'require packages)))
;;; bootstrap.el ends here ;;; bootstrap.el ends here

9
core/core-editor.el
View file

@ -215,11 +215,10 @@ enable multiple minor modes for the same regexp.")
(setq hs-set-up-overlay (setq hs-set-up-overlay
(lambda (ov) (lambda (ov)
(when (eq 'code (overlay-get ov 'hs)) (when (eq 'code (overlay-get ov 'hs))
(let* ((marker-string "*fringe-dummy*") (let ((marker-string "*")
(marker-length (length marker-string)) (display-string (format " ... " (count-lines (overlay-start ov)
(display-string (format " ... " (count-lines (overlay-start ov) (overlay-end ov)))))
(overlay-end ov))))) (put-text-property 0 1 'display
(put-text-property 0 marker-length 'display
(list 'right-fringe 'hs-marker 'hs-fringe-face) marker-string) (list 'right-fringe 'hs-marker 'hs-fringe-face) marker-string)
(put-text-property 0 (length display-string) 'face 'hs-face display-string) (put-text-property 0 (length display-string) 'face 'hs-face display-string)
(overlay-put ov 'before-string marker-string) (overlay-put ov 'before-string marker-string)

12
core/core-flycheck.el
View file

@ -15,13 +15,13 @@
(byte-compile-file path))) (byte-compile-file path)))
(map! :map flycheck-error-list-mode-map (map! :map flycheck-error-list-mode-map
:n "C-n" 'flycheck-error-list-next-error :n "C-n" 'flycheck-error-list-next-error
:n "C-p" 'flycheck-error-list-previous-error :n "C-p" 'flycheck-error-list-previous-error
:n "j" 'flycheck-error-list-next-error :n "j" 'flycheck-error-list-next-error
:n "k" 'flycheck-error-list-previous-error :n "k" 'flycheck-error-list-previous-error
:n "RET" 'flycheck-error-list-goto-error) :n "RET" 'flycheck-error-list-goto-error)
;; And on ESC in normal mode. ;; Flycheck buffer on ESC in normal mode.
(advice-add 'evil-force-normal-state :after 'narf*flycheck-buffer) (advice-add 'evil-force-normal-state :after 'narf*flycheck-buffer)
(define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow (define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow

16
core/core-sessions.el
View file

@ -36,20 +36,20 @@ automatically renamed to the project name.")
wg-restore-margins nil wg-restore-margins nil
wg-restore-point-max t ; Throws silent errors if non-nil wg-restore-point-max t ; Throws silent errors if non-nil
wg-list-display-decor-divider " " wg-list-display-decor-divider " "
wg-list-display-decor-left-brace "" wg-list-display-decor-left-brace ""
wg-list-display-decor-right-brace "| " wg-list-display-decor-right-brace "| "
wg-list-display-decor-current-left "" wg-list-display-decor-current-left ""
wg-list-display-decor-current-right "" wg-list-display-decor-current-right ""
wg-list-display-decor-previous-left "" wg-list-display-decor-previous-left ""
wg-list-display-decor-previous-right "") wg-list-display-decor-previous-right "")
(add-hook 'emacs-startup-hook 'workgroups-mode) (add-hook 'emacs-startup-hook 'workgroups-mode)
:config :config
(unless (file-exists-p wg-workgroup-directory) (unless (file-exists-p wg-workgroup-directory)
(mkdir wg-workgroup-directory)) (mkdir wg-workgroup-directory))
;; Remember the set names in between sessions ;; Remember fixed workgroup names between sessions
(push 'narf-wg-names savehist-additional-variables) (push 'narf-wg-names savehist-additional-variables)
;; `wg-mode-line-display-on' wasn't enough ;; `wg-mode-line-display-on' wasn't enough