diff options
Diffstat (limited to 'oni/home/config/pop-os/emacs.el')
| -rw-r--r-- | oni/home/config/pop-os/emacs.el | 80 |
1 files changed, 72 insertions, 8 deletions
diff --git a/oni/home/config/pop-os/emacs.el b/oni/home/config/pop-os/emacs.el index 63cfcac..8b517ef 100644 --- a/oni/home/config/pop-os/emacs.el +++ b/oni/home/config/pop-os/emacs.el @@ -156,7 +156,7 @@ buffers.") (command (with-current-buffer buffer (format "../../chanced-scripts/test %s %s %s %s" name - (if filter (format "--filter='::%s$'" filter) "") + (if filter (format "--filter='::%s( |$)'" filter) "") (if stop-on-failure-p "--stop-on-defect" "") (or file ""))))) (cl-letf (((symbol-function 'compilation-buffer-name) @@ -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." @@ -1256,8 +1256,10 @@ Optional argument STOPP means stop on any defect." (require 'oni-js) -(with-eval-after-load 'sh-script - (require 'oni-sh)) +(with-eval-after-load 'sh-script (require 'oni-sh)) +(with-eval-after-load 'sql (require 'oni-sql)) +(with-eval-after-load 'outline (require 'oni-outline)) +(with-eval-after-load 'logview (require 'oni-logview)) (eval-when-compile (require 'magit-section)) @@ -1279,11 +1281,73 @@ Optional argument STOPP means stop on any defect." (add-hook 'magit-status-sections-hook #'oni-magit-insert-locked-files 20)) -(setq elfeed-feeds - '("https://www.reddit.com/r/PHP/.rss")) +(with-eval-after-load 'elfeed + (setq elfeed-feeds + '(("https://www.reddit.com/r/PHP/.rss" 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)) (global-set-key (kbd "C-c g b") '("Git Blame current file" . magit-blame)) (global-set-key (kbd "C-c g l") '("Show file's git log" . magit-log-buffer-file)) +(defun my-set-agenda-files (&rest _) + (setq org-agenda-files + (cl-loop + for file in (org-mem-all-files) + unless (string-search "archive" file) + when (seq-find (lambda (entry) + (or (org-mem-entry-active-timestamps entry) + (org-mem-entry-todo-state entry) + (org-mem-entry-scheduled entry) + (org-mem-entry-deadline entry))) + (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)) |