Skip to content

Commit

Permalink
Clean: Dump user-config/eric-only into personal layer local pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
ekaschalk committed Nov 7, 2018
1 parent 26c7ae4 commit 4d20939
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 25 deletions.
20 changes: 0 additions & 20 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
;; Configure `redo-bindings?' to true if you - want my aggressive rebindings.
;;
;; `init.el' sets spacemacs up, defining required `dotspacemacs/..' funcs & vars.
;; `outline-minor-mode' and extension `outshine-mode' will help with navigation.

;;;; Constants

Expand Down Expand Up @@ -122,7 +121,6 @@ Check `dotspacemacs/get-variable-string-list' for all vars you can configure."
"Configuration that cannot be delegated to layers."
(dotspacemacs/user-config/toggles)
(dotspacemacs/user-config/post-layer-load-config)
(dotspacemacs/user-config/eric-only)
(dotspacemacs/user-config/experiments))

;;;;; Toggles
Expand Down Expand Up @@ -156,24 +154,6 @@ Check `dotspacemacs/get-variable-string-list' for all vars you can configure."
(when mac?
(add-to-list 'default-frame-alist '(fullscreen . fullboth)))))

;;;;; Personal

(defun dotspacemacs/user-config/eric-only ()
"Personal configuration updates and experiments."
(when eric?
;; Emacs-anywhere defaults to org-mode rather than markdown-mode
(add-hook 'ea-popup-hook (lambda (&rest args) (org-mode)))

;; Hy-mode development
;; (load-file "~/dev/hy-mode/hy-mode.el")
;; (load-file "~/dev/hy-mode/hy-personal.el")
;; (require 'hy-mode)
;; (require 'hy-personal)

;; Emacs-core development
;; (setq find-function-C-source-directory "~/dev/emacs-dev/src")
))

;;;;; Experiments

(defun dotspacemacs/user-config/experiments ()
Expand Down
2 changes: 0 additions & 2 deletions layers/config/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,6 @@

;; Rebindings todo
;; spacemacs/kill-this-buffer
;; winner-undo
;; winner-redo

;; Free chords to look at
;; M-u, M-i
Expand Down
18 changes: 18 additions & 0 deletions layers/personal/local/personal/personal.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
;; Dumping ground for stuff only relevant to me

(require 'macros)

(provide 'personal)


;; Emacs-anywhere defaults to org-mode rather than markdown-mode
(add-hook 'ea-popup-hook (lambda (&rest args) (org-mode)))

;; Hy-mode development
;; (load-file "~/dev/hy-mode/hy-mode.el")
;; (load-file "~/dev/hy-mode/hy-personal.el")
;; (require 'hy-mode)
;; (require 'hy-personal)

;; Emacs-core development
;; (setq find-function-C-source-directory "~/dev/emacs-dev/src")
13 changes: 10 additions & 3 deletions layers/personal/packages.el
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
;;; Personal Layer

(setq personal-packages
'((blog :location local)
(outline-ivy :location local)))
'((blog :location local)
(outline-ivy :location local)
(personal :location local)))

;;; Blog

Expand All @@ -11,7 +12,7 @@
:after macros
:if (executable-find "hugo")
:init (progn
(setq blog-dir '("~/dev/blog"))
(setq blog-dir '("~/dev/blog"))
(setq blog-public-dir '("~/dev/public-blog"))
(spacemacs/set-leader-keys
"ab" 'blog-deploy
Expand All @@ -24,3 +25,9 @@
(use-package outline-ivy
:after ivy outshine macros
:init (global-set-key (kbd "C-j") 'oi-jump)))

;;; Personal

(defun personal/init-personal ()
(use-package personal
:if eric?))

0 comments on commit 4d20939

Please sign in to comment.