solarized-emacs

commit b69d823bdb436a10eaacaf97a4d981b176445008
parent 1659e8d4484b4f293ad9c6a4b0e27634494a8ea0
Author: Thomas Frössman <thomasf@jossystem.se>
Date:   Thu,  9 Jan 2020 18:09:26 +0100

quicker to use dev-emacs.d functions in outside configs

I now have this in my own init.d to load these features on demand.

(defun solarized-dev ()
  (interactive)
  (add-to-list 'load-path (expand-file-name "~/src/github.com/bbatsov/solarized-emacs/dev-emacs.d/lisp/"))
  (require 'solarized-dev)
  (dev-setup-paths (expand-file-name "~/src/github.com/bbatsov/solarized-emacs/dev-emacs.d/"))
  (dev-cycle-main-themes))

Diffstat:
M
dev-emacs.d/init.el
 | 
37
++++++++++++++++---------------------
M
dev-emacs.d/lisp/solarized-dev-keys.el
 | 
6
+++---
M
dev-emacs.d/lisp/solarized-dev.el
 | 
15
++++++++++++++-

3 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/dev-emacs.d/init.el b/dev-emacs.d/init.el
@@ -27,6 +27,20 @@
 
 (require 'subr-x)
 
+(when load-file-name
+  (add-to-list 'load-path
+               (expand-file-name
+                "lisp"
+                (file-name-as-directory
+                 (file-name-directory load-file-name)))))
+
+(require 'solarized-dev)
+(require 'solarized-dev-keys)
+
+(when load-file-name
+  (dev-setup-paths (file-name-as-directory
+                    (file-name-directory load-file-name))))
+
 (defun dev-debug-make-frame ()
   ;; debug-on-entry on make-frame does not work
   (define-advice make-frame (:around (fn &rest args) suppress)
@@ -38,22 +52,7 @@
 ;; (toggle-debug-on-error)
 
 
-(when load-file-name
-  (let* ((init-dir (file-name-as-directory (file-name-directory load-file-name)))
-         (elisp-dir (expand-file-name ".." init-dir))
-         (childtheme-dir (expand-file-name "../child-theme-example" init-dir))
-         (dev-lisp-dir (expand-file-name "lisp" init-dir))
-         (childtheme-themes-dir (expand-file-name "themes" childtheme-dir)))
-
-    (defvar dev-project-root elisp-dir)
-
-    (add-to-list 'load-path elisp-dir)
-    (add-to-list 'load-path childtheme-dir)
-    (add-to-list 'load-path dev-lisp-dir)
-    (setq custom-theme-load-path (list elisp-dir childtheme-themes-dir)
-          package-user-dir (expand-file-name "elpa" init-dir)
-          package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
-                             ("melpa" . "https://melpa.org/packages/")))))
+
 (defun dev-open-merge()
   (interactive)
   (find-file (expand-file-name "dev-emacs.d/test-repo/" dev-project-root)))
@@ -83,7 +82,7 @@
 
 (setq auto-mode-alist
       (append '(("\\.webmode\\'" . web-mode))
-       auto-mode-alist))
+              auto-mode-alist))
 
 (when load-file-name
   (smartparens-global-mode)
@@ -102,10 +101,6 @@
  projectile-switch-project-action 'projectile-dired
  projectile-verbose nil)
 
-
-(require 'solarized-dev)
-(require 'solarized-dev-keys)
-
 (dev-set-solarized-settings)
 
 (when load-file-name
diff --git a/dev-emacs.d/lisp/solarized-dev-keys.el b/dev-emacs.d/lisp/solarized-dev-keys.el
@@ -1,10 +1,10 @@
 (require 'solarized-dev)
 
-(global-set-key (kbd "<f6>") 'dev-cycle-main-themes)
-(global-set-key (kbd "<f8>") 'load-theme)
-(global-set-key (kbd "<f7>") 'dev-cycle-themes)
 (global-set-key (kbd "<f4>") 'dev-disable-all-themes)
 (global-set-key (kbd "<f5>") 'dev-reload-theme)
+(global-set-key (kbd "<f6>") 'dev-cycle-main-themes)
+(global-set-key (kbd "<f7>") 'dev-cycle-themes)
+(global-set-key (kbd "<f8>") 'load-theme)
 (global-set-key (kbd "<f9>") ' dev-switch-buffer-solarized)
 (global-set-key (kbd "<f10>") 'dev-switch-buffer-current-theme)
 (global-set-key (kbd "<f11>") 'dev-tf-switch-buffer-next)
diff --git a/dev-emacs.d/lisp/solarized-dev.el b/dev-emacs.d/lisp/solarized-dev.el
@@ -23,7 +23,20 @@
    ;; end
    ))
 
-
+(defun dev-setup-paths (dev-init-dir)
+  (let* ((init-dir dev-init-dir)
+         (elisp-dir (expand-file-name ".." init-dir))
+         (childtheme-dir (expand-file-name "../child-theme-example" init-dir))
+         (dev-lisp-dir (expand-file-name "lisp" init-dir))
+         (childtheme-themes-dir (expand-file-name "themes" childtheme-dir)))
+    (defvar dev-project-root elisp-dir)
+    (add-to-list 'load-path elisp-dir)
+    (add-to-list 'load-path childtheme-dir)
+    (add-to-list 'load-path dev-lisp-dir)
+    (setq custom-theme-load-path (list elisp-dir childtheme-themes-dir)
+          package-user-dir (expand-file-name "elpa" init-dir)
+          package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
+                             ("melpa" . "https://melpa.org/packages/")))))
 (defun dev-themes ()
   "get list of all themes"
   (let ((themes nil))