M2 cleanup.

- Remove firacode, unneeded as far as I can tell.
- modus theme changes config steps.
- mac command modifier change not needed.
- more dhd dir changes.

.config/hammerspoon/init.lua

@@ -82,16 +82,14 @@ end)
 
 -- stolen from @mrled
 appCuts = {
-  c = 'Brave Browser',
   e = 'Emacs',
   d = 'Dash',
   f = 'Firefox',
   h = 'Hammerspoon',
-  l = 'Slack',
   m = 'Mail.app',
   o = 'Calendar.app',
   p = 'Bitwarden',
-  t = 'iTerm.app',
+  t = 'terminal',
   z = 'Zoom.us',
   v = 'Visual Studio Code'  
 }

.emacs.d/custom.el

@@ -9,12 +9,14 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(custom-safe-themes
+   '("21e3d55141186651571241c2ba3c665979d1e886f53b2e52411e9e96659132d4" "69f7e8101867cfac410e88140f8c51b4433b93680901bb0b52014144366a08c8" default))
  '(epg-gpg-program "/usr/local/bin/gpg")
  '(global-hl-line-mode t)
  '(org-agenda-files
    '("/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org"))
  '(package-selected-packages
-   '(py-isort terraform-mode mu4e org-trello python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit modus-themes org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window))
+   '(py-isort terraform-mode mu4e org-trello python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window))
  '(request-backend 'url-retrieve))
  '(znc-servers
    `(("bouncer.awful.club" 5000 t

.emacs.d/init.el

@@ -31,7 +31,6 @@
 (load-file "~/.emacs.d/jlj-org.el")
 (load-file "~/.emacs.d/jlj-python.el")
 (load-file "~/.emacs.d/jlj-rust.el")
-;; (load-file "~/.emacs.d/jlj-social.el")
 
 ;; load keychain (if it exists)
 (when (eq system-type 'gnu/linux)

.emacs.d/jlj-generic.el

@@ -29,42 +29,29 @@
 (show-paren-mode 1)
 (setq show-paren-delay 0)
 
-;; set default font for macos
-(when (eq system-type 'darwin)
-  (use-package fira-code-mode
-    :custom (fira-code-mode-disabled-ligatures '("[]" "#{" "#(" "#_" "#_(" "x")) ;; List of ligatures to turn off
-    :config (global-fira-code-mode)) ;; Enables fira-code-mode globally
-  (set-frame-font "fira code 12")
-  (add-to-list 'default-frame-alist '(font . "fira code 12" ))
-  (set-face-attribute 'default t :font "fira code 12" ))
 (transient-mark-mode 1)              ; Enable transient mark mode (highlights)
 
 (global-hl-line-mode t)              ; highlights the line you're on
 
 (setq indent-tabs-mode nil)                          ; always use spaces when indenting
 (setq require-final-newline t)
-(setq backup-directory-alist `(("." . "~/dhd/org/.saves")))
-(find-file "~/dhd/org/personal.org") ;open primary org file on launch
+(setq backup-directory-alist `(("." . "~/iCloud/dhd/org/.saves")))
+(find-file "~/iCloud/dhd/org/personal.org") ;open primary org file on launch
 (electric-pair-mode 1)                               ; create paired brackets.
 
 ;; themes
 ;; experiemtning with the modus themes that will be native come emacs 28
 ;; they are more acciessble for r/g color blind stuff
 ;; (load-theme 'manoj-dark) loads my favorite default theme
-(use-package modus-themes
-  :ensure
-  :init
-  ;; Add all your customizations prior to loading the themes
-  (setq modus-themes-slanted-constructs t
-        modus-themes-bold-constructs t
-	modus-themes-paren-match 'intense-bold)
 
-  ;; Load the theme files before enabling a theme
-  (modus-themes-load-themes)
-  :config
-  ;; Load the theme of your choice:
-  (modus-themes-load-vivendi)  ;; (modus-themes-load-operandi)
-  :bind ("<f5>" . modus-themes-toggle))
+(add-to-list 'load-path "~/.emacs.d/modus-themes")
+(setq modus-themes-slanted-constructs t
+      modus-themes-bold-constructs t
+      modus-themes-paren-match 'intense-bold)
+;(load-theme 'modus-vivendi)
+(load-theme 'modus-operandi)
+
+;;:bind ("<f5>" . modus-themes-toggle))
 
 
 (use-package yasnippet
@@ -80,13 +67,15 @@
 (use-package iedit
   :ensure t)
 
-(when (eq system-type 'darwin)
-  (setq mac-command-modifier 'meta)
-  ;; Make emacs use a different default than the OS
-  ;; only really useful on work computers, but there we go.
-  (setq browse-url-browser-function #'browse-url-generic
-	browse-url-generic-program "open"
-	browse-url-generic-args '("-a" "Firefox")))
+;; As far as I can tell I don't need this if you are using the better mac version of the emacs app?
+;; Weird.
+;; (when (eq system-type 'darwin)
+;;   (setq mac-command-modifier 'meta)
+;;   ;; Make emacs use a different default than the OS
+;;   ;; only really useful on work computers, but there we go.
+;;   (setq browse-url-browser-function #'browse-url-generic
+;; 	browse-url-generic-program "open"
+;; 	browse-url-generic-args '("-a" "Firefox")))
 
 (use-package exec-path-from-shell
   :ensure t
@@ -102,7 +91,7 @@
   (find-file-other-window user-init-file))
 (global-set-key (kbd "C-c J") 'find-user-init-file)
 
-(setq user-home-file "~/dhd/org/personal.org")
+(setq user-home-file "~/iCloud/dhd/org/personal.org")
 (defun find-user-home-file ()
   "Edit the `user-home-file' in this window."
   (interactive)

.emacs.d/jlj-org.el

@@ -47,7 +47,7 @@
     (setq org-columns-default-format
 	  '(("%25ITEM %TODO %3PRIORITY %TAGS")))
     ;; have to add _archive or beorg throws a fit!!! it doesn't work on tags the dumby!
-    (setq org-archive-location "~/dhd/org/archive.org_archive::* From %s")
+    (setq org-archive-location "~/iCloud/dhd/org/archive.org_archive::* From %s")
 
 
 ;;;; custom org mode hotkeys
@@ -61,15 +61,9 @@
 			       (org-agenda-files :maxlevel . 9)))
     (setq org-outline-path-complete-in-steps nil)         ; Refile in a single go
     (setq org-refile-use-outline-path t)                  ; Show full paths for refiling
