diff options
Diffstat (limited to 'oni')
| -rw-r--r-- | oni/home/config/data.scm | 17 | ||||
| -rw-r--r-- | oni/home/config/pop-os/emacs.el | 40 | ||||
| -rw-r--r-- | oni/packages/emacs.scm | 4 |
3 files changed, 45 insertions, 16 deletions
diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm index 38ae590..e7e16d3 100644 --- a/oni/home/config/data.scm +++ b/oni/home/config/data.scm @@ -3,6 +3,7 @@ #:use-module (gnu home services) #:use-module (gnu home services gnupg) #:use-module (gnu home services niri) + #:use-module (gnu home services ssh) #:use-module (gnu home) #:use-module (gnu packages admin) #:use-module (gnu packages emacs) @@ -55,7 +56,16 @@ "emacs-fennel-mode" "fennel-ls" "fnlfmt" - "emacs-org-caldav")) + "emacs-org-caldav" + "emacs-vertico" + "emacs-vertico-posframe" + "emacs-minions" + "emacs-denote" + "emacs-prescient" + "emacs-posframe" + + ;; Includes tree-sitter-tsx + "tree-sitter-typescript")) (list pick-random-wallpaper emacs-org-contacts @@ -116,11 +126,12 @@ home-redshift-service home-guile-service home-openssh-service - home-kitty-service + + (service home-ssh-agent-service-type) (service home-gpg-agent-service-type (home-gpg-agent-configuration - (ssh-support? #t) + (ssh-support? #f) (extra-content "allow-emacs-pinentry\n"))) diff --git a/oni/home/config/pop-os/emacs.el b/oni/home/config/pop-os/emacs.el index 241bf5e..4e070a2 100644 --- a/oni/home/config/pop-os/emacs.el +++ b/oni/home/config/pop-os/emacs.el @@ -55,13 +55,18 @@ ("mM" "Make Model" artisan-make-model-transient) ("mf" "Make Factory" artisan-make-factory-transient)]) +(defconst chanced-backend-container-name "social-containers-chanced-1") + (defun artisan-create-saloon-connector (integration name) "Create a new saloon connector. INTEGRATION is the related integration. NAME is the name of the saloon connector." (interactive "MIntegration: \nMName: ") (let ((default-directory (expand-file-name "chanced" (project-root (project-current))))) - (shell-command (format "docker exec chanced-backend php artisan saloon:connector %s %s" (shell-quote-argument integration) (shell-quote-argument name))) + (shell-command (format "docker exec %s php artisan saloon:connector %s %s" + chanced-backend-container-name + (shell-quote-argument integration) + (shell-quote-argument name))) (let* ((root (project-root (project-current))) (bad-file-name (expand-file-name (format "chanced/app/Http/Integrations/%s/%s.php" integration name) root)) (good-file-name (expand-file-name (format "common/app/Http/Integrations/%s/%s.php" integration name) root))) @@ -76,7 +81,10 @@ INTEGRATION is the related integration. NAME is the name of the saloon connector." (interactive "MIntegration: \nMName: ") (let ((default-directory (expand-file-name "chanced" (project-root (project-current))))) - (shell-command (format "docker exec chanced-backend php artisan saloon:request %s %s" (shell-quote-argument integration) (shell-quote-argument name))) + (shell-command (format "docker exec %s php artisan saloon:request %s %s" + chanced-backend-container-name + (shell-quote-argument integration) + (shell-quote-argument name))) (let* ((root (project-root (project-current))) (bad-file-name (expand-file-name (format "chanced/app/Http/Integrations/%s/Requests/%s.php" integration name) root)) (good-file-name (expand-file-name (format "common/app/Http/Integrations/%s/Requests/%s.php" integration name) root))) @@ -91,7 +99,9 @@ INTEGRATION is the related integration. NAME is the name of the saloon connector." (interactive "MName: ") (let ((default-directory (expand-file-name "chanced" (project-root (project-current))))) - (shell-command (format "docker exec chanced-backend php artisan make:settings-migration %s ../common/database/settings/" (shell-quote-argument name))))) + (shell-command (format "docker exec %s php artisan make:settings-migration %s ../common/database/settings/" + chanced-backend-container-name + (shell-quote-argument name))))) (defun artisan-punt-composer-install () (interactive) @@ -103,9 +113,9 @@ connector." (list (oni-read-brand))) (mapcar (lambda (b) (let ((default-directory (expand-file-name b (project-root (project-current)))) - (containers '(("chanced" . "chanced-backend") - ("punt" . "punt-backend") - ("filament" . "chanced-admin-panel")))) + (containers '(("chanced" . "social-containers-chanced-1") + ("punt" . "social-containers-punt-1") + ("filament" . "social-containers-filament-1")))) (async-shell-command (format "docker exec -it %s composer install --no-interaction --no-progress" (map-elt containers b)) (get-buffer-create (format "*%s-composer*" (upcase b)))))) (if (string= brand "all") '("chanced" "punt" "filament") (list brand)))) @@ -122,7 +132,9 @@ connector." (list (read-string "Command: "))) (let ((default-directory (expand-file-name "chanced" (project-root (project-current))))) - (async-shell-command (format "docker exec -it chanced-backend php artisan %s" command)))) + (async-shell-command (format "docker exec -it %s php artisan %s" + chanced-backend-container-name + command)))) (defun artisan-punt-migrate () (interactive) @@ -132,7 +144,7 @@ connector." (defun artisan-chanced-migrate (&optional reverse?) (interactive "P") (let ((default-directory (expand-file-name "chanced" (project-root (project-current))))) - (async-shell-command (concat "docker exec -it chanced-backend php artisan migrate" + (async-shell-command (concat "docker exec -it " chanced-backend-container-name " php artisan migrate" (if reverse? ":rollback" ""))))) ;; (transient-define-prefix artisan-test-transient () @@ -273,7 +285,9 @@ Optional argument STOPP means stop on any defect." (interactive "MName: ") (let ((default-directory (expand-file-name "chanced" (project-root (project-current))))) (shell-command - (format "docker exec chanced-backend php artisan make:migration --path=../common/database/migrations %S" name)) + (format "docker exec %s php artisan make:migration --path=../common/database/migrations %S" + chanced-backend-container-name + name)) (find-file (car (directory-files (expand-file-name "common/database/migrations" (project-root (project-current))) t (rx "_" (literal name) ".php")))) (vc-register))) @@ -299,7 +313,8 @@ Optional argument STOPP means stop on any defect." (factoryp (transient-arg-value "--factory" args)) (migrationp (transient-arg-value "--migration" args))) (shell-command - (format "docker exec chanced-backend php artisan make:model %s %s -- %S" + (format "docker exec %s php artisan make:model %s %s -- %S" + chanced-backend-container-name (if factoryp "--factory" "") (if migrationp "--migration" "") name)) @@ -350,7 +365,10 @@ Optional argument STOPP means stop on any defect." (bad-file-name (expand-file-name (format "chanced/database/factories/%sFactory.php" name) root)) (good-file-name (expand-file-name (format "common/database/factories/%sFactory.php" name) root))) (shell-command - (format "docker exec chanced-backend php artisan make:factory -m %S %S" name name)) + (format "docker exec %s php artisan make:factory -m %S %S" + chanced-backend-container-name + name + name)) (rename-file bad-file-name good-file-name) (find-file good-file-name) (vc-register))) diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm index 553a954..56a7bf4 100644 --- a/oni/packages/emacs.scm +++ b/oni/packages/emacs.scm @@ -610,7 +610,7 @@ dot-separated path form like @code{jobs.build.docker} and (license license:gpl3)))) (define-public emacs-yoshi-theme - (let ((commit "0a015799c062c79735f6d7ce762f770859aa8658") + (let ((commit "1268c11f9278743693044e179cfa3328c4b16a49") (revision "0")) (package (name "emacs-yoshi-theme") @@ -623,7 +623,7 @@ dot-separated path form like @code{jobs.build.docker} and (method git-fetch) (file-name (git-file-name name version)) (sha256 - (base32 "18b1kzdipy2kvlkmhvhnxjq84zwa5623n9zz05z1m8278a1zjprn")))) + (base32 "1gfar1h1q8qd638hijwm2fz9ygr8wph6wdvmck2wm6ddxsrbhz20")))) (build-system emacs-build-system) (arguments `(#:include '("icons/*" . ,%default-include))) |