Compare commits

...

6 Commits

Author SHA1 Message Date
Jeremy Dormitzer
db6848c11c Add .zprofile 2021-07-27 11:50:55 -04:00
Jeremy Dormitzer
e9e862bf19 Get rid of pyenv zsh plugin 2021-07-27 11:50:34 -04:00
Jeremy Dormitzer
87f73d3768 Update prodigy services 2021-07-27 11:50:22 -04:00
Jeremy Dormitzer
59c3155d46 Add org-store-link binding 2021-07-27 11:50:12 -04:00
Jeremy Dormitzer
24a89db0ef Fix embark config for new version 2021-07-27 11:50:02 -04:00
Jeremy Dormitzer
9db4107d4a Formatting 2021-07-27 11:49:51 -04:00
5 changed files with 59 additions and 57 deletions

View File

@ -32,11 +32,9 @@
;; Embark adds context actions to completion candidates ;; Embark adds context actions to completion candidates
(use-package embark (use-package embark
:config :config
(setq embark-action-indicator (defun embark-which-key-indicator (map _target)
(lambda (map _target)
(which-key--show-keymap "Embark" map nil nil 'no-paging) (which-key--show-keymap "Embark" map nil nil 'no-paging)
#'which-key--hide-popup-ignore-command) #'which-key--hide-popup-ignore-command)
embark-become-indicator embark-action-indicator)
:general :general
("M-o" #'embark-act) ("M-o" #'embark-act)
('normal embark-collect-mode-map ('normal embark-collect-mode-map
@ -59,7 +57,8 @@
"}" #'tabulated-list-widen-current-column "}" #'tabulated-list-widen-current-column
"<backtab>" #'backward-button) "<backtab>" #'backward-button)
:custom :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 ;; Consult adds a bunch of completing-read based utilities
(use-package consult (use-package consult

View File

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

View File

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

2
zsh/.zprofile Normal file
View File

@ -0,0 +1,2 @@
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/ # Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
plugins=(git direnv pyenv pipenv npm nvm) plugins=(git direnv pipenv npm nvm)
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh