about summary refs log tree commit diff
path: root/configs/shared/emacs/.emacs.d
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2019-03-18T14·14+0000
committerWilliam Carroll <wpcarro@gmail.com>2019-03-18T14·14+0000
commitf7b3e0a7a92903307ef1f4c66992721be6e01e08 (patch)
tree11f1959ee6dc34d2f8b20e6425cbb85700b55c63 /configs/shared/emacs/.emacs.d
parentbf33edaa6efbf3572d9335bb07b530af249de0d2 (diff)
Drop OSX support; support desktop, laptop, cloudtop
Dropping support for OSX. Moving forward these dotfiles will depend on Linux
systems. Furthermore, since I'm support a ~/bin, the machines that consume these
dotfiles depend on i386 architectures. Linux and i386 are two dependencies that
I'm okay with since the leverage this assumption provides, makes their existence
tolerable.

There is some Google leakage herein, which includes aliases, functions, and
mentions of cloudtop. For now, this is okay. I may break the Google specific
code into its own repository, but for now, this is less maintenance.

This also introduces a ~/.profile instead of erroneously defining environment
variables in my zshrc file, which was unadvised.

This is a large commit and also introduces new aliases, variables, functions
that I accumulated over the past week or so while migrating away from OSX and
onto my new setup. Hopefully in the future I'll be more precise with my commits.
Diffstat (limited to 'configs/shared/emacs/.emacs.d')
-rw-r--r--configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el1
-rw-r--r--configs/shared/emacs/.emacs.d/wpc/packages/wpc-misc.el5
-rw-r--r--configs/shared/emacs/.emacs.d/wpc/packages/wpc-org.el28
-rw-r--r--configs/shared/emacs/.emacs.d/wpc/packages/wpc-ui.el2
4 files changed, 24 insertions, 12 deletions
diff --git a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el
index 8d6fe0530f46..6272b1127088 100644
--- a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el
+++ b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-keybindings.el
@@ -71,6 +71,7 @@
     "el" (lambda () (interactive) (wpc/find-file-split "~/variables.zsh"))
     "ex" (lambda () (interactive) (wpc/find-file-split "~/.Xresources"))
     "ei" (lambda () (interactive) (wpc/find-file-split "~/.config/i3/config"))
+    "em" (lambda () (interactive) (wpc/find-file-split "~/.tmux.conf"))
 
     "B"  #'magit-blame
     "w"  #'save-buffer
diff --git a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-misc.el b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-misc.el
index 46812c60d652..5e513cd6f0ee 100644
--- a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-misc.el
+++ b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-misc.el
@@ -45,10 +45,10 @@
 ;; create file bookmarks
 (set-register ?e '(file . "~/.emacs.d/wpc/packages"))
 (set-register ?n '(file . "~/programming/nixify/configuration.nix"))
-(set-register ?d '(file . "~/programming/dotfiles"))
+(set-register ?d '(file . "~/Dropbox/dotfiles"))
 (set-register ?s '(file . "~/.slate.js"))
 (set-register ?D '(file . "~/Dropbox"))
-(set-register ?o '(file . "~/Documents/org/"))
+(set-register ?o '(file . "~/Dropbox/org/")) ;; TODO: change this to `(getenv "ORG_DIRECTORY")'
 
 (set-register ?v '(file . "~/.config/nvim/init.vim"))
 (set-register ?e '(file . "~/.emacs.d/init.el"))
@@ -58,6 +58,7 @@
 (set-register ?l '(file . "~/variables.zsh"))
 (set-register ?x '(file . "~/.Xresources"))
 (set-register ?i '(file . "~/.config/i3/config"))
+(set-register ?m '(file . "~/.tmux.conf"))
 
 (set-register ?p `(file . ,wpc/current-project))
 
diff --git a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-org.el b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-org.el
index dcbe06688519..06e2a27bf948 100644
--- a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-org.el
+++ b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-org.el
@@ -6,29 +6,39 @@
 
 ;;; Code:
 
+(getenv "ORG_DIRECTORY")
+
 ;; TODO: figure out how to nest this in (use-package org ...)
 (setq org-capture-templates
-      (quote (
+      `(
+
+        ("w" "work" entry (file+headline
+                           ,(f-join (getenv "ORG_DIRECTORY") "work.org")
+                           "Tasks")
+         "* TODO %?")
 
-("w" "work" entry (file+headline "~/Documents/org/work.org" "Tasks")
- "* TODO %?")
+        ("p" "personal" entry (file+headline
+                               ,(f-join (getenv "ORG_DIRECTORY") "personal.org")
+                               "Tasks")
+         "* TODO %? ")
 
-("p" "personal" entry (file+headline "~/Documents/org/personal.org" "Tasks")
- "* TODO %? ")
+        ("i" "ideas" entry (file+headline
+                            ,(f-join (getenv "ORG_DIRECTORY") "ideas.org")
+                            "Tasks")
+         "* %? ")
 
-)))
+        ))
 (evil-set-initial-state 'org-mode 'insert)
 
 (use-package org
-  :preface
-  (defconst wpc-org-directory
-    "~/Documents/org")
   :config
   ; (general-add-hook org-mode-hook (disable linum-mode))
   (general-define-key :prefix "C-c"
            "l" #'org-store-link
            "a" #'org-agenda
            "c" #'org-capture)
+  (setq org-todo-keywords
+        '((sequence "TODO" "BLOCKED" "DONE")))
   (setq org-default-notes-file (wpc/org-file "notes"))
   (setq org-log-done 'time)
   (setq org-agenda-files (list (wpc/org-file "work")
diff --git a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-ui.el b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-ui.el
index 6fd34516bfd1..2334a8947ea3 100644
--- a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-ui.el
+++ b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-ui.el
@@ -10,7 +10,7 @@
 (setq-default line-spacing 4)
 
 ;; change font
-(add-to-list 'default-frame-alist '(font . "Source Code Pro-9"))
+(add-to-list 'default-frame-alist '(font . "Operator Mono Book-9"))
 
 (defconst wpc/font-size-step 10
   "The amount (%) by which to increase or decrease a font.")