Reformat files using ‘guix-pretty-print-buffer’

author: Tom Willemse 2026-01-17 12:29:08 -0800
committer: Tom Willemse 2026-01-18 01:07:32 -0800
commit: 3ca6f519c9dfd164c06e45f404490b287d0b501c (patch)
tree: 12b0ec531e698d11307d7d99c5943af443e72732 /oni
parent: 1d1bddee77c43d04ea474f3e0c4d7cfa6b5712bb (diff)
download: new-dotfiles-3ca6f519c9dfd164c06e45f404490b287d0b501c.tar.gz
new-dotfiles-3ca6f519c9dfd164c06e45f404490b287d0b501c.zip
15 files changed, 569 insertions, 600 deletions
diff --git a/oni/home/config/common.scm b/oni/home/config/common.scm
index f41b826..3593a11 100644
--- a/oni/home/config/common.scm
+++ b/oni/home/config/common.scm
@@ -55,9 +55,12 @@
                ((mod4 k) . "hersbtclient close")
                ((mod4 mod1 k) . "herbstclient remove")
                ((mod4 Return) . "herbstclient spawn kitty")
-               ((mod4 t) . "herbstclient spawn hlwm-run-or-raise \"\\(URxvt\\|Hyper\\|kitty\\)\" kitty")
-               ((mod4 b) . "herbstclient spawn hlwm-run-or-raise \"\\(Conkeror\\|[Ff]irefox\\|Chromium\\|Next\\|qutebrowser\\)\" firefox")
-               ((mod4 e) . "herbstclient spawn hlwm-run-or-raise Emacs emacsclient --create-frame")
+               ((mod4 t)
+                . "herbstclient spawn hlwm-run-or-raise \"\\(URxvt\\|Hyper\\|kitty\\)\" kitty")
+               ((mod4 b)
+                . "herbstclient spawn hlwm-run-or-raise \"\\(Conkeror\\|[Ff]irefox\\|Chromium\\|Next\\|qutebrowser\\)\" firefox")
+               ((mod4 e)
+                . "herbstclient spawn hlwm-run-or-raise Emacs emacsclient --create-frame")
                ((control mod1 l) . "herbstclient spawn i3lock --color=000000")
                ((mod4 x) . "herbstclient spawn hlwm-switch-tags")
                ((mod4 shift b) . "herbstclient shift left")
@@ -76,7 +79,8 @@
                ((mod4 f) . "herbstclient cycle_layout 1 vertical max")
                ((mod4 m) . "herbstclient fullscreen toggle")
                ((mod4 p) . "herbstclient pseudotile toggle")
-               ((mod4 space) . "herbstclient or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1")
+               ((mod4 space)
+                . "herbstclient or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1")
                ((mod4 BackSpace) . "herbstclient cycle_monitor")
                ((mod4 u) . "herbstclient jumpto urgent")
                ((mod4 c)
@@ -107,9 +111,9 @@
             (extra '("remove Mod5 = ISO_Level3_Shift"
                      "keycode 108 = Alt_L"
                      "add Mod1 = Alt_L"
-		     "remove mod4 = Super_R"
-		     "keycode 134 = Hyper_R"
-		     "add mod3 = Hyper_R")))))
+		             "remove mod4 = Super_R"
+		             "keycode 134 = Hyper_R"
+		             "add mod3 = Hyper_R")))))
 
 (define home-openssh-service
   (service home-openssh-service-type
@@ -188,7 +192,8 @@ LocalForward 19999 localhost:19999"))
                (map . "alt+0 close_window")
                ;; Find any "View build log messages" from guix and open the
                ;; build log in Emacs.
-               (map . "ctrl+shift+g kitten hints --type=regex --regex=\\\"View build log at '([^']+)'\\.\\\" --program=\\\"emacsclient\\\"")
+               (map
+                . "ctrl+shift+g kitten hints --type=regex --regex=\\\"View build log at '([^']+)'\\.\\\" --program=\\\"emacsclient\\\"")
                (map . "alt+o next_window"))))))
 
 (define home-channels-service
@@ -334,7 +339,8 @@ LocalForward 19999 localhost:19999"))
                    (".zsh/functions/unzip"
                     ,(local-file "../../../zsh/.zsh/functions/unzip"))
                    (".zsh/functions/x-copy-region-as-kill"
-                    ,(local-file "../../../zsh/.zsh/functions/x-copy-region-as-kill"))
+                    ,(local-file
+                      "../../../zsh/.zsh/functions/x-copy-region-as-kill"))
                    (".zsh/functions/x-kill-region"
                     ,(local-file "../../../zsh/.zsh/functions/x-kill-region"))
                    (".zsh/functions/x-yank"
diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm
index 860d4c5..2738f64 100644
--- a/oni/home/config/data.scm
+++ b/oni/home/config/data.scm
@@ -36,7 +36,6 @@
                           home-emacs-org-caldav-service-type
                           home-emacs-envrc-configuration))
   #:use-module (oni home services environment)
-  ;; #:use-module (oni home services herbstluftwm)
   #:use-module (oni home services kdeconnect)
   #:use-module ((oni home services mail)
                 #:select (home-mbsync-service-type))
@@ -48,7 +47,6 @@
   #:use-module (oni home services sawfish)
   #:use-module (oni home services syncthing)
   #:use-module (oni home services unclutter)
-  ;; #:use-module (oni home services xbindkeys)
   #:use-module ((oni home services xdisorg)
                 #:select (home-xss-lock-service-type))
   #:use-module (oni home services xsession)
@@ -95,7 +93,6 @@
                           emacs-oni-python
                           emacs-oni-yaml
                           emacs-oni-gnus))
-  ;; #:use-module (oni packages hlwm-run-or-raise)
   #:use-module (oni packages pick-random-wallpaper)
   #:use-module (oni packages sawfish)
   #:use-module (oni packages shutdown-rofi))
@@ -118,7 +115,6 @@
             (list (specification->package+output "font-fantasque-sans")
                   (specification->package+output "font-comic-neue")
                   font-dosis
-                  ;; hlwm-run-or-raise
                   pick-random-wallpaper
                   shutdown-rofi
                   emacs-sawfish
@@ -177,7 +173,6 @@
     home-rofi-default-service
     home-dunst-default-service
     home-redshift-service
-    ;; home-xbindkeys-service
     home-guile-service
     home-xmodmap-service
     home-openssh-service
@@ -195,74 +190,6 @@
                  "xrandr --auto\n"
                  "xrandr --dpi 96\n")))))
 
-    ;; (service home-herbstluftwm-service-type
-    ;;          (home-herbstluftwm-configuration
-    ;;           (tags '(dev web game))
-    ;;           (key-bindings
-    ;;            '(("s-S-q" . "quit")
-    ;;              ("s-S-e" . "reload")))
-    ;;           (mouse-bindings
-    ;;            '(("s-Button1" . "move")
-    ;;              ("s-Button2" . "zoom")
-    ;;              ("s-Button3" . "resize")))
-    ;;           (settings
-    ;;            '((default_frame_layout . 2)
-    ;;              (frame_border_active_color . "#3d3d3d")
-    ;;              (frame_border_normal_color . "#222222")
-    ;;              (frame_bg_normal_color . "#111111")
-    ;;              (frame_bg_active_color . "#263f1f")
-    ;;              (frame_border_width . 0)
-    ;;              (window_border_width . 2)
-    ;;              (window_border_inner_width . 0)
-    ;;              (window_border_normal_color . "#222222")
-    ;;              (window_border_active_color . "#1f3f3f")
-    ;;              (window_border_inner_color . "#111111")
-    ;;              (always_show_frame . 0)
-    ;;              (frame_gap . 30)
-    ;;              (window_gap . 30)
-    ;;              (frame_padding . -30)
-    ;;              (frame_bg_transparent . 1)
-    ;;              (smart_window_surroundings . 0)
-    ;;              (smart_frame_surroundings . 0)
-    ;;              (mouse_recenter_gap . 0)
-    ;;              (swap_monitors_to_get_tag . 0)
-    ;;              (update_dragged_clients . 1)
-    ;;              (tree_style . "╾│ ├└╼─┐")))
-    ;;           (attributes
-    ;;            '(((theme tiling reset) . 1)
-    ;;              ((theme floating reset) . 1)))
-    ;;           (rules
-    ;;            '(("focus=on")
-    ;;              ("class=Emacs" "tag=dev" "index=01" "switchtag=on" "hook=emacs")
-    ;;              ("class~'URxvt|kitty'" "tag=dev" "index=1" "switchtag=on" "hook=urxvt")
-    ;;              ("class~'Conkeror|[Ff]irefox|Chromium'" "tag=web" "index=0" "switchtag=on")
-    ;;              ("class=Pinentry" "pseudotile=on")
-    ;;              ("class=Alsaplayer" "pseudotile=on")
-    ;;              ("class=Gcr-prompter" "pseudotile=on")
-    ;;              ("class=Steam" "title='Steam Login'" "pseudotile=on")
-    ;;              ("class=Steam" "title~'Steam - News .*'" "pseudotile=on")
-    ;;              ("class=" "title=Steam" "pseudotile=on")
-    ;;              ("class=xfreerdp" "floating=on" "tag=work" "index=0" "switchtag=on")
-    ;;              ("windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)'" "pseudotile=on")
-    ;;              ("windowtype='_NET_WM_WINDOW_TYPE_DIALOG'" "focus=on")
-    ;;              ("windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)'" "manage=off")
-    ;;              ("class=pinball.exe" "pseudotile=on")))
-    ;;           (padding '(0 0 0 16 16))
-    ;;           (layouts
-    ;;            '((web clients max:0)
-    ;;              (dev split horizontal:0.54:1 (clients max:0) (clients vertical:0))))
-    ;;           (extra
-    ;;            (list
-    ;;             (mixed-text-file
-    ;;              "autostart"
-    ;;              "set_monitors 1920x1080+0+0\n"
-    ;;              "focus_edge left\n"
-    ;;              "keybind Mod4-apostrophe spawn dunstctl close\n"
-    ;;              "keybind Mod4-quotedbl spawn dunstctl close-all\n"
-    ;;              "keybind Mod4-Control-apostrophe spawn dunstctl history-pop\n"
-    ;;              "keybind Mod4-Mod1-apostrophe spawn dunstctl context\n"
-    ;;              "spawn pick-random-wallpaper\n")))))
-
     (service home-sawfish-service-type)
 
     (service home-polybar-service-type
diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index 9f9201b..b8b6c21 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -37,17 +37,6 @@
                 #:select (home-mbsync-service-type))
   #:use-module (oni home services polybar)
   #:use-module (oni home services rofi)
-  ;; #:use-module ((oni home services stumpwm)
-  ;;               #:select (home-stumpwm-service-type
-  ;;                         home-stumpwm-configuration
-  ;;                         home-stumpwm-gaps-service-type
-  ;;                         home-stumpwm-gaps-configuration
-  ;;                         home-stumpwm-stumptray-service-type
-  ;;                         home-stumpwm-stumptray-configuration
-  ;;                         home-stumpwm-playerctl-service-type
-  ;;                         home-stumpwm-playerctl-configuration
-  ;;                         home-stumpwm-pamixer-service-type
-  ;;                         home-stumpwm-pamixer-configuration))
   #:use-module (oni home services xdisorg)
   #:use-module (oni packages emacs)
   #:use-module ((oni packages emacs-config)
