Compare commits

..

No commits in common. "db6848c11cbd61c5a6f228af4a5ee6a8c5797f57" and "271b9e4b57996def5a8159949804e4768b1a69be" have entirely different histories.

5 changed files with 57 additions and 59 deletions

View File

@ -32,9 +32,11 @@
;; Embark adds context actions to completion candidates
(use-package embark
:config
(defun embark-which-key-indicator (map _target)
(setq embark-action-indicator
(lambda (map _target)
(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
@ -57,8 +59,7 @@
"}" #'tabulated-list-widen-current-column
"<backtab>" #'backward-button)
:custom
(embark-prompter 'embark-keymap-prompter)
(embark-indicator 'embark-which-key-indicator))
(embark-prompter 'embark-keymap-prompter))
;; Consult adds a bunch of completing-read based utilities
(use-package consult

View File

@ -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

View File

@ -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"
"~/lola/python-services/priceline/.env"
:env-dir "~/lola/python-services"))
:init-async (python-service-setup "~/lola/python_services/.venv"
"~/lola/python_services/priceline/.env"
: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"
"~/lola/python-services/priceline_cars/.env"
:env-dir "~/lola/python-services"))
:init-async (python-service-setup "~/lola/python_services/.venv"
"~/lola/python_services/priceline_cars/.env"
: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"
"~/lola/python-services/threev/.env"
:env-dir "~/lola/python-services"))
:init-async (python-service-setup "~/lola/python_services/.venv"
"~/lola/python_services/threev/.env"
: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"
"~/lola/python-services/amd_flight/.env"
:env-dir "~/lola/python-services"))
:init-async (python-service-setup "~/lola/python_services/.venv"
"~/lola/python_services/amd_flight/.env"
: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"
"~/lola/python-services/ean_hotels/.env"
:env-dir "~/lola/python-services"))
:init-async (python-service-setup "~/lola/python_services/.venv"
"~/lola/python_services/ean_hotels/.env"
: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"
"~/lola/python-services/smp_hotels/.env"
:env-dir "~/lola/python-services"))
:init-async (python-service-setup "~/lola/python_services/.venv"
"~/lola/python_services/smp_hotels/.env"
: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"
"~/lola/python-services/spend/.env"
:env-dir "~/lola/python-services")))
:init-async (python-service-setup "~/lola/python_services/.venv"
"~/lola/python_services/spend/.env"
:env-dir "~/lola/python_services")))
(provide 'init-prodigy)

View File

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

View File

@ -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