-    (setq org-agenda-files '("~/dhd/org/"))           ; add files to agenda
-    ;; (find-file-noselect "~/Documents/projects/molly/data/matrix-refile.org")
-    ;; (setq org-agenda-files (list "~/dhd/org"
-    ;; 				 "~/Documents/projects/molly/data/matrix-refile.org"))
-    (with-current-buffer "matrix-refile.org" (auto-revert-mode))
+    (setq org-agenda-files '("~/iCloud/dhd/org/"))           ; add files to agenda
 
-
-
-    (setq org-directory "~/dhd/org/")                 ; define generic org capture shit
+    (setq org-directory "~/iCloud/dhd/org/")                 ; define generic org capture shit
     (setq org-default-notes-file (concat org-directory "/refile-beorg.org"))))
 
 
@@ -85,7 +79,7 @@
   :custom
     ;; The places where I keep my ‘#+documentation’
     (org-special-block-extras--docs-libraries
-     '("~/dhd/org/documentation.org"))
+     '("~/iCloud/dhd/org/documentation.org"))
     ;; Disable the in-Emacs fancy-links feature?
     ;; (org-special-block-extras-fancy-links nil)
     ;; Details heading “flash pink” whenever the user hovers over them?
@@ -113,7 +107,7 @@
 ;;   :ensure t
 ;;   :after org
 ;;   :config
-;;   (custom-set-variables '(org-trello-files '("~/dhd/org/stjohns-trello.org"))))
+;;   (custom-set-variables '(org-trello-files '("~/iCloud/dhd/org/stjohns-trello.org"))))
 
 ;; configure the org protocol
 (org-load-modules-maybe t)
