diff options
Diffstat (limited to 'oni')
| -rw-r--r-- | oni/home/config/pop-os.scm | 7 | ||||
| -rw-r--r-- | oni/home/config/pop-os/emacs.el | 63 | ||||
| -rw-r--r-- | oni/packages/emacs-config.scm | 36 |
3 files changed, 96 insertions, 10 deletions
diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm index 31350fa..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 @@ -226,6 +228,9 @@ emacs-oni-js emacs-oni-elfeed emacs-oni-eshell + emacs-oni-outline + emacs-oni-sql + emacs-oni-logview emacs-flycheck-phpstan emacs-vue-ts-mode diff --git a/oni/home/config/pop-os/emacs.el b/oni/home/config/pop-os/emacs.el index daaaac9..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)) @@ -1282,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)) @@ -1302,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)) diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm index 4aeee76..6794a62 100644 --- a/oni/packages/emacs-config.scm +++ b/oni/packages/emacs-config.scm @@ -38,7 +38,7 @@ (define-public emacs-oni-config (let - ((commit "ddabed921df62062010156178317c79e612e889d") + ((commit "b3b63e7322acd6fe373454bf5c8a41a97f000938") (revision "0")) (package (name "emacs-oni-config") (version (git-version "0.0.1" revision commit)) @@ -52,7 +52,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "02jgsg42qa6nw8bzd6rn17cnkj8pfy4i788cjsyygxy3z01kcs3c")))) + "0nj8gyzvajza2bsq20a2k1hljsmqw6a18l6bakff4d8l0wbmamzn")))) (build-system emacs-build-system) (home-page "https://code.ryuslash.org/emacs-config/") (synopsis "My Emacs configuration") @@ -1021,3 +1021,35 @@ Emacs"))) (synopsis "My configuration for JavaScript.") (description "This package provides my configuration for editing JavaScript files."))) + +(define-public emacs-oni-outline + (package + (inherit emacs-oni-config) + (name "emacs-oni-outline") + (arguments + '(#:include '("oni-outline\\.el$"))) + (synopsis "My configuration for outline-mode and outline-minor-mode") + (description + "This package provides my configuration for outline modes."))) + +(define-public emacs-oni-sql + (package + (inherit emacs-oni-config) + (name "emacs-oni-sql") + (arguments + '(#:include '("oni-sql\\.el$"))) + (synopsis "My configuration for sql-mode") + (description + "This package provides my configuration for sql mode."))) + +(define-public emacs-oni-logview + (package + (inherit emacs-oni-config) + (name "emacs-oni-logview") + (arguments + '(#:include '("oni-logview\\.el$"))) + (synopsis "My configuration for logview-mode") + (propagated-inputs + (list emacs-logview)) + (description + "This package provides my configuration for logview mode."))) |