diff options
author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-06 21:29:40 +0200 |
---|---|---|
committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-06 21:29:40 +0200 |
commit | 158b536ed36a55c0ebbe055f31b227f7ab38c75b (patch) | |
tree | 5a391a99e8f6866efd552a8aa83d831f6232c975 /systems | |
parent | 993b37763bfa5401c0ff97111883a7f04ced033a (diff) |
refactor(ayase): add ibus:doc to gc-workaround, remove tabs
Diffstat (limited to 'systems')
-rw-r--r-- | systems/ayase.scm | 81 |
1 files changed, 42 insertions, 39 deletions
diff --git a/systems/ayase.scm b/systems/ayase.scm index 49c6b95..1c14e8d 100644 --- a/systems/ayase.scm +++ b/systems/ayase.scm @@ -11,8 +11,8 @@ (define (label number) ((@ (gnu system file-systems) file-system-label) (string-append host-name - "-swap" - number))) + "-swap" + number))) (define root-filesystem-uuid ((@ (gnu system file-systems) uuid) @@ -27,21 +27,24 @@ (type "vfat"))) (define (gc-workaround-service) - (use-modules (gnu packages bootloaders) - (gnu packages ibus) - (gnu packages python-build) - (gnu packages ruby) - (gnu services)) - (simple-service 'gc-workaround - profile-service-type - (list grub - ibus - python-pip - ruby))) + (use-modules (gnu packages) + (gnu packages bootloaders) + (gnu packages ibus) + (gnu packages python-build) + (gnu packages ruby) + (gnu services)) + (let ((ibus-doc (specification->package+output "ibus" "doc"))) + (simple-service 'gc-workaround + profile-service-type + (list grub + ibus + ibus-doc + python-pip + ruby)))) (define (home-services) (use-modules (gnu services guix) - (users id1000)) + (users id1000)) (let ((uid1000-home-environment* (uid1000-home-environment host-name))) ((@ (gnu services) service) guix-home-service-type @@ -79,19 +82,19 @@ (define (system-packages-service) (use-modules (gnu packages gnome) - (gnu packages gnupg) - (gnu packages kde-pim) - (gnu services)) + (gnu packages gnupg) + (gnu packages kde-pim) + (gnu services)) (simple-service 'system-packages - profile-service-type - (list gnome-boxes - kgpg - pinentry-qt - pinentry-tty))) + profile-service-type + (list gnome-boxes + kgpg + pinentry-qt + pinentry-tty))) (define (tor-service) (use-modules (gnu services) - (gnu services networking)) + (gnu services networking)) ((@ (gnu services) service) tor-service-type)) @@ -107,18 +110,18 @@ (define (file-systems) (use-modules (gnu system file-systems)) (append %base-file-systems - (list root-partition - efi-partition))) + (list root-partition + efi-partition))) (define services (append (@ (suweren services) %distribution-services) - (list (gc-workaround-service) - (home-services) - (libvirt-service) - (openssh-service) - (system-packages-service) - (tor-service) - (virtlog-service)))) + (list (gc-workaround-service) + (home-services) + (libvirt-service) + (openssh-service) + (system-packages-service) + (tor-service) + (virtlog-service)))) (define swap-device-1 (swap-label "-1")) @@ -128,18 +131,18 @@ (define (users) (use-modules (gnu system accounts) - (users id1000)) + (users id1000)) (append (@ (gnu system shadow) %base-user-accounts) - (list uid1000-account))) + (list uid1000-account))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (operating-system*) (use-modules (nongnu packages linux) - (nongnu system linux-initrd) - (gnu system keyboard) - (suweren commons sudoers) - (suweren system)) + (nongnu system linux-initrd) + (gnu system keyboard) + (suweren commons sudoers) + (suweren system)) ((@ (gnu system) operating-system) (kernel linux) (bootloader (bootloader)) @@ -149,7 +152,7 @@ (host-name host-name) (file-systems (file-systems)) (swap-devices (list swap-device-1 - swap-device-2)) + swap-device-2)) (users (users)) (timezone "Europe/Warsaw") (locale polish-locale-string) |