diff options
Diffstat (limited to 'oni')
| -rw-r--r-- | oni/home/config/pop-os.scm | 4 | ||||
| -rw-r--r-- | oni/home/config/pop-os/emacs.el | 55 |
2 files changed, 54 insertions, 5 deletions
diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm index 95a4731..8bae7c7 100644 --- a/oni/home/config/pop-os.scm +++ b/oni/home/config/pop-os.scm @@ -171,6 +171,7 @@ "wezterm" "tree-sitter-vue" "tree-sitter-typescript" + "tree-sitter-css" "emacs-popup" "emacs-git-messenger" "emacs-csv-mode" @@ -194,7 +195,8 @@ "emacs-sops" "emacs-dockerfile-mode" "emacs-slack" - "emacs-combobulate")) + "emacs-combobulate" + "emacs-prodigy")) (list emacs-oni-core emacs-oni-compilation emacs-oni-common-lisp diff --git a/oni/home/config/pop-os/emacs.el b/oni/home/config/pop-os/emacs.el index 5b5ddb4..8b517ef 100644 --- a/oni/home/config/pop-os/emacs.el +++ b/oni/home/config/pop-os/emacs.el @@ -399,9 +399,9 @@ Optional argument STOPP means stop on any defect." (add-hook 'dashboard-mode-hook 'olivetti-mode) (add-hook 'dashboard-after-initialize-hook (lambda () (setq truncate-lines t))) -(setq browse-url-browser-function #'browse-url-firefox) -(setq browse-url-generic-args '("run" "--branch=stable" "--arch=x86_64" "--command=launch-script.sh" "--file-forwarding" "app.zen_browser.zen")) -(setq browse-url-generic-program "/usr/bin/flatpak") +(setq browse-url-browser-function #'browse-url-generic) +(setq browse-url-generic-args nil) +(setq browse-url-generic-program "~/Downloads/glide/glide") (defun oni-fixup-phpstan-filenames (errors) "Change the file name from each error in ERRORS to one on local disk." @@ -1284,7 +1284,10 @@ Optional argument STOPP means stop on any defect." (with-eval-after-load 'elfeed (setq elfeed-feeds '(("https://www.reddit.com/r/PHP/.rss" php) - ("https://phpreads.com/feed" php)))) + ("https://phpreads.com/feed" php) + ("https://phpstan.org/rss.xml" php) + ("https://lobste.rs/t/php.rss" php)) + elfeed-curl-program-name "curl")) (setq git-messenger:show-detail t) (global-set-key (kbd "C-c g .") '("Show commit at point" . git-messenger:popup-message)) @@ -1304,3 +1307,47 @@ Optional argument STOPP means stop on any defect." (org-mem-entries-in file)) collect file))) (add-hook 'org-mem-post-full-scan-functions #'my-set-agenda-files) + +;;; Prodigy services + +(with-eval-after-load 'prodigy + (prodigy-define-tag + :name 'tunnel + :command "~/code/diamond-interactive/social-api/toolbox/connect_db.sh" + :args (lambda (&rest args) + (let ((service (map-elt args :service))) + (list "-e" + (if (prodigy-service-tagged-with? service 'production) + "prd" + "stg") + "-a" + (cond + ((prodigy-service-tagged-with? service 'chanced) + "chanced") + ((prodigy-service-tagged-with? service 'punt) + "punt") + (t (error "Unknown project"))) + "-k" + (expand-file-name "~/.ssh/id_ed25519.pub")))) + :cwd "~/code/diamond-interactive/social-api" + :stop-signal 'kill + :ready-message "Waiting for connections...") + + (prodigy-define-service + :name "Chanced Production Database Connection" + :tags '(chanced production tunnel)) + + (prodigy-define-service + :name "Chanced Staging Database Connection" + :tags '(chanced staging tunnel)) + + (prodigy-define-service + :name "Punt Production Database Connection" + :tags '(punt production tunnel)) + + (prodigy-define-service + :name "Punt Staging Database Connection" + :tags '(punt staging tunnel))) + +(autoload 'vue-ts-mode "vue-ts-mode" nil t) +(add-to-list 'auto-mode-alist (cons (rx ".vue" eos) 'vue-ts-mode)) |