diff options
Diffstat (limited to 'tw/home/cern.scm')
| -rw-r--r-- | tw/home/cern.scm | 53 |
1 files changed, 22 insertions, 31 deletions
diff --git a/tw/home/cern.scm b/tw/home/cern.scm index ee897b5d..57232288 100644 --- a/tw/home/cern.scm +++ b/tw/home/cern.scm @@ -5,54 +5,47 @@ ;; See the "Replicating Guix" section in the manual. (define-module (tw home cern) - #:use-module ((gnu) - #:select (use-package-modules)) #:use-module (gnu home) #:use-module (gnu home services) #:use-module (gnu home services desktop) #:use-module (gnu home services guix) - #:use-module (gnu home services mcron) #:use-module (gnu home services pm) #:use-module (gnu packages) + #:use-module (gnu packages calendar) + #:use-module (gnu packages dav) + #:use-module (gnu packages mail) + #:use-module (gnu packages web-browsers) #:use-module (gnu services) #:use-module (guix gexp) - #:use-module ((nongnu packages messaging) - #:select (zoom)) #:use-module (tw home) - #:use-module (tw packages alice) - #:use-module (tw packages ci) - #:use-module (tw packages catppuccin) - #:use-module (tw packages mail) - #:use-module (tw packages xorg) #:use-module (tw gexp) + #:use-module ((tw packages mail) #:select (mutt_oauth2.py)) #:use-module (tw services desktop) #:use-module (tw services git) - #:use-module (tw services gnupg) - #:use-module (tw theme)) - -(use-package-modules calendar dav mail web-browsers xdisorg xorg) - -(define pim-packages - (list vdirsyncer khal khard aerc lynx mutt_oauth2.py)) ; lynx for HTML mail - -(define pim-services - (list - (simple-service 'pim-config home-xdg-configuration-files-service-type - `(("aerc/accounts.conf" ,(local-file "files/aerc/accounts.work.conf")) - ("aerc/aerc.conf" ,(local-file "files/aerc/aerc.conf")) - ("aerc/binds.conf" ,(local-file "files/aerc/binds.conf")) - ("aerc/filters" ,(local-file "files/aerc/filters" #:recursive? #t)) - ("aerc/stylesets" ,(local-file "files/aerc/stylesets" #:recursive? #t)))))) + #:use-module (tw services gnupg)) (define-public %cern-home (home-environment (packages ;; These packages will show up in the home profile, under ~/.guix-home/profile. - (append %common-packages %interactive-packages pim-packages)) + (list vdirsyncer khal khard aerc lynx mutt_oauth2.py)) ; lynx for HTML mail ;; To search for available home services, run 'guix home search KEYWORD'. (services - (cons* + (list + (service tw-home-service-type + (tw-home-configuration + (pim? #f))) + + ;; Configure PIM services "manually" because we don't want all of them + ;; (such as the newsreader) and we need to use different aerc accounts. + (simple-service 'pim-config home-xdg-configuration-files-service-type + `(("aerc/accounts.conf" ,(local-file "files/aerc/accounts.work.conf")) + ("aerc/aerc.conf" ,(local-file "files/aerc/aerc.conf")) + ("aerc/binds.conf" ,(local-file "files/aerc/binds.conf")) + ("aerc/filters" ,(local-file "files/aerc/filters" #:recursive? #t)) + ("aerc/stylesets" ,(local-file "files/aerc/stylesets" #:recursive? #t)))) + (simple-service 'remote-desktop-config home-files-service-type `((".local/share/vinagre/vinagre-bookmarks.xml" ,(local-file "files/vinagre-bookmarks.xml")))) @@ -95,8 +88,6 @@ (service home-gnupg-service-type (home-gnupg-configuration (default-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C") - (gui-pinentry? #t))) - - (append %common-services (interactive-services) pim-services))))) + (gui-pinentry? #t))))))) %cern-home |