@@ -85,8 +74,6 @@
                 #:select (font-comfortaa
                           font-annotation-mono))
   #:use-module (oni packages hlwm-run-or-raise)
-  ;; #:use-module ((oni packages stumpwm)
-  ;;               #:select (stumpwm+swank))
   #:use-module (oni packages shutdown-rofi))
 
 (define-record-type* <home-module> home-module
@@ -139,24 +126,32 @@
                            ((theme floating reset) . 1)))
                         (rules
                          '(("focus=on")
-                           ("class=Emacs" "tag=dev" "index=01" "switchtag=on" "hook=emacs")
-                           ("class~'URxvt|kitty'" "tag=dev" "index=1" "switchtag=on" "hook=urxvt")
-                           ("class~'Conkeror|[Ff]irefox|Chromium'" "tag=web" "index=0" "switchtag=on")
+                           ("class=Emacs" "tag=dev" "index=01" "switchtag=on"
+                            "hook=emacs")
+                           ("class~'URxvt|kitty'" "tag=dev" "index=1"
+                            "switchtag=on" "hook=urxvt")
+                           ("class~'Conkeror|[Ff]irefox|Chromium'" "tag=web"
+                            "index=0" "switchtag=on")
                            ("class=Pinentry" "pseudotile=on")
                            ("class=Alsaplayer" "pseudotile=on")
                            ("class=Gcr-prompter" "pseudotile=on")
                            ("class=Steam" "title='Steam Login'" "pseudotile=on")
-                           ("class=Steam" "title~'Steam - News .*'" "pseudotile=on")
+                           ("class=Steam" "title~'Steam - News .*'"
+                            "pseudotile=on")
                            ("class=" "title=Steam" "pseudotile=on")
-                           ("class=xfreerdp" "floating=on" "tag=work" "index=0" "switchtag=on")
-                           ("windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)'" "pseudotile=on")
+                           ("class=xfreerdp" "floating=on" "tag=work" "index=0"
+                            "switchtag=on")
+                           ("windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)'"
+                            "pseudotile=on")
                            ("windowtype='_NET_WM_WINDOW_TYPE_DIALOG'" "focus=on")
-                           ("windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)'" "manage=off")
+                           ("windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)'"
+                            "manage=off")
                            ("class=pinball.exe" "pseudotile=on")))
                         (padding '(0 0 0 16 16))
                         (layouts
                          '((web clients max:0)
-                           (dev split horizontal:0.7375:1 (clients max:0) (clients vertical:0))))
+                           (dev split horizontal:0.7375:1 (clients max:0)
+                                (clients vertical:0))))
                         (extra
                          (list
                           (mixed-text-file
@@ -175,19 +170,25 @@
                                (mixed-text-file
                                 "sxhkdrc-playerctl"
                                 "XF86AudioPlay\n"
-                                "    herbstclient spawn " playerctl "/bin/playerctl play-pause\n"
+                                "    herbstclient spawn " playerctl
+                                "/bin/playerctl play-pause\n"
                                 "XF86AudioNext\n"
-                                "    herbstclient spawn " playerctl "/bin/playerctl next\n"
+                                "    herbstclient spawn " playerctl
+                                "/bin/playerctl next\n"
                                 "XF86AudioPrev\n"
-                                "    herbstclient spawn " playerctl "/bin/playerctl prev\n")
+                                "    herbstclient spawn " playerctl
+                                "/bin/playerctl prev\n")
                                (mixed-text-file
                                 "sxhkdrc-pamixer"
                                 "XF86AudioRaiseVolume\n"
-                                "    herbstclient spawn " pamixer "/bin/pamixer --increase 10\n"
+                                "    herbstclient spawn " pamixer
+                                "/bin/pamixer --increase 10\n"
                                 "XF86AudioLowerVolume\n"
-                                "    herbstclient spawn " pamixer "/bin/pamixer --decrease 10\n"
+                                "    herbstclient spawn " pamixer
+                                "/bin/pamixer --decrease 10\n"
                                 "XF86AudioMute\n"
-                                "    herbstclient spawn " pamixer "/bin/pamixer --toggle-mute\n")))))
+                                "    herbstclient spawn " pamixer
+                                "/bin/pamixer --toggle-mute\n")))))
 
               (service home-polybar-service-type
                        (home-polybar-configuration
@@ -195,10 +196,10 @@
 
 (define* (home-modules->home-environment #:rest modules)
   (home-environment
-    (packages
-     (apply append (map home-module-packages modules)))
-    (services
-     (apply append (map home-module-services modules)))))
+   (packages
+    (apply append (map home-module-packages modules)))
+   (services
+    (apply append (map home-module-services modules)))))
 
 (home-modules->home-environment
  oni-home-herbstluftwm-configuration
diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 57289eb..1f9a9b3 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -440,12 +440,13 @@
               (db-file "~/.local/share/mpd/mpd.db")
               (state-file "~/.local/share/mpd/mpdstate")
               (audio-outputs
-               (list (make <home-mpd-audio-output> #:type "pulse" #:name "MPD Pulse")
-                     (make <home-mpd-audio-output>
-                       #:type "fifo"
-                       #:name "Visualizer"
-                       #:path "/tmp/mpd.fifo"
-                       #:format "44100:16:2")))))
+               (list
+                (make <home-mpd-audio-output> #:type "pulse" #:name "MPD Pulse")
+                (make <home-mpd-audio-output>
+                  #:type "fifo"
+                  #:name "Visualizer"
+                  #:path "/tmp/mpd.fifo"
+                  #:format "44100:16:2")))))
     (service home-mpc-update-service-type)
     (service home-mpd-notify-service-type)
     (service home-mpdscrobble-service-type)
@@ -525,7 +526,8 @@
                '(("extensions.pocket.enabled" #f)
                  ("view_source.editor.args" "--no-wait")
                  ("view_source.editor.external" #t)
-                 ("view_source.editor.path" "/home/chelys/.guix-home/profile/bin/emacsclient")
+                 ("view_source.editor.path"
+                  "/home/chelys/.guix-home/profile/bin/emacsclient")
                  ;; Visual modifications. Don't let websites pick the colors or
                  ;; the fonts, use mine instead.
                  ("browser.display.document_color_use" 2)
diff --git a/oni/packages/atuin.scm b/oni/packages/atuin.scm
index 5131ce9..72a085f 100644
--- a/oni/packages/atuin.scm
+++ b/oni/packages/atuin.scm
@@ -68,7 +68,8 @@
      `(#:skip-build? #t
        #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
                        ("rust-atuin-common" ,rust-atuin-common-18)
-                       ("rust-atuin-server-database" ,rust-atuin-server-database-18)
+                       ("rust-atuin-server-database"
+                        ,rust-atuin-server-database-18)
                        ("rust-eyre" ,rust-eyre-0.6)
                        ("rust-futures-util" ,rust-futures-util-0.3)
                        ("rust-metrics" ,rust-metrics-0.21)
@@ -201,8 +202,10 @@
                        ("rust-bumpalo" ,rust-bumpalo-3)
                        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
                        ("rust-rayon" ,rust-rayon-1)
-                       ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
-                       ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+                       ("rust-rustc-std-workspace-alloc"
+                        ,rust-rustc-std-workspace-alloc-1)
+                       ("rust-rustc-std-workspace-core"
+                        ,rust-rustc-std-workspace-core-1)
                        ("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/rust-lang/hashbrown")
     (synopsis "Rust port of Google's SwissTable hash map")
@@ -398,7 +401,8 @@ Prometheus.")
        #:cargo-inputs (("rust-argon2" ,rust-argon2-0.5)
                        ("rust-async-trait" ,rust-async-trait-0.1)
                        ("rust-atuin-common" ,rust-atuin-common-18)
-                       ("rust-atuin-server-database" ,rust-atuin-server-database-18)
+                       ("rust-atuin-server-database"
+                        ,rust-atuin-server-database-18)
                        ("rust-axum" ,rust-axum-0.7)
                        ("rust-axum-server" ,rust-axum-server-0.7)
                        ("rust-base64" ,rust-base64-0.22)
@@ -406,7 +410,8 @@ Prometheus.")
                        ("rust-eyre" ,rust-eyre-0.6)
                        ("rust-fs-err" ,rust-fs-err-2)
                        ("rust-metrics" ,rust-metrics-0.21)
-                       ("rust-metrics-exporter-prometheus" ,rust-metrics-exporter-prometheus-0.12)
+                       ("rust-metrics-exporter-prometheus"
+                        ,rust-metrics-exporter-prometheus-0.12)
                        ("rust-postmark" ,rust-postmark-0.10)
                        ("rust-rand" ,rust-rand-0.8)
                        ("rust-reqwest" ,rust-reqwest-0.11)
@@ -518,7 +523,8 @@ with `tonic`.")
                        ("rust-miette" ,rust-miette-7)
                        ("rust-once-cell" ,rust-once-cell-1)
                        ("rust-prost" ,rust-prost-0.13)
-                       ("rust-prost-reflect-derive" ,rust-prost-reflect-derive-0.14)
+                       ("rust-prost-reflect-derive"
+                        ,rust-prost-reflect-derive-0.14)
                        ("rust-prost-types" ,rust-prost-types-0.13)
                        ("rust-serde" ,rust-serde-1)
                        ("rust-serde-value" ,rust-serde-value-0.7))))
@@ -690,7 +696,8 @@ and dynamic messages.")
                        ("rust-rustc-hash" ,rust-rustc-hash-1)
                        ("rust-sha2" ,rust-sha2-0.10)
                        ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
+                       ("rust-unicode-normalization"
+                        ,rust-unicode-normalization-0.1)
                        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
                        ("rust-zeroize" ,rust-zeroize-1))))
     (home-page "https://github.com/maciejhirsz/tiny-bip39/")
@@ -956,7 +963,8 @@ chrono-english.")
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs (("rust-typed-builder-macro" ,rust-typed-builder-macro-0.18))))
+       #:cargo-inputs
+       (("rust-typed-builder-macro" ,rust-typed-builder-macro-0.18))))
     (home-page "https://github.com/idanarye/rust-typed-builder")
     (synopsis "Compile-time type-checked builder derive")
     (description
@@ -1458,11 +1466,13 @@ SQLite.")
                        ("rust-atuin-dotfiles" ,rust-atuin-dotfiles-18)
                        ("rust-atuin-history" ,rust-atuin-history-18)
                        ("rust-atuin-server" ,rust-atuin-server-18)
-                       ("rust-atuin-server-postgres" ,rust-atuin-server-postgres-18)
+                       ("rust-atuin-server-postgres"
+                        ,rust-atuin-server-postgres-18)
                        ("rust-base64" ,rust-base64-0.22)
                        ("rust-clap" ,rust-clap-4)
                        ("rust-clap-complete" ,rust-clap-complete-4)
-                       ("rust-clap-complete-nushell" ,rust-clap-complete-nushell-4)
+                       ("rust-clap-complete-nushell"
+                        ,rust-clap-complete-nushell-4)
                        ("rust-colored" ,rust-colored-2)
                        ("rust-crossterm" ,rust-crossterm-0.27)
                        ("rust-directories" ,rust-directories-5)
@@ -1495,7 +1505,9 @@ SQLite.")
                        ("rust-whoami" ,rust-whoami-1))
        #:cargo-development-inputs (("rust-tracing-tree" ,rust-tracing-tree-0.4))
        ;; These tests all try to connect to a locally running server instance.
-       #:cargo-test-flags '("--" "--skip" "sync" "--skip" "change_password" "--skip" "multi_user_test" "--skip" "registration")))
+       #:cargo-test-flags
+       '("--" "--skip" "sync" "--skip" "change_password" "--skip"
+         "multi_user_test" "--skip" "registration")))
     (native-inputs (list sqlite))
     (home-page "https://atuin.sh")
     (synopsis "atuin - magical shell history")
diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index e851fc7..34e0bd0 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -59,45 +59,45 @@
 
 (define-public emacs-oni-vterm
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-vterm")
-   (arguments
-    '(#:include '("oni-vterm.el")))
-   (propagated-inputs
-    `(("emacs-vterm" ,emacs-vterm)))
-   (synopsis "My Emacs vterm configuration")
-   (description "This package provides my configuration for emacs-vterm")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-vterm")
+    (arguments
+     '(#:include '("oni-vterm.el")))
+    (propagated-inputs
+     `(("emacs-vterm" ,emacs-vterm)))
+    (synopsis "My Emacs vterm configuration")
+    (description "This package provides my configuration for emacs-vterm")))
 
 (define-public emacs-oni-ui
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-ui")
-   (arguments
-    '(#:include '("oni-ui.el")))
-   (propagated-inputs
-    (list emacs-beacon
-          emacs-diminish))
-   (synopsis "My Emacs vterm configuration")
-   (description "This package provides my configuration for emacs-vterm")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-ui")
+    (arguments
+     '(#:include '("oni-ui.el")))
+    (propagated-inputs
+     (list emacs-beacon
+           emacs-diminish))
+    (synopsis "My Emacs vterm configuration")
+    (description "This package provides my configuration for emacs-vterm")))
 
 (define-public emacs-oni-gui
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-gui")
-   (arguments
-    '(#:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'chdir-oni-gui
-          (λ _ (chdir "oni-gui"))))
-      #:include '("\\.el$"
-                  "^icons\\/")))
-   (propagated-inputs
-    (list emacs-oni-ui
-          emacs-oni-hydra
-          emacs-yoshi-theme
-          emacs-diminish))
-   (synopsis "My Emacs vterm configuration")
-   (description "This package provides my configuration for emacs-vterm")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-gui")
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-gui
+           (λ _ (chdir "oni-gui"))))
+       #:include '("\\.el$"
+                   "^icons\\/")))
+    (propagated-inputs
+     (list emacs-oni-ui
+           emacs-oni-hydra
+           emacs-yoshi-theme
+           emacs-diminish))
+    (synopsis "My Emacs vterm configuration")
+    (description "This package provides my configuration for emacs-vterm")))
 
 (define-public emacs-oni-elfeed
   (package
@@ -125,50 +125,50 @@
 
 (define-public emacs-oni-alert
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-alert")
-   (arguments
-    '(#:include '("oni-alert.el")))
-   (propagated-inputs
-    `(("emacs-alert" ,emacs-alert)))
-   (synopsis "My Emacs alert configuration")
-   (description "This package provides my configuration for emacs-alert")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-alert")
+    (arguments
+     '(#:include '("oni-alert.el")))
+    (propagated-inputs
+     `(("emacs-alert" ,emacs-alert)))
+    (synopsis "My Emacs alert configuration")
+    (description "This package provides my configuration for emacs-alert")))
 
 (define-public emacs-oni-bookmark
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-bookmark")
-   (arguments
-    '(#:include '("oni-bookmark.el")))
-   (synopsis "My Emacs bookmark configuration")
-   (description "This package provides my configuration for the bookmark library
+    (inherit emacs-oni-config)
+    (name "emacs-oni-bookmark")
+    (arguments
+     '(#:include '("oni-bookmark.el")))
+    (synopsis "My Emacs bookmark configuration")
+    (description "This package provides my configuration for the bookmark library
 in Emacs")))
 
 (define-public emacs-oni-lui
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-lui")
-   (arguments
-    '(#:include '("oni-lui.el")))
-   (propagated-inputs
-    `(("emacs-circe" ,emacs-circe)))
-   (synopsis "My Emacs Line-UI configuration")
-   (description "This package provides my configuration for the lui library in
+    (inherit emacs-oni-config)
+    (name "emacs-oni-lui")
+    (arguments
+     '(#:include '("oni-lui.el")))
+    (propagated-inputs
+     `(("emacs-circe" ,emacs-circe)))
+    (synopsis "My Emacs Line-UI configuration")
+    (description "This package provides my configuration for the lui library in
 Emacs")))
 
 (define-public emacs-oni-circe
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-circe")
-   (arguments
-    '(#:include '("oni-circe.el")))
-   (propagated-inputs
-    `(("emacs-circe" ,emacs-circe)
-      ("emacs-circe-serenityc" ,emacs-circe-serenity)
-      ("emacs-oni-lui" ,emacs-oni-lui)
-      ("emacs-olivetti" ,emacs-olivetti)))
-   (synopsis "My Emacs Circe configuration")
-   (description "This package provides my configuration for emacs-circe")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-circe")
+    (arguments
+     '(#:include '("oni-circe.el")))
+    (propagated-inputs
+     `(("emacs-circe" ,emacs-circe)
+       ("emacs-circe-serenityc" ,emacs-circe-serenity)
+       ("emacs-oni-lui" ,emacs-oni-lui)
+       ("emacs-olivetti" ,emacs-olivetti)))
+    (synopsis "My Emacs Circe configuration")
+    (description "This package provides my configuration for emacs-circe")))
 
 (define-public emacs-oni-embrace
   (package
@@ -234,73 +234,73 @@ Emacs")))
 
 (define-public emacs-oni-smartparens
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-smartparens")
-   (arguments
-    '(#:include '("oni-smartparens.el")))
-   (propagated-inputs
-    `(("emacs-smartparens" ,emacs-smartparens)))
-   (synopsis "My Emacs smartparens configuration")
-   (description "This package provides my configuration for Emacs smartparens")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-smartparens")
+    (arguments
+     '(#:include '("oni-smartparens.el")))
+    (propagated-inputs
+     `(("emacs-smartparens" ,emacs-smartparens)))
+    (synopsis "My Emacs smartparens configuration")
+    (description "This package provides my configuration for Emacs smartparens")))
 
 (define-public emacs-oni-flycheck
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-flycheck")
-   (arguments
-    '(#:include '("oni-flycheck.el")))
-   (propagated-inputs
-    `(("emacs-flycheck" ,emacs-flycheck)
-      ("emacs-flycheck-posframe" ,emacs-flycheck-posframe)
-      ("emacs-flycheck-cask" ,emacs-flycheck-cask)))
-   (synopsis "My Emacs flycheck configuration")
-   (description "This package provides my configuration for Emacs flycheck")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-flycheck")
+    (arguments
+     '(#:include '("oni-flycheck.el")))
+    (propagated-inputs
+     `(("emacs-flycheck" ,emacs-flycheck)
+       ("emacs-flycheck-posframe" ,emacs-flycheck-posframe)
+       ("emacs-flycheck-cask" ,emacs-flycheck-cask)))
+    (synopsis "My Emacs flycheck configuration")
+    (description "This package provides my configuration for Emacs flycheck")))
 
 (define-public emacs-oni-lsp
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-lsp")
-   (arguments
-    '(#:include '("oni-lsp.el")))
-   (propagated-inputs
-    `(("emacs-lsp-mode" ,emacs-lsp-mode)
-      ("emacs-lsp-ui" ,emacs-lsp-ui)
-      ("emacs-lsp-ivy" ,emacs-lsp-ivy)))
-   (synopsis "My Emacs LSP configuration")
-   (description "This package provides my configuration for Emacs LSP")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-lsp")
+    (arguments
+     '(#:include '("oni-lsp.el")))
+    (propagated-inputs
+     `(("emacs-lsp-mode" ,emacs-lsp-mode)
+       ("emacs-lsp-ui" ,emacs-lsp-ui)
+       ("emacs-lsp-ivy" ,emacs-lsp-ivy)))
+    (synopsis "My Emacs LSP configuration")
+    (description "This package provides my configuration for Emacs LSP")))
 
 (define-public emacs-oni-c
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-c")
-   (arguments
-    '(#:include '("oni-c.el")))
-   (propagated-inputs
-    `(("emacs-oni-flycheck" ,emacs-oni-flycheck)
-      ("emacs-oni-lsp" ,emacs-oni-lsp)
-      ("emacs-reformatter" ,emacs-reformatter)
-      ("emacs-ccls" ,emacs-ccls)
-      ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
-      ;; For `clang-format'.
-      ("clang" ,clang)))
-   (synopsis "My Emacs C coding configuration")
-   (description "This package provides my configuration for coding in C")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-c")
+    (arguments
+     '(#:include '("oni-c.el")))
+    (propagated-inputs
+     `(("emacs-oni-flycheck" ,emacs-oni-flycheck)
+       ("emacs-oni-lsp" ,emacs-oni-lsp)
+       ("emacs-reformatter" ,emacs-reformatter)
+       ("emacs-ccls" ,emacs-ccls)
+       ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
+       ;; For `clang-format'.
+       ("clang" ,clang)))
+    (synopsis "My Emacs C coding configuration")
+    (description "This package provides my configuration for coding in C")))
 
 (define-public emacs-oni-sh
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-sh")
-   (arguments
-    '(#:include '("oni-sh.el")))
-   (propagated-inputs
-    `(("emacs-reformatter" ,emacs-reformatter)
-      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
-      ("emacs-oni-smartparens" ,emacs-oni-smartparens)
-      ("tree-sitter-bash" ,tree-sitter-bash)
-      ;; ("shfmt" ,shfmt)
-      ))
-   (synopsis "My Emacs Shell coding configuration")
-   (description "This package provides my configuration for coding in Shell")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-sh")
+    (arguments
+     '(#:include '("oni-sh.el")))
+    (propagated-inputs
+     `(("emacs-reformatter" ,emacs-reformatter)
+       ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+       ("emacs-oni-smartparens" ,emacs-oni-smartparens)
+       ("tree-sitter-bash" ,tree-sitter-bash)
+       ;; ("shfmt" ,shfmt)
+       ))
+    (synopsis "My Emacs Shell coding configuration")
+    (description "This package provides my configuration for coding in Shell")))
 
 (define-public emacs-oni-yasnippet
   (package
@@ -334,91 +334,91 @@ Emacs")))
 
 (define-public (emacs-oni-org emacs)
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-org")
-   (arguments
-    `(#:phases
-      (modify-phases %standard-phases
-                     (add-after 'unpack 'chdir-oni-org
-                                (λ _ (chdir "oni-org"))))
-      #:include '("\\.el$"
-                  "^snippets\\/org-mode\\/"
-                  "^capture-templates\\/"
-                  "^icons\\/")
-      ;; The default #:emacs (emacs-minimal) doesn't include `range.el' and
-      ;; throws an error while trying to byte-compile oni-org.
-      #:emacs ,emacs))
-   (propagated-inputs
-    (list emacs-oni-yasnippet
-          emacs-oni-hydra
-          my-emacs-org-roam
-          emacs-org
-          emacs-org-contrib
-          emacs-org-edna
-          emacs-diminish
-          emacs-olivetti
-          emacs-org-pretty-table))
-   (synopsis "My Emacs Org configuration")
-   (description "This package provides my configuration for org")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-org")
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-org
+           (λ _ (chdir "oni-org"))))
+       #:include '("\\.el$"
+                   "^snippets\\/org-mode\\/"
+                   "^capture-templates\\/"
+                   "^icons\\/")
+       ;; The default #:emacs (emacs-minimal) doesn't include `range.el' and
+       ;; throws an error while trying to byte-compile oni-org.
+       #:emacs ,emacs))
+    (propagated-inputs
+     (list emacs-oni-yasnippet
+           emacs-oni-hydra
+           my-emacs-org-roam
+           emacs-org
+           emacs-org-contrib
+           emacs-org-edna
+           emacs-diminish
+           emacs-olivetti
+           emacs-org-pretty-table))
+    (synopsis "My Emacs Org configuration")
+    (description "This package provides my configuration for org")))
 
 (define-public (emacs-oni-org-roam emacs)
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-org-roam")
-   (arguments
-    '(#:include '("oni-org-roam.el")))
-   (propagated-inputs
-    `(("emacs-oni-org" ,(emacs-oni-org emacs))
-      ("emacs-org-roam" ,my-emacs-org-roam)))
-   (synopsis "My Emacs Org Roam configuration")
-   (description "This package provides my configuration for Org Roam")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-org-roam")
+    (arguments
+     '(#:include '("oni-org-roam.el")))
+    (propagated-inputs
+     `(("emacs-oni-org" ,(emacs-oni-org emacs))
+       ("emacs-org-roam" ,my-emacs-org-roam)))
+    (synopsis "My Emacs Org Roam configuration")
+    (description "This package provides my configuration for Org Roam")))
 
 (define-public emacs-oni-browse-url
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-browse-url")
-   (arguments
-    '(#:include '("oni-browse-url.el")))
-   (synopsis "My Emacs Browse Url configuration")
-   (description "This package provides my configuration for Browse Url")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-browse-url")
+    (arguments
+     '(#:include '("oni-browse-url.el")))
+    (synopsis "My Emacs Browse Url configuration")
+    (description "This package provides my configuration for Browse Url")))
 
 (define-public emacs-oni-prescient
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-prescient")
-   (arguments
-    '(#:include '("oni-prescient.el")))
-   (propagated-inputs
-    `(("emacs-prescient" ,emacs-prescient)
-      ("emacs-oni-data-dir" ,emacs-oni-data-dir)))
-   (synopsis "My Emacs prescient configuration")
-   (description "This package provides my configuration for prescient")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-prescient")
+    (arguments
+     '(#:include '("oni-prescient.el")))
+    (propagated-inputs
+     `(("emacs-prescient" ,emacs-prescient)
+       ("emacs-oni-data-dir" ,emacs-oni-data-dir)))
+    (synopsis "My Emacs prescient configuration")
+    (description "This package provides my configuration for prescient")))
 
 (define-public emacs-oni-company
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-company")
-   (arguments
-    '(#:include '("oni-company.el")))
-   (propagated-inputs
-    `(("emacs-company" ,emacs-company)
-      ("emacs-oni-prescient" ,emacs-oni-prescient)
-      ("emacs-company-posframe" ,emacs-company-posframe)
-      ("emacs-diminish" ,emacs-diminish)))
-   (synopsis "My Emacs Company configuration")
-   (description "This package provides my configuration for company")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-company")
+    (arguments
+     '(#:include '("oni-company.el")))
+    (propagated-inputs
+     `(("emacs-company" ,emacs-company)
+       ("emacs-oni-prescient" ,emacs-oni-prescient)
+       ("emacs-company-posframe" ,emacs-company-posframe)
+       ("emacs-diminish" ,emacs-diminish)))
+    (synopsis "My Emacs Company configuration")
+    (description "This package provides my configuration for company")))
 
 (define-public emacs-oni-paredit
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-paredit")
-   (arguments
-    '(#:include '("oni-paredit.el")))
-   (propagated-inputs
-    `(("emacs-paredit" ,emacs-paredit)
-      ("emacs-diminish" ,emacs-diminish)))
-   (synopsis "My Emacs paredit configuration")
-   (description "This package provides my configuration for paredit")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-paredit")
+    (arguments
+     '(#:include '("oni-paredit.el")))
+    (propagated-inputs
+     `(("emacs-paredit" ,emacs-paredit)
+       ("emacs-diminish" ,emacs-diminish)))
+    (synopsis "My Emacs paredit configuration")
+    (description "This package provides my configuration for paredit")))
 
 (define-public emacs-oni-python
   (package
@@ -459,148 +459,148 @@ Emacs")))
 
 (define-public emacs-oni-cmake
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-cmake")
-   (arguments
-    '(#:include '("oni-cmake.el")))
-   (propagated-inputs
-    `(("emacs-cmake-mode" ,emacs-cmake-mode)
-      ("emacs-oni-company" ,emacs-oni-company)
-      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
-      ("emacs-oni-lsp" ,emacs-oni-lsp)
-      ("emacs-cmake-font-lock" ,emacs-cmake-font-lock)
-      ("emacs-eldoc-cmake" ,emacs-eldoc-cmake)))
-   (synopsis "My Emacs CMake confifguration")
-   (description "This package provides my configuration for CMake")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-cmake")
+    (arguments
+     '(#:include '("oni-cmake.el")))
+    (propagated-inputs
+     `(("emacs-cmake-mode" ,emacs-cmake-mode)
+       ("emacs-oni-company" ,emacs-oni-company)
+       ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+       ("emacs-oni-lsp" ,emacs-oni-lsp)
+       ("emacs-cmake-font-lock" ,emacs-cmake-font-lock)
+       ("emacs-eldoc-cmake" ,emacs-eldoc-cmake)))
+    (synopsis "My Emacs CMake confifguration")
+    (description "This package provides my configuration for CMake")))
 
 (define-public emacs-oni-gnus
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-gnus")
-   (arguments
-    '(#:include '("oni-gnus.el")))
-   (propagated-inputs
-    (list emacs-oni-data-dir))
-   (synopsis "My Emacs Gnus configuration")
-   (description "This package provides my configuration for Gnus")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-gnus")
+    (arguments
+     '(#:include '("oni-gnus.el")))
+    (propagated-inputs
+     (list emacs-oni-data-dir))
+    (synopsis "My Emacs Gnus configuration")
+    (description "This package provides my configuration for Gnus")))
 
 (define-public emacs-oni-common-lisp
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-common-lisp")
-   (arguments
-    '(#:include '("oni-common-lisp.el")))
-   (propagated-inputs
-    `(("emacs-oni-company" ,emacs-oni-company)
-      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
-      ("emacs-oni-paredit" ,emacs-oni-paredit)
-      ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
-      ("emacs-slime" ,emacs-slime)
-      ("emacs-slime-company" ,emacs-slime-company)))
-   (synopsis "My Emacs Common Lisp configuration")
-   (description "This package provides my configuration for Common Lisp")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-common-lisp")
+    (arguments
+     '(#:include '("oni-common-lisp.el")))
+    (propagated-inputs
+     `(("emacs-oni-company" ,emacs-oni-company)
+       ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+       ("emacs-oni-paredit" ,emacs-oni-paredit)
+       ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
+       ("emacs-slime" ,emacs-slime)
+       ("emacs-slime-company" ,emacs-slime-company)))
+    (synopsis "My Emacs Common Lisp configuration")
+    (description "This package provides my configuration for Common Lisp")))
 
 (define-public emacs-oni-compilation
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-compilation")
-   (arguments
-    '(#:include '("oni-compilation.el")))
-   (propagated-inputs
-    `(("emacs-oni-alert" ,emacs-oni-alert)
-      ("emacs-xterm-color" ,emacs-xterm-color)))
-   (synopsis "My Emacs Compilation configuration")
-   (description "This package provides my configuration for Compilation mode")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-compilation")
+    (arguments
+     '(#:include '("oni-compilation.el")))
+    (propagated-inputs
+     `(("emacs-oni-alert" ,emacs-oni-alert)
+       ("emacs-xterm-color" ,emacs-xterm-color)))
+    (synopsis "My Emacs Compilation configuration")
+    (description "This package provides my configuration for Compilation mode")))
 
 (define-public emacs-oni-conf
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-conf")
-   (arguments
-    `(#:phases
-      (modify-phases %standard-phases
-                     (add-after 'unpack 'chdir-oni-conf
-                                (λ _ (chdir "oni-conf"))))
-      #:include '("\\.el$"
-                  "^snippets\\/conf-mode\\/")))
-   (propagated-inputs
-    `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
-   (synopsis "My Emacs Conf mode configuration")
-   (description "This pakcage provides my configuation for Conf mode")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-conf")
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-conf
+           (λ _ (chdir "oni-conf"))))
+       #:include '("\\.el$"
+                   "^snippets\\/conf-mode\\/")))
+    (propagated-inputs
+     `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
+    (synopsis "My Emacs Conf mode configuration")
+    (description "This pakcage provides my configuation for Conf mode")))
 
 (define-public emacs-oni-counsel
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-counsel")
-   (arguments
-    '(#:include '("oni-counsel.el")))
-   (propagated-inputs
-    `(("emacs-counsel" ,emacs-counsel)
-      ("emacs-diminish" ,emacs-diminish)))
-   (synopsis "My Emacs Counsel configuration")
-   (description "This package provides my configuration for Counsel mode")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-counsel")
+    (arguments
+     '(#:include '("oni-counsel.el")))
+    (propagated-inputs
+     `(("emacs-counsel" ,emacs-counsel)
+       ("emacs-diminish" ,emacs-diminish)))
+    (synopsis "My Emacs Counsel configuration")
+    (description "This package provides my configuration for Counsel mode")))
 
 (define-public emacs-oni-cpp
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-cpp")
-   (arguments
-    '(#:include '("oni-cpp.el")))
-   (propagated-inputs
-    `(("emacs-oni-company" ,emacs-oni-company)
-      ("emacs-oni-flycheck" ,emacs-oni-flycheck)))
-   (synopsis "My Emacs C++ configuration")
-   (description "This package provides my configuration for programming in C++.")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-cpp")
+    (arguments
+     '(#:include '("oni-cpp.el")))
+    (propagated-inputs
+     `(("emacs-oni-company" ,emacs-oni-company)
+       ("emacs-oni-flycheck" ,emacs-oni-flycheck)))
+    (synopsis "My Emacs C++ configuration")
+    (description "This package provides my configuration for programming in C++.")))
 
 (define-public emacs-oni-csharp
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-csharp")
-   (arguments
-    '(#:phases
-      (modify-phases %standard-phases
-                     (add-after 'unpack 'chdir-oni-csharp
-                                (λ _ (chdir "oni-csharp"))))
-      #:include '("\\.el$" "^snippets\\/")))
-   (propagated-inputs
-    `(("emacs-csharp-mode" ,emacs-csharp-mode)
-      ("emacs-oni-company" ,emacs-oni-company)
-      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
-      ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
-      ("emacs-oni-hydra" ,emacs-oni-hydra)
-      ("emacs-oni-lsp" ,emacs-oni-lsp)
-      ("emacs-oni-smartparens" ,emacs-oni-smartparens)))
-   (synopsis "My Emacs C# configuration")
-   (description "This package provides my configuration for programming in C#.")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-csharp")
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-csharp
+           (λ _ (chdir "oni-csharp"))))
+       #:include '("\\.el$" "^snippets\\/")))
+    (propagated-inputs
+     `(("emacs-csharp-mode" ,emacs-csharp-mode)
+       ("emacs-oni-company" ,emacs-oni-company)
+       ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
+       ("emacs-oni-hydra" ,emacs-oni-hydra)
+       ("emacs-oni-lsp" ,emacs-oni-lsp)
+       ("emacs-oni-smartparens" ,emacs-oni-smartparens)))
+    (synopsis "My Emacs C# configuration")
+    (description "This package provides my configuration for programming in C#.")))
 
 (define-public emacs-oni-css
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-css")
-   (arguments
-    '(#:phases
-      (modify-phases %standard-phases
-                     (add-after 'unpack 'chdir-oni-css
-                                (λ _ (chdir "oni-css"))))
-      #:include '("\\.el$" "^snippets\\/")))
-   (propagated-inputs
-    `(("emacs-oni-company" ,emacs-oni-company)
-      ("emacs-oni-hydra" ,emacs-oni-hydra)
-      ("emacs-rainbow-mode" ,emacs-rainbow-mode)
-      ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
-   (synopsis "My Emacs CSS configuration")
-   (description "This package provides my configuration for writing CSS.")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-css")
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-css
+           (λ _ (chdir "oni-css"))))
+       #:include '("\\.el$" "^snippets\\/")))
+    (propagated-inputs
+     `(("emacs-oni-company" ,emacs-oni-company)
+       ("emacs-oni-hydra" ,emacs-oni-hydra)
+       ("emacs-rainbow-mode" ,emacs-rainbow-mode)
+       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
+    (synopsis "My Emacs CSS configuration")
+    (description "This package provides my configuration for writing CSS.")))
 
 (define-public emacs-oni-diff-hl
   (package
-   (inherit emacs-oni-config)
-   (name "emacs-oni-diff-hl")
-   (arguments
-    '(#:include '("oni-diff-hl.el")))
-   (propagated-inputs
-    `(("emacs-diff-hl" ,emacs-diff-hl)))
-   (synopsis "My Emacs Diff Highlight configuration")
-   (description "This package provides my configuration for Diff Highlight.")))
+    (inherit emacs-oni-config)
+    (name "emacs-oni-diff-hl")
+    (arguments
+     '(#:include '("oni-diff-hl.el")))
+    (propagated-inputs
+     `(("emacs-diff-hl" ,emacs-diff-hl)))
+    (synopsis "My Emacs Diff Highlight configuration")
+    (description "This package provides my configuration for Diff Highlight.")))
 
 (define-public emacs-oni-elisp
   (package
@@ -647,7 +647,8 @@ Emacs")))
     (arguments
      '(#:include '("oni-sendmail.el")))
     (synopsis "My configuration to send email through Emacs.")
-    (description "This package provides my configuration for sending mail through Emacs.")))
+    (description
+     "This package provides my configuration for sending mail through Emacs.")))
 
 (define-public emacs-oni-notmuch
   (package
@@ -737,7 +738,8 @@ Emacs")))
     (propagated-inputs
      (list emacs-nov-el))
     (synopsis "My configuration for reading ePub files")
-    (description "This package provides my configuration for reading ePub files.")))
+    (description
+     "This package provides my configuration for reading ePub files.")))
 
 (define-public emacs-oni-eww
   (package
@@ -768,7 +770,8 @@ Emacs")))
     (propagated-inputs
      (list emacs-haskell-mode))
     (synopsis "My configuration for Haskell programming")
-    (description "This package provides my configuration for programming Haskell.")))
+    (description
+     "This package provides my configuration for programming Haskell.")))
 
 (define-public emacs-oni-highlight-indent-guides
   (package
@@ -779,7 +782,8 @@ Emacs")))
     (propagated-inputs
      (list emacs-highlight-indent-guides))
     (synopsis "My configuration for highlight indent guides")
-    (description "This package provides my configuration for highlight indent guides.")))
+    (description
+     "This package provides my configuration for highlight indent guides.")))
 
 (define-public emacs-oni-html
   (package
@@ -948,7 +952,8 @@ Emacs")))
       emacs-yaml-pro
       python-yamllint))
     (synopsis "My configuration for yaml-mode.")
-    (description "This package provides my configuration for editing Yaml files.")))
+    (description
+     "This package provides my configuration for editing Yaml files.")))
 
 (define-public emacs-oni-php
   (package
@@ -989,7 +994,8 @@ Emacs")))
       emacs-oni-js
       emacs-prettier))
     (synopsis "My configuration for web-mode.")
-    (description "This package provides my configuration for editing Web template files.")))
+    (description
+     "This package provides my configuration for editing Web template files.")))
 
 (define-public emacs-oni-js
   (package
@@ -1007,4 +1013,5 @@ Emacs")))
       emacs-rjsx-mode
       emacs-prettier))
     (synopsis "My configuration for JavaScript.")
-    (description "This package provides my configuration for editing JavaScript files.")))
+    (description
+     "This package provides my configuration for editing JavaScript files.")))
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index 03aecbc..02186bb 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -17,8 +17,7 @@
   #:use-module (gnu packages emacs-build)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages tree-sitter)
-  #:use-module (rosenthal packages tree-sitter)
-  )
+  #:use-module (rosenthal packages tree-sitter))
 
 (define-public emacs-ace-link-notmuch
   (let ((commit "fb09673881ef0f7b7ad744c576a19f578df7c51d")
@@ -29,8 +28,8 @@
       (source
        (origin
          (uri (git-reference
-                (url "https://git.sr.ht/~ryuslash/ace-link-notmuch")
-                (commit commit)))
+               (url "https://git.sr.ht/~ryuslash/ace-link-notmuch")
+               (commit commit)))
          (method git-fetch)
          (sha256
           (base32 "1wpdimvwkrbic0hybsp5pqaql066yvl1aar37fr5kcm19gbgvcf6"))
@@ -53,8 +52,8 @@
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/dougm/bats-mode")
-                (commit commit)))
+               (url "https://github.com/dougm/bats-mode")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -77,8 +76,8 @@ keywords.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/ryuslash/circe-serenity.git")
-                (commit commit)))
+               (url "https://github.com/ryuslash/circe-serenity.git")
+               (commit commit)))
          (method git-fetch)
          (sha256
           (base32 "05fpbvqx6ii8kypv880j3mdc8kql7k16dcs42vpaaabjwn3kv4kn"))
@@ -100,8 +99,8 @@ keywords.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/emacs-vs/docstr")
-                (commit commit)))
+               (url "https://github.com/emacs-vs/docstr")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -153,8 +152,8 @@ See function `eldoc-cmake-enable'.
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/Yuki-Inoue/elisp-format")
-                (commit commit)))
+               (url "https://github.com/Yuki-Inoue/elisp-format")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -173,8 +172,8 @@ See function `eldoc-cmake-enable'.
     (source
      (origin
        (uri (git-reference
-              (url "https://github.com/cute-jumper/embrace.el")
-              (commit version)))
+             (url "https://github.com/cute-jumper/embrace.el")
+             (commit version)))
        (method git-fetch)
        (file-name (git-file-name name version))
        (sha256
@@ -205,8 +204,8 @@ custom pairs?)")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/mhayashi1120/Emacs-erefactor")
-                (commit commit)))
+               (url "https://github.com/mhayashi1120/Emacs-erefactor")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -226,8 +225,8 @@ custom pairs?)")
       (source
        (origin
          (uri (git-reference
-                (url "git://code.ryuslash.org/eshell-fringe-status.git")
-                (commit commit)))
+               (url "git://code.ryuslash.org/eshell-fringe-status.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -245,8 +244,8 @@ custom pairs?)")
     (source
      (origin
        (uri (git-reference
-              (url "https://github.com/flycheck/flycheck-cask")
-              (commit version)))
+             (url "https://github.com/flycheck/flycheck-cask")
+             (commit version)))
        (method git-fetch)
        (file-name (git-file-name name version))
        (sha256
@@ -269,8 +268,8 @@ custom pairs?)")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/alexmurray/flycheck-posframe")
-                (commit commit)))
+               (url "https://github.com/alexmurray/flycheck-posframe")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -293,8 +292,8 @@ custom pairs?)")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/purcell/flycheck-relint")
-                (commit commit)))
+               (url "https://github.com/purcell/flycheck-relint")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -321,8 +320,8 @@ in Emacs Lisp files, using relint.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/roman/golden-ratio.el.git")
-                (commit commit)))
+               (url "https://github.com/roman/golden-ratio.el.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -347,8 +346,8 @@ the way, but at the same time will be readable enough to know it's content.")
     (source
      (origin
        (uri (git-reference
-              (url "https://github.com/jdtsmith/indent-bars")
-              (commit (string-append "v" version))))
+             (url "https://github.com/jdtsmith/indent-bars")
+             (commit (string-append "v" version))))
        (method git-fetch)
        (file-name (git-file-name name version))
        (sha256
@@ -370,8 +369,8 @@ the way, but at the same time will be readable enough to know it's content.")
       (source
        (origin
          (uri (git-reference
-                (url "https://gitlab.com/emacs-stuff/indent-tools.git")
-                (commit commit)))
+               (url "https://gitlab.com/emacs-stuff/indent-tools.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -402,8 +401,8 @@ text.")
       (source
        (origin
          (uri (git-reference
-                (url "https://git.sr.ht/~ryuslash/inkplatel")
-                (commit commit)))
+               (url "https://git.sr.ht/~ryuslash/inkplatel")
+               (commit commit)))
          (method git-fetch)
          (sha256
           (base32 "0mqnpf4vrzn3013pcwcr9150k4jy4klrdg0pd3amhg2y25054w4s"))
@@ -424,8 +423,8 @@ text.")
       (source
        (origin
          (uri (git-reference
-                (url "https://gitlab.com/matsievskiysv/insert-char-preview")
-                (commit commit)))
+               (url "https://gitlab.com/matsievskiysv/insert-char-preview")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -447,8 +446,8 @@ with character preview in completion prompt.")
        (origin
          (method git-fetch)
          (uri (git-reference
-                (url "git://ryuslash.org/nginx-mode.git")
-                (commit commit)))
+               (url "git://ryuslash.org/nginx-mode.git")
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
           (base32 "1nqyz2mkhvm8ixgxla93nfmxqn0qs8vx7ma598kmyp292b3k9whr"))))
@@ -498,8 +497,8 @@ To setup nroam for all org-roam buffers, evaluate the following:
     (source
      (origin
        (uri (git-reference
-              (url "https://github.com/jdtsmith/outli")
-              (commit (string-append "v" version))))
+             (url "https://github.com/jdtsmith/outli")
+             (commit (string-append "v" version))))
        (method git-fetch)
        (file-name (git-file-name name version))
        (sha256
@@ -522,8 +521,8 @@ key features.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/bharadswami/syncthing-status.el.git")
-                (commit commit)))
+               (url "https://github.com/bharadswami/syncthing-status.el.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -546,8 +545,8 @@ Emacs buffer.")
     (source
      (origin
        (uri (git-reference
-              (url "https://github.com/emacsorphanage/yafolding")
-              (commit (string-append "v" version))))
+             (url "https://github.com/emacsorphanage/yafolding")
+             (commit (string-append "v" version))))
        (method git-fetch)
        (file-name (git-file-name name version))
        (sha256
@@ -567,8 +566,8 @@ Emacs buffer.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/knu/yaml-imenu.el")
-                (commit commit)))
+               (url "https://github.com/knu/yaml-imenu.el")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -595,8 +594,8 @@ dot-separated path form like @code{jobs.build.docker} and
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/elken/yasnippet-capf.git")
-                (commit commit)))
+               (url "https://github.com/elken/yasnippet-capf.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -619,8 +618,8 @@ dot-separated path form like @code{jobs.build.docker} and
       (source
        (origin
          (uri (git-reference
-                (url "git://code.ryuslash.org/yoshi-theme.git")
-                (commit commit)))
+               (url "git://code.ryuslash.org/yoshi-theme.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -643,8 +642,8 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/jd/naquadah-theme.git")
-                (commit commit)))
+               (url "https://github.com/jd/naquadah-theme.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -664,8 +663,8 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/lewang/fic-mode.git")
-                (commit commit)))
+               (url "https://github.com/lewang/fic-mode.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -687,8 +686,8 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/tree-sitter/tree-sitter-php")
-                       (commit commit)))
+                      (url "https://github.com/tree-sitter/tree-sitter-php")
+                      (commit commit)))
                 (file-name (git-file-name "tree-sitter-php" version))
                 (sha256
                  (base32 "1y5blblzsr6f5hvmgfk49l45fx5lzbrr1p1jsx5cxzygf03r9lnz"))
@@ -713,8 +712,8 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/emacs-php/php-ts-mode")
-                (commit commit)))
+               (url "https://github.com/emacs-php/php-ts-mode")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -737,8 +736,8 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/minad/org-modern")
-              (commit version)))
+             (url "https://github.com/minad/org-modern")
+             (commit version)))
        (sha256
         (base32 "0a7viid1lrn02w1n4yjivjyssbd1qq850giqwnp3mrjf9adwzh2a"))
        (file-name (git-file-name name version))))
@@ -761,8 +760,8 @@ source blocks.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/emacs-php/php-runtime.el.git")
-              (commit "37beef404c70d7b80dc085b1ee1e13fd9c375fe6")))
+             (url "https://github.com/emacs-php/php-runtime.el.git")
+             (commit "37beef404c70d7b80dc085b1ee1e13fd9c375fe6")))
        (file-name (git-file-name name version))
        (sha256
         (base32 "1sd65nhbcxr5r935z1ik3skz73kkpyr4r259nahn5gjvvww3if20"))))
@@ -787,8 +786,8 @@ short hand.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/emacs-php/phpstan.el.git")
-              (commit "f4256e9f0b206a77b48da2df470c9ab0c48b4472")))
+             (url "https://github.com/emacs-php/phpstan.el.git")
+             (commit "f4256e9f0b206a77b48da2df470c9ab0c48b4472")))
        (file-name (git-file-name name version))
        (sha256
         (base32 "0gj6i1szlb21k6ya2w3qzin6v0b9dx5yb5wrmrlshcal33k3p660"))))
@@ -824,8 +823,8 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Directory-Variables.ht
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/emacs-php/phpstan.el.git")
-              (commit "f4256e9f0b206a77b48da2df470c9ab0c48b4472")))
+             (url "https://github.com/emacs-php/phpstan.el.git")
+             (commit "f4256e9f0b206a77b48da2df470c9ab0c48b4472")))
        (file-name (git-file-name name version))
        (sha256
         (base32 "0gj6i1szlb21k6ya2w3qzin6v0b9dx5yb5wrmrlshcal33k3p660"))))
@@ -851,8 +850,8 @@ flycheck-phpstan) (flycheck-mode t)) (add-hook php-mode-hook my-php-mode-setup).
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/meedstrom/indexed.git")
-              (commit "1a0a8e2776cdc861ffbe9b49f99d5aac70c7d89a")))
+             (url "https://github.com/meedstrom/indexed.git")
+             (commit "1a0a8e2776cdc861ffbe9b49f99d5aac70c7d89a")))
        (file-name (git-file-name name version))
        (sha256
         (base32 "1p1vpv2jjym107fc0xj3iiqqnxijd7n57kx3z9z7w1pahg346w4l"))))
@@ -902,8 +901,8 @@ README.md from the same repository for extended documentation.")
        (origin
          (method git-fetch)
          (uri (git-reference
-                (url "https://github.com/org-roam/org-roam")
-                (commit commit)))
+               (url "https://github.com/org-roam/org-roam")
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
           (base32 "0jbj48glh0r6fkb0lk1xb9067x2myp3krkw2byycijwdq1nlqzv2")))))))
@@ -917,8 +916,8 @@ README.md from the same repository for extended documentation.")
       (source
        (origin
          (uri (git-reference
-                (url "https://github.com/SqrtMinusOne/eshell-atuin.git")
-                (commit commit)))
+               (url "https://github.com/SqrtMinusOne/eshell-atuin.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
@@ -945,8 +944,8 @@ This package provides functionality to store and browse eshell history in atuin.
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/konrad1977/flyover")
-              (commit "0446b4289bd7a3f169f2ab8eb6f6fa0365322bab")))
+             (url "https://github.com/konrad1977/flyover")
+             (commit "0446b4289bd7a3f169f2ab8eb6f6fa0365322bab")))
        (file-name (git-file-name name version))
        (sha256
         (base32 "0j7m3ma14q5gdlkhiq00f17v7sz8z7ddjv14hijxpmzqc2awrhyd"))))
@@ -973,8 +972,8 @@ enabled.")
       (source
        (origin
          (uri (git-reference
-                (url "https://codeberg.org/mmontone/interactive-lang-tools.git")
-                (commit commit)))
+               (url "https://codeberg.org/mmontone/interactive-lang-tools.git")
+               (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
diff --git a/oni/packages/fonts.scm b/oni/packages/fonts.scm
index ad0c9a1..906dfdf 100644
--- a/oni/packages/fonts.scm
+++ b/oni/packages/fonts.scm
@@ -33,21 +33,23 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
     (license license:silofl1.1)))
 
 (define-public font-nerd-font-fantasquesansmono
-	(package
-		(name "font-nerd-font-fantasquesansmono")
-		(version "3.4.0")
-		(source
-         (origin
-           (method url-fetch)
-           (uri "https://github.com/ryanoasis/nerd-fonts/releases/download//v3.4.0/FantasqueSansMono.tar.xz")
-           (sha256 (base32 "1z8ggmarbw6yjj835vmc02w4j07xkkfnrsylvq6mdf2z8y858as6"))))
-		(build-system font-build-system)
-		(license license:expat)
-		(home-page "https://www.nerdfonts.com/")
-		(synopsis "Iconic font aggregator, collection, & patcher. 3,600+ icons,\n50+ patched fonts:
+  (package
+	(name "font-nerd-font-fantasquesansmono")
+	(version "3.4.0")
+	(source
+     (origin
+       (method url-fetch)
+       (uri
+        "https://github.com/ryanoasis/nerd-fonts/releases/download//v3.4.0/FantasqueSansMono.tar.xz")
+       (sha256
+        (base32 "1z8ggmarbw6yjj835vmc02w4j07xkkfnrsylvq6mdf2z8y858as6"))))
+	(build-system font-build-system)
+	(license license:expat)
+	(home-page "https://www.nerdfonts.com/")
+	(synopsis "Iconic font aggregator, collection, & patcher. 3,600+ icons,\n50+ patched fonts:
 Hack, Source Code Pro, more. Glyph collections: Font\nAwesome, Material Design
 Icons, Octicons, & more")
-		(description "Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons). Specifically to add a high
+	(description "Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons). Specifically to add a high
 number of extra glyphs from popular 'iconic fonts' such as Font Awesome,
 Devicons, Octicons, and others.")))
 
@@ -58,7 +60,8 @@ Devicons, Octicons, and others.")))
 	(source
      (origin
        (method url-fetch)
-       (uri "https://github.com/qwerasd205/AnnotationMono/releases/download/v0.2/AnnotationMono_v0.2.zip")
+       (uri
+        "https://github.com/qwerasd205/AnnotationMono/releases/download/v0.2/AnnotationMono_v0.2.zip")
        (sha256 (base32 "0q7rvlrlqcq3qfqkmqcgr5rw82zxkgvm4xzn6kys8bj70x9d0h07"))))
 	(build-system copy-build-system)
     (arguments
diff --git a/oni/packages/hlwm-run-or-raise.scm b/oni/packages/hlwm-run-or-raise.scm
index e4c5fa9..1ef2952 100644
--- a/oni/packages/hlwm-run-or-raise.scm
+++ b/oni/packages/hlwm-run-or-raise.scm
@@ -28,7 +28,7 @@
        (list wmctrl gawk grep hlwm-switch-to-window scsh))
       (build-system gnu-build-system)
       (arguments
-       `(#:tests? #f                     ; There is no test suite.
+       `(#:tests? #f                    ; There is no test suite.
          #:phases
          (modify-phases %standard-phases
            (delete 'configure)
@@ -38,6 +38,8 @@
                (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
                  (install-file "hlwm-run-or-raise" bin)))))))
       (home-page "https://ryuslash.org/")
-      (synopsis "A simple script that either starts a program or switches to it with herbstluftwm.")
-      (description "Can be bound to a key to either switch to a program or start it up if it isn't running.")
+      (synopsis
+       "A simple script that either starts a program or switches to it with herbstluftwm.")
+      (description
+       "Can be bound to a key to either switch to a program or start it up if it isn't running.")
       (license license:gpl3+))))
diff --git a/oni/packages/hlwm-switch-to-window.scm b/oni/packages/hlwm-switch-to-window.scm
index a0721d8..dac847b 100644
--- a/oni/packages/hlwm-switch-to-window.scm
+++ b/oni/packages/hlwm-switch-to-window.scm
@@ -34,6 +34,8 @@
                (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
                  (install-file "hlwm-switch-to-window" bin)))))))
       (home-page "https://ryuslash.org/")
-      (synopsis "A simple script that checks which monitor to use to switch to a window before switching.")
-      (description "Can be bound to a key to make sure that when you switch to a window a specific monitor is always used.")
+      (synopsis
+       "A simple script that checks which monitor to use to switch to a window before switching.")
+      (description
+       "Can be bound to a key to make sure that when you switch to a window a specific monitor is always used.")
       (license license:gpl3+))))
diff --git a/oni/packages/inkplate.scm b/oni/packages/inkplate.scm
index 50d27c4..0c83072 100644
--- a/oni/packages/inkplate.scm
+++ b/oni/packages/inkplate.scm
@@ -14,25 +14,26 @@
     (name "guile-inkplate")
     (version "0.1")
     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "git://code.ryuslash.org/guile-inkplate/")
-               (commit "27cbc844dee8f9f9b8a0a175f7ebf005cb205046")))
-        (file-name "guile-inkplate-0.1-checkout")
-        (sha256 (base32 "00qx2d16xma19myq4lla3gnq8rljsqbns53ma5hwamkyvwwyd55s"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "git://code.ryuslash.org/guile-inkplate/")
+             (commit "27cbc844dee8f9f9b8a0a175f7ebf005cb205046")))
+       (file-name "guile-inkplate-0.1-checkout")
+       (sha256 (base32 "00qx2d16xma19myq4lla3gnq8rljsqbns53ma5hwamkyvwwyd55s"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (add-before 'configure 'autoreconf
            (lambda* (#:key inputs #:allow-other-keys)
-             (system* (string-append (assoc-ref inputs "autoconf") "/bin/autoreconf")))))))
+             (system*
+              (string-append (assoc-ref inputs "autoconf") "/bin/autoreconf")))))))
     (native-inputs
-      `(("autoconf" ,autoconf)
-        ("automake" ,automake)
-        ("pkg-config" ,pkg-config)
-        ("texinfo" ,texinfo)))
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)))
     (inputs `(("guile" ,guile-3.0)))
     (propagated-inputs
      (list guile-termios))
diff --git a/oni/packages/mpd.scm b/oni/packages/mpd.scm
index 63f83d7..7be0767 100644
--- a/oni/packages/mpd.scm
+++ b/oni/packages/mpd.scm
@@ -46,7 +46,8 @@
                  (install-file "mpd-notify" bin)))))))
       (home-page "https://ryuslash.org/")
       (synopsis "A simple script that notifies you of MPD player state changes.")
-      (description "Uses `mpc idleloop' to listen to player state changes and sends notifications.")
+      (description
+       "Uses `mpc idleloop' to listen to player state changes and sends notifications.")
       (license license:gpl3+))))
 
 (define-public mpd-random-albums
@@ -76,12 +77,15 @@
            (replace 'install
              (lambda* (#:key outputs #:allow-other-keys)
                (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
-                     (site (string-append (assoc-ref outputs "out") "/share/scsh-0.7")))
+                     (site
+                      (string-append (assoc-ref outputs "out") "/share/scsh-0.7")))
                  (install-file "mpd-random-albums" bin)
                  (install-file "mpd.scm" site)))))))
       (home-page "https://ryuslash.org/")
