diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-09 13:13:03 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-09 13:13:03 +0200 |
| commit | 5e7d7e50e5e9b167c50d223dbc28967802b5cb8d (patch) | |
| tree | 18191ba66acf6630ae9b87cf0fffc64f18cbbfc0 /systems | |
| parent | eb93dbab6a0dd995fdfb77a7fb4cfbad81a61ce3 (diff) | |
refactor(izumi): localize imports of module (guix gexp)
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/izumi/izumi.scm | 104 |
1 files changed, 55 insertions, 49 deletions
diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm index 0c3574b..3a0b996 100644 --- a/systems/izumi/izumi.scm +++ b/systems/izumi/izumi.scm @@ -3,14 +3,14 @@ (define radicale-keys "/secrets/radicale/keys") (define dovecot-keys "/secrets/dovecot") -(use-modules (guix gexp) - (guix git-download) +(use-modules (guix git-download) ((guix licenses) #:prefix license:) (guix packages)) (define (nginx-accounts) - (use-modules (gnu packages)) + (use-modules (gnu packages) + (guix gexp)) (list ((@ (gnu system accounts) user-group) (name "nginx") (system? #t)) @@ -69,10 +69,10 @@ (deploy-hook (program-file "nginx-deploy-hook" - #~ - (let - ((pid (call-with-input-file "/var/run/nginx/pid" read))) - (kill pid SIGHUP)))) + ((@ (guix gexp) gexp) + (let + ((pid (call-with-input-file "/var/run/nginx/pid" read))) + (kill pid SIGHUP))))) (domains (list "marekpasnikowski.pl" @@ -251,47 +251,49 @@ (build-system emacs-build-system) (arguments (list - #:include #~ (cons* "\\.awk$" "\\.org$" %default-include) - #:exclude #~ (cons "^test/" %default-exclude) + #:include ((@ (guix gexp) gexp) + (cons* "\\.awk$" "\\.org$" %default-include)) + #:exclude ((@ (guix gexp) gexp) + (cons "^test/" %default-exclude)) #:tests? #t #:test-command - #~ - (list - "emacs" - "--batch" - "-L" "." - "-L" "tests/" - "-l" "tests/org-fc-filter-test.el" - "-l" "tests/org-fc-indexer-test.el" - "-l" "tests/org-fc-review-data-test.el" - "-f" "ert-run-tests-batch-and-exit") + ((@ (guix gexp) gexp) + (list + "emacs" + "--batch" + "-L" "." + "-L" "tests/" + "-l" "tests/org-fc-filter-test.el" + "-l" "tests/org-fc-indexer-test.el" + "-l" "tests/org-fc-review-data-test.el" + "-f" "ert-run-tests-batch-and-exit")) #:phases - #~ - (modify-phases - %standard-phases - (add-after - 'unpack - 'qualify-paths - (lambda* - (#:key inputs - #:allow-other-keys) - (substitute* - "org-fc-awk.el" - (("\"find ") - (string-append - "\"" - (search-input-file inputs "/bin/find") - " ")) - (("\"gawk ") - (string-append - "\"" - (search-input-file inputs "/bin/gawk") - " ")) - (("\"xargs ") - (string-append - "\"" - (search-input-file inputs "/bin/xargs") - " ")))))))) + ((@ (guix gexp) gexp) + (modify-phases + %standard-phases + (add-after + 'unpack + 'qualify-paths + (lambda* + (#:key inputs + #:allow-other-keys) + (substitute* + "org-fc-awk.el" + (("\"find ") + (string-append + "\"" + (search-input-file inputs "/bin/find") + " ")) + (("\"gawk ") + (string-append + "\"" + (search-input-file inputs "/bin/gawk") + " ")) + (("\"xargs ") + (string-append + "\"" + (search-input-file inputs "/bin/xargs") + " "))))))))) (inputs (list findutils gawk)) (propagated-inputs (list emacs-hydra)) (home-page "https://www.leonrische.me/fc/index.html") @@ -307,14 +309,18 @@ (simple-service 'home-files home-files-service-type (list (list ".config/emacs/init.el" - (local-file "home-files/emacs-configuration.el" )) + ((@ (guix gexp) local-file) + "home-files/emacs-configuration.el" )) (list ".gnus" - (local-file "home-files/gnus-configuration.el")) + ((@ (guix gexp) local-file) + "home-files/gnus-configuration.el")) (list ".gitconfig" - (local-file "home-files/gitconfig")) + ((@ (guix gexp) local-file) + "home-files/gitconfig")) (list ".config/git/ignore" ;; https://github.com/github/gitignore/blob/main/Global/Emacs.gitignore - (local-file "home-files/git-ignore.conf")))) + ((@ (guix gexp) local-file) + "home-files/git-ignore.conf")))) (simple-service 'environment-variables home-environment-variables-service-type |