From 6c25a2f8f115ec2d29557ca7731d41ee4866ed1e Mon Sep 17 00:00:00 2001 From: vin Date: Tue, 14 Apr 2026 11:52:16 -0400 Subject: reindent files --- epistemia/packages/emacs.scm | 4 +- epistemia/packages/firmware.scm | 20 +++---- epistemia/packages/xorg.scm | 120 +++++++++++++++++++------------------- epistemia/services/age-secret.scm | 10 ++-- 4 files changed, 77 insertions(+), 77 deletions(-) diff --git a/epistemia/packages/emacs.scm b/epistemia/packages/emacs.scm index dc64eee..0488898 100644 --- a/epistemia/packages/emacs.scm +++ b/epistemia/packages/emacs.scm @@ -15,8 +15,8 @@ (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ogdenwebb/emacs-kaolin-themes") - (commit (string-append "v" version)))) + (url "https://github.com/ogdenwebb/emacs-kaolin-themes") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1lbqvs2jqvs6x8gj7bali24mw2fl6gk184zln6avy6wmam7n8dqi")))) diff --git a/epistemia/packages/firmware.scm b/epistemia/packages/firmware.scm index 6fa49b5..0438b44 100644 --- a/epistemia/packages/firmware.scm +++ b/epistemia/packages/firmware.scm @@ -12,10 +12,10 @@ ;; originally from guix upstream, but it's old and only for avr (define* (make-qmk-firmware-rp2040 keyboard keymap - #:key (description "") - keymap-json - keymap-source-directory - keyboard-source-directory) + #:key (description "") + keymap-json + keymap-source-directory + keyboard-source-directory) "Return a package to build the QMK firmware for KEYBOARD with KEYMAP. Keyboard should be the name of a sub-directory under the @file{keyboards} directory. For custom keymaps, KEYMAP-JSON, a file-like object of a JSON representation of @@ -34,8 +34,8 @@ keyboard definition in KEYBOARD-SOURCE-DIRECTORY." (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/qmk/qmk_firmware") - (commit version))) + (url "https://github.com/qmk/qmk_firmware") + (commit version))) (file-name (git-file-name "qmk-firmware" version)) (sha256 (base32 @@ -72,8 +72,8 @@ keyboard definition in KEYBOARD-SOURCE-DIRECTORY." (origin (method git-fetch) (uri (git-reference - (url "https://github.com/qmk/chibios") - (commit commit))) + (url "https://github.com/qmk/chibios") + (commit commit))) (file-name (git-file-name "chibios" commit)) (sha256 (base32 @@ -137,10 +137,10 @@ staggered keys and 3 thumb keys.")) (define-public qmk-ferris-sweep (make-qmk-firmware-rp2040 "ferris/sweep" "default" #:description - "The default keymap for the Ferris Sweep keyboard, a version of the + "The default keymap for the Ferris Sweep keyboard, a version of the Ferris 3x5+2 split keyboard with a daughterboard for MCU.")) (define-public qmk-ploopy-adept (make-qmk-firmware-rp2040 "ploopyco/madromys" "default" #:description - "The default keymap for the Ploopy Adept open-hardware programmable + "The default keymap for the Ploopy Adept open-hardware programmable trackball mouse.")) diff --git a/epistemia/packages/xorg.scm b/epistemia/packages/xorg.scm index bc2ec0f..05b63f1 100644 --- a/epistemia/packages/xorg.scm +++ b/epistemia/packages/xorg.scm @@ -7,63 +7,63 @@ (define-public xorg-server-with-drivers (package - (inherit xorg-server) - (name "xorg-server-with-drivers") - (arguments - (substitute-keyword-arguments (package-arguments xorg-server) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'install 'install-modules-conf - (lambda _ - ;; Add Xorg module paths so drivers in inputs are found. - (call-with-output-file - (string-append #$output "/share/X11/xorg.conf.d/00-modules.conf") - (lambda (port) - (display - (string-append - "Section \"Files\"\nModulePath \"" - #$output "/lib/xorg/modules," - #$(this-package-input "xf86-input-libinput") "/lib/xorg/modules," - #$(this-package-input "xf86-input-wacom") "/lib/xorg/modules," - #$(this-package-input "xf86-video-amdgpu") "/lib/xorg/modules\"\n" - "EndSection\n") - port))) - (call-with-output-file - (string-append #$output "/share/X11/xorg.conf.d/10-input.conf") - (lambda (port) - (display - (string-append - "Section \"InputClass\"\n" - " Identifier \"keyboards\"\n" - " MatchIsKeyboard \"on\"\n" - " Driver \"libinput\"\n" - "EndSection\n" - "\n" - "Section \"InputClass\"\n" - " Identifier \"mice\"\n" - " MatchIsPointer \"on\"\n" - " Driver \"libinput\"\n" - " Option \"AccelProfile\" \"flat\"\n" - " Option \"AccelSpeed\" \"0\"\n" - "EndSection\n" - "\n" - "Section \"InputClass\"\n" - " Identifier \"touchpads\"\n" - " MatchIsTouchpad \"on\"\n" - " Driver \"libinput\"\n" - " Option \"AccelProfile\" \"flat\"\n" - " Option \"AccelSpeed\" \"0\"\n" - " Option \"Tapping\" \"on\"\n" - " Option \"TappingButtonMap\" \"lrm\"\n" - "EndSection\n" - "\n" - "Section \"InputClass\"\n" - " Identifier \"wacom\"\n" - " MatchProduct \"Wacom\"\n" - " Driver \"wacom\"\n" - "EndSection\n") - port))))))))) - (inputs (modify-inputs (package-inputs xorg-server) - (append xf86-input-libinput - xf86-input-wacom - xf86-video-amdgpu))))) + (inherit xorg-server) + (name "xorg-server-with-drivers") + (arguments + (substitute-keyword-arguments (package-arguments xorg-server) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'install 'install-modules-conf + (lambda _ + ;; Add Xorg module paths so drivers in inputs are found. + (call-with-output-file + (string-append #$output "/share/X11/xorg.conf.d/00-modules.conf") + (lambda (port) + (display + (string-append + "Section \"Files\"\nModulePath \"" + #$output "/lib/xorg/modules," + #$(this-package-input "xf86-input-libinput") "/lib/xorg/modules," + #$(this-package-input "xf86-input-wacom") "/lib/xorg/modules," + #$(this-package-input "xf86-video-amdgpu") "/lib/xorg/modules\"\n" + "EndSection\n") + port))) + (call-with-output-file + (string-append #$output "/share/X11/xorg.conf.d/10-input.conf") + (lambda (port) + (display + (string-append + "Section \"InputClass\"\n" + " Identifier \"keyboards\"\n" + " MatchIsKeyboard \"on\"\n" + " Driver \"libinput\"\n" + "EndSection\n" + "\n" + "Section \"InputClass\"\n" + " Identifier \"mice\"\n" + " MatchIsPointer \"on\"\n" + " Driver \"libinput\"\n" + " Option \"AccelProfile\" \"flat\"\n" + " Option \"AccelSpeed\" \"0\"\n" + "EndSection\n" + "\n" + "Section \"InputClass\"\n" + " Identifier \"touchpads\"\n" + " MatchIsTouchpad \"on\"\n" + " Driver \"libinput\"\n" + " Option \"AccelProfile\" \"flat\"\n" + " Option \"AccelSpeed\" \"0\"\n" + " Option \"Tapping\" \"on\"\n" + " Option \"TappingButtonMap\" \"lrm\"\n" + "EndSection\n" + "\n" + "Section \"InputClass\"\n" + " Identifier \"wacom\"\n" + " MatchProduct \"Wacom\"\n" + " Driver \"wacom\"\n" + "EndSection\n") + port))))))))) + (inputs (modify-inputs (package-inputs xorg-server) + (append xf86-input-libinput + xf86-input-wacom + xf86-video-amdgpu))))) diff --git a/epistemia/services/age-secret.scm b/epistemia/services/age-secret.scm index 70d2b9f..e2ee502 100644 --- a/epistemia/services/age-secret.scm +++ b/epistemia/services/age-secret.scm @@ -78,11 +78,11 @@ (define (age-secret-shepherd-service config) (list (shepherd-service - (provision '(age-secret)) - (requirement '()) - (one-shot? #t) - (start #~(lambda () #t)) - (documentation "Age secret decryption marker service.")))) + (provision '(age-secret)) + (requirement '()) + (one-shot? #t) + (start #~(lambda () #t)) + (documentation "Age secret decryption marker service.")))) (define age-secret-service-type (service-type -- cgit v1.2.3