-      (synopsis "A simple script that populates the MPD playlist with all of my albums in random order.")
-      (description "Creates a new playlist in MPD with all of the albums in my database and shuffles them by album.")
+      (synopsis
+       "A simple script that populates the MPD playlist with all of my albums in random order.")
+      (description
+       "Creates a new playlist in MPD with all of the albums in my database and shuffles them by album.")
       (license license:gpl3+))))
 
 (define-public mpdscrobble
diff --git a/oni/packages/pick-random-wallpaper.scm b/oni/packages/pick-random-wallpaper.scm
index 7f4a706..477d07e 100644
--- a/oni/packages/pick-random-wallpaper.scm
+++ b/oni/packages/pick-random-wallpaper.scm
@@ -28,7 +28,7 @@
        (list findutils bash herbstluftwm xwininfo coreutils feh))
       (build-system gnu-build-system)
       (arguments
-       `(#:tests? #f                     ; There is no test suite.
+       `(#:tests? #f                    ; There is no test suite.
          #:phases
          (modify-phases %standard-phases
            (delete 'configure)
@@ -39,5 +39,6 @@
                  (install-file "pick-random-wallpaper" bin)))))))
       (home-page "https://ryuslash.org/")
       (synopsis "A simple script that sets a random wallpaper using feh.")