@@ -122,22 +116,22 @@
 (setq org-protocol-default-template-key "w")
 
 (setq org-capture-templates
-       `(("w" "Web site" entry (file+olp "~/dhd/org/webwiki.org" "links" "unsorted")
+       `(("w" "Web site" entry (file+olp "~/iCloud/dhd/org/webwiki.org" "links" "unsorted")
 	  "* %c :website:\n%U %?%:initial")
 	 ;; ... more templates here ...
-	 ("b" "Book - capture a book you've read" entry (file+olp "~/dhd/org/webwiki.org" "books")
+	 ("b" "Book - capture a book you've read" entry (file+olp "~/iCloud/dhd/org/webwiki.org" "books")
 	  "* %^{TITLE} \n  :PROPERTIES:\n:AUTHOR: %^{AUTHOR}\n:GENRE: %^{GENRE}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)
-	 ("v" "TV - capture a TV show you've finished. Include season in title like (s01)." entry (file+olp "~/dhd/org/webwiki.org" "tv")
+	 ("v" "TV - capture a TV show you've finished. Include season in title like (s01)." entry (file+olp "~/iCloud/dhd/org/webwiki.org" "tv")
 	  "* %^{TITLE} \n  :PROPERTIES:\n:GENRE: %^{GENRE}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)
-	 ("m" "Movies - capture a movie you've finished" entry (file+olp "~/dhd/org/webwiki.org" "movies")
+	 ("m" "Movies - capture a movie you've finished" entry (file+olp "~/iCloud/dhd/org/webwiki.org" "movies")
 	  "* %^{TITLE} \n  :PROPERTIES:\n:GENRE: %^{GENRE}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)
-	 ("g" "Game - capture a game you've finished" entry (file+olp "~/dhd/org/webwiki.org" "games")
+	 ("g" "Game - capture a game you've finished" entry (file+olp "~/iCloud/dhd/org/webwiki.org" "games")
 	  "* %^{TITLE} \n  :PROPERTIES:\n:PLATFORM: %^{PLATFORM}\n:TAGS: %^{TAGS}\n:MULTIPLAYER: %^{MULTIPLAYER}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)	 
-	 ("c" "Context-include Todo" entry (file "~/dhd/org/refile-beorg.org")
+	 ("c" "Context-include Todo" entry (file "~/iCloud/dhd/org/refile-beorg.org")
 	  "* TODO %?\n%U \n '%a'" :empty-lines 1 :prepend t)
-	 ("q" "quotes" entry (file+olp "~/dhd/org/webwiki.org" "quotes")
+	 ("q" "quotes" entry (file+olp "~/iCloud/dhd/org/webwiki.org" "quotes")
 	  "* %?\n%U \n " :empty-lines 1 :prepend t)
-	 ("t" "Todo" entry (file "~/dhd/org/refile-beorg.org")
+	 ("t" "Todo" entry (file "~/iCloud/dhd/org/refile-beorg.org")
 	  "* TODO %?\n%U" :empty-lines 1 :prepend t)))
 
 ;; configure org exporters
@@ -192,7 +186,7 @@ dependency: this relies on imagemagick"
   (setq org-caldav-url "https://caldav.fastmail.com/dav/calendars/user/me@jowj.net/")
   (setq org-caldav-calendars
 	'((:calendar-id "654a6e55-b777-4603-b009-0058d35aa5ca"
-			:inbox "~/dhd/org/fromworkcal.org")))
+			:inbox "~/iCloud/dhd/org/fromworkcal.org")))
   (setq org-icalendar-timezone "America/Chicago"))
 
 

.zshrc

@@ -72,15 +72,10 @@ echo -e "\e[31m      ||        HATCHET\e[0m  |  $OSTYPE"
 echo -e "\e[31m      ||\e[0m                 |"
 echo ""
 
-
-# The next line updates PATH for the Google Cloud SDK.
-if [ -f '/Users/josiah.ledbetter/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/josiah.ledbetter/google-cloud-sdk/path.zsh.inc'; fi
-
-# The next line enables shell command completion for gcloud.
-if [ -f '/Users/josiah.ledbetter/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/josiah.ledbetter/google-cloud-sdk/completion.zsh.inc'; fi
 if [ -e /Users/josiah.ledbetter/.nix-profile/etc/profile.d/nix.sh ]; then . /Users/josiah.ledbetter/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
 
 export PATH="$HOME/.poetry/bin:$PATH"
 
-autoload -U +X bashcompinit && bashcompinit
-complete -o nospace -C /usr/local/bin/terraform terraform
+autoload -Uz compinit
+compinit
+