emacs/.emacs.d/config/init-completion.el

@@ -32,33 +32,34 @@
 ;; Embark adds context actions to completion candidates
 (use-package embark
   :config
-  (defun embark-which-key-indicator (map _target)
+  (setq embark-action-indicator
-    (which-key--show-keymap "Embark" map nil nil 'no-paging)
+      (lambda (map _target)
-    #'which-key--hide-popup-ignore-command)
+        (which-key--show-keymap "Embark" map nil nil 'no-paging)
+        #'which-key--hide-popup-ignore-command)
+      embark-become-indicator embark-action-indicator)
   :general
   ("M-o" #'embark-act)
   ('normal embark-collect-mode-map
-           "TAB" #'forward-button
+   "TAB" #'forward-button
-           "?" #'describe-mode
+   "?" #'describe-mode
-           "A" #'embark-collect-direct-action-minor-mode
+   "A" #'embark-collect-direct-action-minor-mode
-           "S" #'tabulated-list-sort
+   "S" #'tabulated-list-sort
-           "a" #'embark-act
+   "a" #'embark-act
-           "b" #'backward-button
+   "b" #'backward-button
-           "e" #'embark-export
+   "e" #'embark-export
-           "f" #'forward-button
+   "f" #'forward-button
-           "gr" #'revert-buffer
+   "gr" #'revert-buffer
-           "n" #'next-line
+   "n" #'next-line
-           "p" #'previous-line
+   "p" #'previous-line
-           "q" #'quit-window
+   "q" #'quit-window
-           "s" #'isearch-forward
+   "s" #'isearch-forward
-           "v" #'embark-collect-toggle-view
+   "v" #'embark-collect-toggle-view
-           "z" #'embark-collect-zebra-minor-mode
+   "z" #'embark-collect-zebra-minor-mode
-           "{" #'tabulated-list-narrow-current-column
+   "{" #'tabulated-list-narrow-current-column
-           "}" #'tabulated-list-widen-current-column
+   "}" #'tabulated-list-widen-current-column
-           "<backtab>" #'backward-button)
+   "<backtab>" #'backward-button)
   :custom
-  (embark-prompter 'embark-keymap-prompter)
+  (embark-prompter 'embark-keymap-prompter))
-  (embark-indicator 'embark-which-key-indicator))
 
 ;; Consult adds a bunch of completing-read based utilities
 (use-package consult

emacs/.emacs.d/config/init-org.el

@@ -46,7 +46,6 @@
   :general
   (leader-map "oa" #'org-agenda)
   (leader-map "oc" #'org-capture)
-  (leader-map "ol" #'org-store-link)
   (normal org-mode-map "<return>" #'org-return))
 
 (use-package evil-org

emacs/.emacs.d/config/init-prodigy.el

@@ -263,13 +263,13 @@
   (prodigy-define-service
     :name "priceline-service"
     :tags '(lola backend)
-    :command "~/lola/python-services/priceline/bin/start.sh"
+    :command "~/lola/python_services/priceline/bin/start.sh"
     :args '("web-dev")
-    :cwd "~/lola/python-services"
+    :cwd "~/lola/python_services"
     :stop-signal 'int
-    :init-async (python-service-setup "~/lola/python-services/.venv"
+    :init-async (python-service-setup "~/lola/python_services/.venv"
-                                      "~/lola/python-services/priceline/.env"
+                                      "~/lola/python_services/priceline/.env"
-                                      :env-dir "~/lola/python-services"))
+                                      :env-dir "~/lola/python_services"))
 
   (prodigy-define-service
     :name "priceline-cars-service"
@@ -277,35 +277,35 @@
     :command "bash"
     :args '("-c"
             "priceline_cars/bin/start.sh web-dev >> ~/lola/logs/priceline-cars.log 2>&1")
-    :cwd "~/lola/python-services"
+    :cwd "~/lola/python_services"
     :inhibit-process-filter t
     :file "~/lola/logs/priceline-cars.log"
     :stop-signal 'int
-    :init-async (python-service-setup "~/lola/python-services/.venv"
+    :init-async (python-service-setup "~/lola/python_services/.venv"
-                                      "~/lola/python-services/priceline_cars/.env"
+                                      "~/lola/python_services/priceline_cars/.env"
-                                      :env-dir "~/lola/python-services"))
+                                      :env-dir "~/lola/python_services"))
 
   (prodigy-define-service
     :name "threev-service"
     :tags '(lola backend)
-    :command "~/lola/python-services/threev/bin/start.sh"
+    :command "~/lola/python_services/threev/bin/start.sh"
     :args '("web-dev")
-    :cwd "~/lola/python-services"
+    :cwd "~/lola/python_services"
     :stop-signal 'int
-    :init-async (python-service-setup "~/lola/python-services/.venv"
+    :init-async (python-service-setup "~/lola/python_services/.venv"
-                                      "~/lola/python-services/threev/.env"
+                                      "~/lola/python_services/threev/.env"
-                                      :env-dir "~/lola/python-services"))
+                                      :env-dir "~/lola/python_services"))
 
   (prodigy-define-service
     :name "amd-flight-service"
     :tags '(lola backend)
-    :command "~/lola/python-services/amd_flight/bin/start.sh"
+    :command "~/lola/python_services/amd_flight/bin/start.sh"
     :args '("web-dev")
-    :cwd "~/lola/python-services"
+    :cwd "~/lola/python_services"
     :stop-signal 'int
-    :init-async (python-service-setup "~/lola/python-services/.venv"
+    :init-async (python-service-setup "~/lola/python_services/.venv"
-                                      "~/lola/python-services/amd_flight/.env"
+                                      "~/lola/python_services/amd_flight/.env"
-                                      :env-dir "~/lola/python-services"))
+                                      :env-dir "~/lola/python_services"))
 
   (prodigy-define-service
     :name "ean-hotels-service"
@@ -313,26 +313,26 @@
     :command "bash"
     :args '("-c"
             "ean_hotels/bin/start.sh web-dev >> ~/lola/logs/ean-hotels.log 2>&1")
-    :cwd "~/lola/python-services"
+    :cwd "~/lola/python_services"
     :inhibit-process-filter t
     :file "~/lola/logs/ean-hotels.log"
     :stop-signal 'kill
-    :init-async (python-service-setup "~/lola/python-services/.venv"
+    :init-async (python-service-setup "~/lola/python_services/.venv"
-                                      "~/lola/python-services/ean_hotels/.env"
+                                      "~/lola/python_services/ean_hotels/.env"
-                                      :env-dir "~/lola/python-services"))
+                                      :env-dir "~/lola/python_services"))
 
   (prodigy-define-service
     :name "smp-hotels-service"
     :command "bash"
     :args '("-c"
             "smp_hotels/bin/start.sh web >> ~/lola/logs/smp-hotels.log 2>&1")
-    :cwd "~/lola/python-services"
+    :cwd "~/lola/python_services"
     :inhibit-process-filter t
     :file "~/lola/logs/smp-hotels.log"
     :stop-signal 'kill
-    :init-async (python-service-setup "~/lola/python-services/.venv"
+    :init-async (python-service-setup "~/lola/python_services/.venv"
-                                      "~/lola/python-services/smp_hotels/.env"
+                                      "~/lola/python_services/smp_hotels/.env"
-                                      :env-dir "~/lola/python-services"))
+                                      :env-dir "~/lola/python_services"))
 
   (prodigy-define-service
     :name "email-template-service"
@@ -360,12 +360,12 @@
   (prodigy-define-service
     :name "spend-service"
     :tags '(lola backend)
-    :command "~/lola/python-services/spend/bin/start.sh"
+    :command "~/lola/python_services/spend/bin/start.sh"
     :args '("web-dev")
-    :cwd "~/lola/python-services"
+    :cwd "~/lola/python_services"
     :stop-signal 'int
-    :init-async (python-service-setup "~/lola/python-services/.venv"
+    :init-async (python-service-setup "~/lola/python_services/.venv"
-                                      "~/lola/python-services/spend/.env"
+                                      "~/lola/python_services/spend/.env"
-                                      :env-dir "~/lola/python-services")))
+                                      :env-dir "~/lola/python_services")))
 
 (provide 'init-prodigy)

zsh/.zprofile

@@ -1,2 +0,0 @@
-export PATH="$PATH:/Users/jdormit/.local/bin"
-eval "$(pyenv init --path)"

zsh/.zshrc

@@ -66,7 +66,7 @@ ZSH_THEME="typewritten"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git direnv pipenv npm nvm)
+plugins=(git direnv pyenv pipenv npm nvm)
 
 source $ZSH/oh-my-zsh.sh