-      (description "Sets a random wallpaper using feh and stores which wallpaper was added in a herbstluftwm attribute.")
+      (description
+       "Sets a random wallpaper using feh and stores which wallpaper was added in a herbstluftwm attribute.")
       (license license:gpl3+))))
diff --git a/oni/packages/scsh.scm b/oni/packages/scsh.scm
index 5aee152..0ceb6c5 100644
--- a/oni/packages/scsh.scm
+++ b/oni/packages/scsh.scm
@@ -1,47 +1,47 @@
 (define-module (oni packages scsh)
- #:use-module (gnu packages)
- #:use-module (gnu packages autotools)
- #:use-module (gnu packages base)
- #:use-module (gnu packages bash)
- #:use-module (gnu packages bison)
- #:use-module (gnu packages check)
- #:use-module (gnu packages compression)
- #:use-module (gnu packages crypto)
- #:use-module (gnu packages curl)
- #:use-module (gnu packages documentation)
- #:use-module (gnu packages groff)
- #:use-module (gnu packages guile)
- #:use-module (gnu packages libbsd)
- #:use-module (gnu packages libedit)
- #:use-module (gnu packages linux)
- #:use-module (gnu packages ncurses)
- #:use-module (gnu packages pcre)
- #:use-module (gnu packages perl)
- #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages python)
- #:use-module (gnu packages python-build)
- #:use-module (gnu packages python-check)
- #:use-module (gnu packages python-web)
- #:use-module (gnu packages python-xyz)
- #:use-module (gnu packages readline)
- #:use-module (gnu packages scheme)
- #:use-module (gnu packages terminals)
- #:use-module (gnu packages version-control)
- #:use-module (gnu packages xdisorg)
- #:use-module (gnu packages xorg)
- #:use-module (gnu packages texinfo)
- #:use-module (guix build-system cmake)
- #:use-module (guix build-system gnu)
- #:use-module (guix build-system meson)
- #:use-module (guix build-system pyproject)
- #:use-module (guix build-system python)
- #:use-module (guix build-system trivial)
- #:use-module (guix download)
- #:use-module (guix git-download)
- #:use-module (guix gexp)
- #:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix packages)
- #:use-module (guix utils))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages groff)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages libbsd)
+  #:use-module (gnu packages libedit)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-check)
+  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages scheme)
+  #:use-module (gnu packages terminals)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages texinfo)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
 
 (define-public scsh
   (let ((commit "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052")
@@ -65,7 +65,8 @@
           #~(begin
               (substitute* "Makefile.in"
                 (("SCHEME48VERSION =  1.9.2")
-                 (string-append "SCHEME48VERSION =  " #$(package-version scheme48))))))))
+                 (string-append "SCHEME48VERSION =  " #$
+                                (package-version scheme48))))))))
       (build-system gnu-build-system)
       (arguments
        (list
diff --git a/oni/packages/zsh.scm b/oni/packages/zsh.scm
index e5cad34..ba4e814 100644
--- a/oni/packages/zsh.scm
+++ b/oni/packages/zsh.scm
@@ -15,7 +15,8 @@
       (version (git-version "0.0.0" revision commit))
       (source (origin
                 (uri (git-reference
-                      (url "https://github.com/langston-barrett/zsh-contextual-abbrevs.git")
+                      (url
+                       "https://github.com/langston-barrett/zsh-contextual-abbrevs.git")
                       (commit commit)))
                 (method git-fetch)
                 (sha256
author	Tom Willemse	2026-01-17 12:29:08 -0800
committer	Tom Willemse	2026-01-18 01:07:32 -0800
commit	3ca6f519c9dfd164c06e45f404490b287d0b501c (patch)
tree	12b0ec531e698d11307d7d99c5943af443e72732 /oni
parent	1d1bddee77c43d04ea474f3e0c4d7cfa6b5712bb (diff)
download	new-dotfiles-3ca6f519c9dfd164c06e45f404490b287d0b501c.tar.gz new-dotfiles-3ca6f519c9dfd164c06e45f404490b287d0b501c.zip