add conditionals around non-universal / personal config to allow day job config to be built
This commit is contained in:
parent
9046f48acc
commit
80a7dc502e
11
code/init.el
11
code/init.el
|
@ -66,7 +66,12 @@
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; additional packages
|
; additional packages
|
||||||
(add-to-list 'package-selected-packages
|
(add-to-list 'package-selected-packages
|
||||||
'(centaur-tabs auctex-latexmk auctex json-mode python-mode powershell rust-mode origami go-mode yaml-mode dockerfile-mode lua-mode)
|
'(centaur-tabs json-mode python-mode powershell rust-mode origami go-mode yaml-mode lua-mode)
|
||||||
|
)
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
|
(add-to-list 'package-selected-packages
|
||||||
|
'(auctex-latexmk auctex dockerfile-mode)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
@ -112,8 +117,10 @@
|
||||||
(setq lua-indent-level 4)
|
(setq lua-indent-level 4)
|
||||||
|
|
||||||
; dockerfile
|
; dockerfile
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(autoload 'dockerfile-mode "dockerfile-mode" "Dockerfile editing mode." t)
|
(autoload 'dockerfile-mode "dockerfile-mode" "Dockerfile editing mode." t)
|
||||||
(add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode))
|
(add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode))
|
||||||
|
)
|
||||||
|
|
||||||
; yaml
|
; yaml
|
||||||
(autoload 'yaml-mode "yaml-mode" "YAML editing mode." t)
|
(autoload 'yaml-mode "yaml-mode" "YAML editing mode." t)
|
||||||
|
@ -146,10 +153,12 @@
|
||||||
(add-to-list 'auto-mode-alist '("\\.ps1\\'" . powershell))
|
(add-to-list 'auto-mode-alist '("\\.ps1\\'" . powershell))
|
||||||
|
|
||||||
; [la]tex
|
; [la]tex
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(use-package tex
|
(use-package tex
|
||||||
:ensure auctex)
|
:ensure auctex)
|
||||||
(setq TeX-parse-self t)
|
(setq TeX-parse-self t)
|
||||||
(setq-default TeX-master nil)
|
(setq-default TeX-master nil)
|
||||||
|
)
|
||||||
|
|
||||||
; python
|
; python
|
||||||
(autoload 'python-mode "python-mode" "python editing mode" t)
|
(autoload 'python-mode "python-mode" "python editing mode" t)
|
||||||
|
|
|
@ -2,13 +2,23 @@
|
||||||
; start emacs server (daemon) via real client so org-mode and other 'workspaces' can be setup as faux daemonized emacs
|
; start emacs server (daemon) via real client so org-mode and other 'workspaces' can be setup as faux daemonized emacs
|
||||||
; (server-start)
|
; (server-start)
|
||||||
|
|
||||||
|
;; critical built in for tuning startup
|
||||||
|
(setq kmn/is-dayjob
|
||||||
|
(string= "PCE" (getenv "USERDOMAIN"))
|
||||||
|
)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; Packages related
|
; Packages related
|
||||||
(require 'package)
|
(require 'package)
|
||||||
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) ; this goes in chemacs2 init -- DO NOT UNCOMMENT
|
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) ; this goes in chemacs2 init -- DO NOT UNCOMMENT
|
||||||
(package-initialize) ; this goes in chemacs2 init -- DO NOT UNCOMMENT
|
(package-initialize) ; this goes in chemacs2 init -- DO NOT UNCOMMENT
|
||||||
(add-to-list 'package-selected-packages
|
(add-to-list 'package-selected-packages
|
||||||
'(scratch persistent-scratch persp-mode rainbow-mode rainbow-delimiters markdown-mode devdocs devdocs-browser focus zoom popwin dired-single diredfl xclip doominhibitinhibit-modeline magit helpful helm helm-org helm-ls-git dired-rainbow dired-rainbow-listing dired-single dash s origami modus-themes use-package)
|
'(scratch persistent-scratch persp-mode rainbow-mode rainbow-delimiters markdown-mode focus zoom popwin dired-single diredfl xclip doominhibitinhibit-modeline helpful helm helm-org dired-rainbow dired-rainbow-listing dired-single dash s origami modus-themes use-package)
|
||||||
|
)
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
|
(add-to-list 'package-selected-packages
|
||||||
|
'(devdocs devdocs-browser magit helm-ls-git)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
(require 'use-package)
|
(require 'use-package)
|
||||||
|
|
||||||
|
@ -17,11 +27,7 @@
|
||||||
(setq kmn/is-termux
|
(setq kmn/is-termux
|
||||||
(string-suffix-p "Android" (string-trim (shell-command-to-string "uname -a"))))
|
(string-suffix-p "Android" (string-trim (shell-command-to-string "uname -a"))))
|
||||||
|
|
||||||
(setq kmn/dayjob-search-string "pce")
|
|
||||||
(setq kmn/is-dayjob
|
|
||||||
(compare-strings kmn/dayjob-search-string nil nil (getenv "USERDOMAIN") nil nil t)
|
|
||||||
)
|
|
||||||
|
|
||||||
; ensure elisp plugins are compiled
|
; ensure elisp plugins are compiled
|
||||||
(require 'dash)
|
(require 'dash)
|
||||||
(require 'f)
|
(require 'f)
|
||||||
|
@ -137,6 +143,7 @@
|
||||||
("\\.markdown\\'" . markdown-mode))
|
("\\.markdown\\'" . markdown-mode))
|
||||||
:init (setq markdown-command "multimarkdown"))
|
:init (setq markdown-command "multimarkdown"))
|
||||||
|
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(use-package markdown-preview-mode
|
(use-package markdown-preview-mode
|
||||||
:ensure t
|
:ensure t
|
||||||
:if (boundp 'mdcommand)
|
:if (boundp 'mdcommand)
|
||||||
|
@ -148,7 +155,7 @@
|
||||||
(markdown-preview-host "127.0.0.1")
|
(markdown-preview-host "127.0.0.1")
|
||||||
(markdown-preview-http-host "127.0.0.1"))
|
(markdown-preview-http-host "127.0.0.1"))
|
||||||
(setq markdown-preview-stylesheets (list "https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/3.0.1/github-markdown.min.css"))
|
(setq markdown-preview-stylesheets (list "https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/3.0.1/github-markdown.min.css"))
|
||||||
|
)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; origami config
|
; origami config
|
||||||
|
@ -396,6 +403,7 @@
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; flyspell
|
; flyspell
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(require 'flyspell)
|
(require 'flyspell)
|
||||||
(setenv "LANG" "en_US")
|
(setenv "LANG" "en_US")
|
||||||
(setq ispell-program-name "hunspell")
|
(setq ispell-program-name "hunspell")
|
||||||
|
@ -441,6 +449,7 @@
|
||||||
; flyspell keyboard shortcuts
|
; flyspell keyboard shortcuts
|
||||||
(global-set-key (kbd "C-x y") 'flyspell-toggle)
|
(global-set-key (kbd "C-x y") 'flyspell-toggle)
|
||||||
(global-set-key (kbd "C-x w") 'flyspell-correct-wrapper)
|
(global-set-key (kbd "C-x w") 'flyspell-correct-wrapper)
|
||||||
|
)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; zoom (replaces golden-ratio)
|
; zoom (replaces golden-ratio)
|
||||||
|
@ -467,6 +476,7 @@
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; devdocs
|
; devdocs
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(require 'devdocs)
|
(require 'devdocs)
|
||||||
(require 'devdocs-browser)
|
(require 'devdocs-browser)
|
||||||
; devdocs
|
; devdocs
|
||||||
|
@ -475,6 +485,7 @@
|
||||||
; devdocs-browser
|
; devdocs-browser
|
||||||
(setq devdocs-browser-cache-directory "~/devdocs-browser")
|
(setq devdocs-browser-cache-directory "~/devdocs-browser")
|
||||||
(global-set-key (kbd "C-x n") 'devdocs-browser-open)
|
(global-set-key (kbd "C-x n") 'devdocs-browser-open)
|
||||||
|
)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; tabs-bar
|
; tabs-bar
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
)
|
)
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; org-mode workspace
|
; org-mode workspace
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(defun kmn/workspace-org ()
|
(defun kmn/workspace-org ()
|
||||||
(interactive)
|
(interactive)
|
||||||
; start with fresh frame
|
; start with fresh frame
|
||||||
|
@ -49,9 +50,11 @@
|
||||||
(next-multiframe-window)
|
(next-multiframe-window)
|
||||||
(goto-char 0)
|
(goto-char 0)
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; org-mode workspace for termux devices (mobile / android)
|
; org-mode workspace for termux devices (mobile / android)
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(defun kmn/workspace-org-single-window ()
|
(defun kmn/workspace-org-single-window ()
|
||||||
(interactive)
|
(interactive)
|
||||||
; start with fresh frame
|
; start with fresh frame
|
||||||
|
@ -70,6 +73,7 @@
|
||||||
; start at the top of the agenda
|
; start at the top of the agenda
|
||||||
(goto-char 0)
|
(goto-char 0)
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; empty code workspace
|
; empty code workspace
|
||||||
|
|
|
@ -80,6 +80,7 @@
|
||||||
)
|
)
|
||||||
|
|
||||||
(setq org-agenda-file-regexp "\\`[^.].*\\.org\\'")
|
(setq org-agenda-file-regexp "\\`[^.].*\\.org\\'")
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(setq org-agenda-files (list
|
(setq org-agenda-files (list
|
||||||
"~/org/health/_health.org"
|
"~/org/health/_health.org"
|
||||||
"~/org/health/health_houdini.org"
|
"~/org/health/health_houdini.org"
|
||||||
|
@ -88,10 +89,12 @@
|
||||||
"~/org/orgzly/_todo.org"
|
"~/org/orgzly/_todo.org"
|
||||||
"~/org/orgzly/_slipbox.org"
|
"~/org/orgzly/_slipbox.org"
|
||||||
))
|
))
|
||||||
|
)
|
||||||
|
|
||||||
(require 'org-super-agenda)
|
(require 'org-super-agenda)
|
||||||
(org-super-agenda-mode)
|
(org-super-agenda-mode)
|
||||||
|
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(setq org-super-agenda-groups
|
(setq org-super-agenda-groups
|
||||||
'(
|
'(
|
||||||
(:name "Health"
|
(:name "Health"
|
||||||
|
@ -182,3 +185,4 @@
|
||||||
("o" . "Photography")
|
("o" . "Photography")
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
(concat prefix (org-time-stamp nil))))
|
(concat prefix (org-time-stamp nil))))
|
||||||
|
|
||||||
; orgmode capture templates
|
; orgmode capture templates
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(setq org-capture-templates '(
|
(setq org-capture-templates '(
|
||||||
("d" "TODO (Main)" entry
|
("d" "TODO (Main)" entry
|
||||||
(file "~/org/orgzly/_todo.org")
|
(file "~/org/orgzly/_todo.org")
|
||||||
|
@ -166,3 +167,4 @@
|
||||||
:empty-lines-before 1
|
:empty-lines-before 1
|
||||||
)
|
)
|
||||||
))
|
))
|
||||||
|
)
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
(setq org-habit-graph-column 75)
|
(setq org-habit-graph-column 75)
|
||||||
|
|
||||||
; set ui to standard org-workspace at launch
|
; set ui to standard org-workspace at launch
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(add-hook 'after-init-hook (lambda ()
|
(add-hook 'after-init-hook (lambda ()
|
||||||
(kmn/workspace-org)
|
(kmn/workspace-org)
|
||||||
))
|
))
|
||||||
|
)
|
||||||
|
|
|
@ -5,15 +5,19 @@
|
||||||
(global-set-key (kbd "C-c s") 'org-schedule)
|
(global-set-key (kbd "C-c s") 'org-schedule)
|
||||||
(global-set-key (kbd "C-c c") 'org-capture)
|
(global-set-key (kbd "C-c c") 'org-capture)
|
||||||
(global-set-key (kbd "C-c z") 'org-attach)
|
(global-set-key (kbd "C-c z") 'org-attach)
|
||||||
|
(global-set-key (kbd "C-c d v")
|
||||||
|
(lambda () (interactive) (dired "~/org/Document_Archive"))
|
||||||
|
)
|
||||||
|
(global-set-key (kbd "C-c d n")
|
||||||
|
(lambda () (interactive) (find-file "~/org/_index.org"))
|
||||||
|
)
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(global-set-key (kbd "C-c d t")
|
(global-set-key (kbd "C-c d t")
|
||||||
(lambda () (interactive) (find-file "~/org/orgzly/_todo.org"))
|
(lambda () (interactive) (find-file "~/org/orgzly/_todo.org"))
|
||||||
)
|
)
|
||||||
(global-set-key (kbd "C-c d s")
|
(global-set-key (kbd "C-c d s")
|
||||||
(lambda () (interactive) (find-file "~/org/orgzly/_slipbox.org"))
|
(lambda () (interactive) (find-file "~/org/orgzly/_slipbox.org"))
|
||||||
)
|
)
|
||||||
(global-set-key (kbd "C-c d n")
|
|
||||||
(lambda () (interactive) (find-file "~/org/_index.org"))
|
|
||||||
)
|
|
||||||
(global-set-key (kbd "C-c d h")
|
(global-set-key (kbd "C-c d h")
|
||||||
(lambda () (interactive) (find-file "~/org/health/_health.org"))
|
(lambda () (interactive) (find-file "~/org/health/_health.org"))
|
||||||
)
|
)
|
||||||
|
@ -23,6 +27,4 @@
|
||||||
(global-set-key (kbd "C-c d r")
|
(global-set-key (kbd "C-c d r")
|
||||||
(lambda () (interactive) (find-file "~/org/culinary/_culinary.org"))
|
(lambda () (interactive) (find-file "~/org/culinary/_culinary.org"))
|
||||||
)
|
)
|
||||||
(global-set-key (kbd "C-c d v")
|
|
||||||
(lambda () (interactive) (dired "~/org/Document_Archive"))
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
(setq org-todo-keywords
|
||||||
|
'((sequence "TODO(t)" "READY(r)" "WIP(w)" "|" "SKIPPED(k)" "COMPLETE(c)" "CANCELED(x)"))
|
||||||
|
)
|
||||||
|
(setq org-todo-keyword-faces
|
||||||
|
'(("TODO" . "turquoise") ("READY" . "yellow") ("WIP" . "magenta") ("COMPLETE" . "green") ("CANCELED" . "orange"))
|
||||||
|
)
|
||||||
|
(when (not kmn/is-dayjob)
|
||||||
(setq org-tags-exclude-from-inheritance (quote ("@recipe" "@budgetbytes"
|
(setq org-tags-exclude-from-inheritance (quote ("@recipe" "@budgetbytes"
|
||||||
"@vegan" "@vegetarian"
|
"@vegan" "@vegetarian"
|
||||||
"@instapot" "@slowcooker" "@onepot" "@oven" "@baked" "@baking" "@dehydrator" "@ricecooker"
|
"@instapot" "@slowcooker" "@onepot" "@oven" "@baked" "@baking" "@dehydrator" "@ricecooker"
|
||||||
|
@ -14,9 +21,4 @@
|
||||||
"@coconutmilk" "@oatmilk" "@coconutwater"
|
"@coconutmilk" "@oatmilk" "@coconutwater"
|
||||||
"@kemonine" "@waltdk"
|
"@kemonine" "@waltdk"
|
||||||
)))
|
)))
|
||||||
(setq org-todo-keywords
|
|
||||||
'((sequence "TODO(t)" "READY(r)" "WIP(w)" "|" "SKIPPED(k)" "COMPLETE(c)" "CANCELED(x)"))
|
|
||||||
)
|
|
||||||
(setq org-todo-keyword-faces
|
|
||||||
'(("TODO" . "turquoise") ("READY" . "yellow") ("WIP" . "magenta") ("COMPLETE" . "green") ("CANCELED" . "orange"))
|
|
||||||
)
|
)
|
||||||
|
|
Reference in a new issue