summaryrefslogtreecommitdiff
path: root/deployment/systems
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/systems')
-rw-r--r--deployment/systems/aisaka.scm127
1 files changed, 2 insertions, 125 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm
index 9718056..ab00698 100644
--- a/deployment/systems/aisaka.scm
+++ b/deployment/systems/aisaka.scm
@@ -255,129 +255,6 @@
(admin-pubkey (plain-file "gitolite-admin.pub"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n")))))
-(define (home-services)
- (use-modules (channels)
- (gnu home services)
- (gnu packages base)
- (gnu packages emacs-xyz)
- (gnu packages gawk)
- (guix build-system emacs)
- (guix git-download)
- ((guix licenses)
- #:prefix license:))
- ((@ (gnu services) service)
- (@ (gnu services guix) guix-home-service-type)
- `(("marek" ,((@ (gnu home) home-environment)
- (packages (map specification->package+output
- (list "dconf-editor"
- "emacs"
- "emacs-org-modern"
- "emacs-org-roam"
- "emacs-paredit"
- "git"
- "gnupg"
- "gnome-tweaks"
- "noweb"
- "pinentry"
- "pwgen"
- "unzip"
- "zip")))
- (services (append suweren:home:%suweren-home-services
- ;; (list izumi-channels-service-type)
- (list
- (gnu:services:simple-service
- 'emacs-home-profile
- home-profile-service-type
- (append
- (list emacs-guix emacs-nix-mode)
- (list
- (let
- ((commit* "wip-algo-tn"))
- ((@ (guix packages) package)
- (name "emacs-org-fc")
- (version (git-version "0.1.2" "0" commit*))
- (source
- ((@ (guix packages) origin)
- (method git-fetch)
- (uri
- ((@ (guix git-download) git-reference)
- (url "https://git.marekpasnikowski.pl/org-fc.git")
- (commit commit*)))
- (file-name (git-file-name name version))
- (sha256 ((@ (guix packages) base32)
- '"1i8ii1garx2pdg08a12yzsd0fhwdzcpxp9m97zj8m5s275i8ccaj"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:include ((@ (guix gexp) gexp)
- (cons* "\\.awk$" "\\.org$" %default-include))
- #:exclude ((@ (guix gexp) gexp)
- (cons "^test/" %default-exclude))
- #:tests? #t
- #:test-command
- ((@ (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
- ((@ (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")
- (synopsis "Spaced repetition system for Emacs Org mode")
- (description
- (string-append
- "Org-fc is a spaced-repetition system for Emacs' Org mode.\n"
- "It allows you to mark headlines in a file as flashcards, turning pieces of\n"
- "knowledge you want to learn into a question-answer test. These cards are\n"
- "reviewed at regular interval. After each review, the next review interval is\n"
- "calculated based on how well you remembered the contents of the card.\n"))
- (license license:gpl3+))))))
- (gnu:services:simple-service 'home-files
- home-files-service-type
- (list (list ".gitconfig"
- ((@ (guix gexp) local-file)
- "gitconfig"))
- (list ".config/git/ignore"
- ;; https://github.com/github/gitignore/blob/main/Global/Emacs.gitignore
- ((@ (guix gexp) local-file)
- "git-ignore.conf"))))
- (gnu:services:simple-service
- 'environment-variables
- home-environment-variables-service-type
- `(("EDITOR" . "emacsclient -nw")))))))))))
-
(define system-keyboard-layout
((@ (gnu system keyboard) keyboard-layout)
"pl"))
@@ -503,7 +380,7 @@
(list users:id1000:dkim-service
users:id1000:dovecot-service
users:id1000:smtp-service
- (service gnu:services:dns:knot-service-type
+ (gnu:services:service gnu:services:dns:knot-service-type
(gnu:services:dns:knot-configuration
(listen-v4 "192.168.10.2")
(zones (list master-zone))))
@@ -512,7 +389,7 @@
(etc-mailname)
(fcgiwrap)
(gitolite)
- (home-services)
+ (sovereign:systems:guix-home-service (list users:id1000:name/home-environment))
(nginx-izumi)
(openssh)
(radicale)))