diff options
| -rw-r--r-- | src/guix/packages.scm | 3 | ||||
| -rw-r--r-- | src/guix/system.scm | 30 |
2 files changed, 16 insertions, 17 deletions
diff --git a/src/guix/packages.scm b/src/guix/packages.scm index 31bdaca..daf5246 100644 --- a/src/guix/packages.scm +++ b/src/guix/packages.scm @@ -1,6 +1,5 @@ (define-module (packages) #:use-module ((org euandre packages) #:prefix pkg:) - #:use-module ((org euandre services) #:prefix serv:) #:use-module (gnu) #:use-module (guix packages) #:use-module (guix utils)) @@ -10,7 +9,7 @@ (define (cat name s) (string-trim-right - (serv:slurp + (pkg:slurp (string-append "src/versions/" name "/" s)))) (define (go-latest package) diff --git a/src/guix/system.scm b/src/guix/system.scm index bb0faee..9e06878 100644 --- a/src/guix/system.scm +++ b/src/guix/system.scm @@ -1,8 +1,8 @@ (use-modules ((srfi srfi-1) #:prefix s1:) ((xyz euandreh heredoc) #:prefix heredoc:) + ((org euandre packages) #:prefix pkg:) ((org euandre queue) #:prefix q:) - ((org euandre services) #:prefix serv:) (gnu)) (use-package-modules version-control) @@ -20,7 +20,7 @@ (define (path s) ;; src/guix/system.scm + ../../../ = ./ - (serv:str (dirname (dirname (dirname (current-filename)))) "/" s)) + (string-append (dirname (dirname (dirname (current-filename)))) "/" s)) (define +users+ `(("andre" "EuAndreh" ("wheel") ,(path "src/keys/SSH/andre.pub.txt")))) @@ -33,11 +33,11 @@ (define file - (compose serv:slurp path)) + (compose pkg:slurp path)) (define +tld+ ((compose string-trim-right - serv:slurp + pkg:slurp path) "src/config/tld.txt")) @@ -56,24 +56,24 @@ (locale "en_GB.UTF-8") (timezone "America/Sao_Paulo") (host-name +tld+) - (skeletons serv:skeletons) - (users (append (serv:user-accounts +users+) %base-user-accounts)) - (packages (serv:package-set package-symbols package-records)) + (skeletons pkg:skeletons) + (users (append (pkg:user-accounts +users+) %base-user-accounts)) + (packages (pkg:package-set package-symbols package-records)) (services (append (list (service ntp-service-type) (service dhcp-client-service-type) (service fail2ban-service-type) - (service serv:binder-service-type (serv:binder-configuration (package packages:binder))) - (service serv:glaze-service-type (serv:glaze-configuration (package packages:glaze))) - (service serv:untls-service-type (serv:untls-configuration (package packages:untls))) - (service serv:wscat-service-type (serv:wscat-configuration (package packages:wscat))) - (service serv:papod-service-type (serv:papod-configuration (package packages:papod))) - (service openssh-service-type (q:openssh-default-configuration (serv:users->keys +users+))) + (service pkg:binder-service-type (pkg:binder-configuration (package packages:binder))) + (service pkg:glaze-service-type (pkg:glaze-configuration (package packages:glaze))) + (service pkg:untls-service-type (pkg:untls-configuration (package packages:untls))) + (service pkg:wscat-service-type (pkg:wscat-configuration (package packages:wscat))) + (service pkg:papod-service-type (pkg:papod-configuration (package packages:papod))) + (service openssh-service-type (q:openssh-default-configuration (pkg:users->keys +users+))) (service certbot-service-type (q:tld-certbot-configuration +tld+)) (service cgit-service-type q:cgit-pre-configuration) - (service serv:syskeep-service-type) + (service pkg:syskeep-service-type) (service q:shadow-group-service-type) (service q:dkimproxyout-service-type) (service q:cyrus-sasl-service-type) @@ -128,7 +128,7 @@ (service mail-aliases-service-type `(("root" "andre") ("support" ,@(map s1:first +users+))))) - serv:base-services)) + pkg:base-services)) (bootloader (bootloader-configuration (bootloader grub-bootloader) |