Reindent file

1 files changed, 115 insertions, 96 deletions

diff --git a/oni/home/services/zsh.scm b/oni/home/services/zsh.scm
index 254acd9..b40ad64 100644
--- a/oni/home/services/zsh.scm
+++ b/oni/home/services/zsh.scm
@@ -20,70 +20,75 @@
             home-zsh-autopair-service-type
             home-zsh-autopair-configuration
             home-zsh-atuin-service-type
-            home-zsh-atuin-configuration))
+            home-zsh-atuin-configuration
+            home-zsh-completion-service-type
+            home-zsh-completion-configuration))
 
 (define-maybe string)
 
 (define-configuration/no-serialization home-zsh-autosuggestions-configuration
   (package
-   (package zsh-autosuggestions)
-   "Package to use for setting zsh-autosuggestions"))
+    (package zsh-autosuggestions)
+    "Package to use for setting zsh-autosuggestions"))
 
 (define (add-zsh-autosuggestions config)
   (home-zsh-extension
-   (zshrc
-    (list
-     (mixed-text-file
-      "zshrc"
-      "source " (home-zsh-autosuggestions-configuration-package config) "/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh")))))
+    (zshrc
+     (list
+      (mixed-text-file
+       "zshrc"
+       "source " (home-zsh-autosuggestions-configuration-package config)
+       "/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh")))))
 
 (define (add-zsh-autosuggestions-packages config)
   (list (home-zsh-autosuggestions-configuration-package config)))
 
 (define home-zsh-autosuggestions-service-type
   (service-type
-   (name 'home-zsh-autosuggestions)
-   (extensions
-    (list (service-extension
-           home-zsh-service-type
-           add-zsh-autosuggestions)
-          (service-extension
-           home-profile-service-type
-           add-zsh-autosuggestions-packages)))
-   (compose identity)
-   (default-value (home-zsh-autosuggestions-configuration))
-   (description "Install and configure zsh-autosuggestions.")))
+    (name 'home-zsh-autosuggestions)
+    (extensions
+     (list (service-extension
+            home-zsh-service-type
+            add-zsh-autosuggestions)
+           (service-extension
+            home-profile-service-type
+            add-zsh-autosuggestions-packages)))
+    (compose identity)
+    (default-value (home-zsh-autosuggestions-configuration))
+    (description "Install and configure zsh-autosuggestions.")))
 
 
-(define-configuration/no-serialization home-zsh-syntax-highlighting-configuration
+(define-configuration/no-serialization
+  home-zsh-syntax-highlighting-configuration
   (package
-   (package zsh-syntax-highlighting)
-   "Package to use for setting zsh-syntax-highlighting."))
+    (package zsh-syntax-highlighting)
+    "Package to use for setting zsh-syntax-highlighting."))
 
 (define (add-zsh-syntax-highlighting config)
   (home-zsh-extension
-   (zshrc
-    (list
-     (mixed-text-file
-      "zshrc"
-      "source " (home-zsh-syntax-highlighting-configuration-package config) "/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh")))))
+    (zshrc
+     (list
+      (mixed-text-file
+       "zshrc"
+       "source " (home-zsh-syntax-highlighting-configuration-package config)
+       "/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh")))))
 
 (define (add-zsh-syntax-highlighting-packages config)
   (list (home-zsh-syntax-highlighting-configuration-package config)))
 
 (define home-zsh-syntax-highlighting-service-type
   (service-type
-   (name 'home-zsh-syntax-highlighting)
-   (extensions
-    (list (service-extension
-           home-zsh-service-type
-           add-zsh-syntax-highlighting)
-          (service-extension
-           home-profile-service-type
-           add-zsh-syntax-highlighting-packages)))
-   (compose identity)
-   (default-value (home-zsh-syntax-highlighting-configuration))
-   (description "Install and configure zsh-syntax-highlighting.")))
+    (name 'home-zsh-syntax-highlighting)
+    (extensions
+     (list (service-extension
+            home-zsh-service-type
+            add-zsh-syntax-highlighting)
+           (service-extension
+            home-profile-service-type
+            add-zsh-syntax-highlighting-packages)))
+    (compose identity)
+    (default-value (home-zsh-syntax-highlighting-configuration))
+    (description "Install and configure zsh-syntax-highlighting.")))
 
 (define-configuration/no-serialization home-zsh-contextual-abbrevs-configuration
   (package
@@ -92,28 +97,29 @@
 
 (define (add-zsh-contextual-abbrevs config)
   (home-zsh-extension
-   (zshrc
-    (list
-     (mixed-text-file
-      "zshrc"
-      "source " (home-zsh-contextual-abbrevs-configuration-package config) "/share/zsh/plugins/zsh-contextual-abbrevs/contextual-abbrevs.zsh")))))
+    (zshrc
+     (list
+      (mixed-text-file
+       "zshrc"
+       "source " (home-zsh-contextual-abbrevs-configuration-package config)
+       "/share/zsh/plugins/zsh-contextual-abbrevs/contextual-abbrevs.zsh")))))
 
 (define (add-zsh-contextual-abbrevs-packages config)
   (list (home-zsh-contextual-abbrevs-configuration-package config)))
 
 (define home-zsh-contextual-abbrevs-service-type
   (service-type
-   (name 'home-zsh-contextual-abbrevs)
-   (extensions
-    (list (service-extension
-           home-zsh-service-type
-           add-zsh-contextual-abbrevs)
-          (service-extension
-           home-profile-service-type
-           add-zsh-contextual-abbrevs-packages)))
-   (compose identity)
-   (default-value (home-zsh-contextual-abbrevs-configuration))
-   (description "Install and configure zsh-contextual-abbrevs.")))
+    (name 'home-zsh-contextual-abbrevs)
+    (extensions
+     (list (service-extension
+            home-zsh-service-type
+            add-zsh-contextual-abbrevs)
+           (service-extension
+            home-profile-service-type
+            add-zsh-contextual-abbrevs-packages)))
+    (compose identity)
+    (default-value (home-zsh-contextual-abbrevs-configuration))
+    (description "Install and configure zsh-contextual-abbrevs.")))
 
 (define-configuration/no-serialization home-zsh-autopair-configuration
   (package
@@ -122,28 +128,29 @@
 
 (define (add-zsh-autopair config)
   (home-zsh-extension
-   (zshrc
-    (list
-     (mixed-text-file
-      "zshrc"
-      "source " (home-zsh-autopair-configuration-package config) "/share/zsh/plugins/zsh-autopair/zsh-autopair.zsh")))))
+    (zshrc
+     (list
+      (mixed-text-file
+       "zshrc"
+       "source " (home-zsh-autopair-configuration-package config)
+       "/share/zsh/plugins/zsh-autopair/zsh-autopair.zsh")))))
 
 (define (add-zsh-autopair-packages config)
   (list (home-zsh-autopair-configuration-package config)))
 
 (define home-zsh-autopair-service-type
   (service-type
-   (name 'home-zsh-autopair)
-   (extensions
-    (list (service-extension
-           home-zsh-service-type
-           add-zsh-autopair)
-          (service-extension
-           home-profile-service-type
-           add-zsh-autopair-packages)))
-   (compose identity)
-   (default-value (home-zsh-autopair-configuration))
-   (description "Install and configure zsh-autopair.")))
+    (name 'home-zsh-autopair)
+    (extensions
+     (list (service-extension
+            home-zsh-service-type
+            add-zsh-autopair)
+           (service-extension
+            home-profile-service-type
+            add-zsh-autopair-packages)))
+    (compose identity)
+    (default-value (home-zsh-autopair-configuration))
+    (description "Install and configure zsh-autopair.")))
 
 (define (serialize-field-name field)
   (string-replace-substring (symbol->string field) "-" "_"))
@@ -156,7 +163,9 @@
 
 (define (serialize-list-of-strings field value)
   (format #f "~a = ~a~%" (serialize-field-name field)
-          (string-append "[" (string-join (map (λ (v) (format #f "~s" v)) value) ",") "]")))
+          (string-append "["
+                         (string-join (map (λ (v) (format #f "~s" v)) value) ",")
+                         "]")))
 
 (define (serialize-boolean field value)
   (format #f "~a = ~a~%" (serialize-field-name field) (if value "true" "false")))
@@ -201,40 +210,50 @@ statistics. For example, consider kubectl get rather than just kubectl.")
 
 (define (add-zsh-atuin config)
   (home-zsh-extension
-   (zshrc
-    (list
-     (mixed-text-file
-      "zshrc"
-      "eval \"$(" (home-zsh-atuin-configuration-package config) "/bin/atuin init zsh)\"\n"
-      "bindkey -M emacs '^p' atuin-up-search\n"
-      "bindkey -M emacs '^[p' atuin-up-search\n")))))
+    (zshrc
+     (list
+      (mixed-text-file
+       "zshrc"
+       "eval \"$(" (home-zsh-atuin-configuration-package config)
+       "/bin/atuin init zsh)\"\n"
+       "bindkey -M emacs '^p' atuin-up-search\n"
+       "bindkey -M emacs '^[p' atuin-up-search\n")))))
 
 (define (add-zsh-atuin-configuration config)
   `(("atuin/config.toml"
      ,(mixed-text-file
        "config.toml"
-       (serialize-configuration config (filter (λ (f) (not (string= "common-subcommands" (symbol->string (configuration-field-name f)))))
-                                               home-zsh-atuin-configuration-fields))
+       (serialize-configuration config (filter
+                                        (λ (f)
+                                          (not
+                                           (string= "common-subcommands"
+                                                    (symbol->string
+                                                     (configuration-field-name f)))))
+                                        home-zsh-atuin-configuration-fields))
        "[stats]\n"
-       (serialize-configuration config (filter (λ (f) (string= "common-subcommands" (symbol->string (configuration-field-name f))))
-                                               home-zsh-atuin-configuration-fields))))))
+       (serialize-configuration config (filter
+                                        (λ (f)
+                                          (string= "common-subcommands"
+                                                   (symbol->string
+                                                    (configuration-field-name f))))
+                                        home-zsh-atuin-configuration-fields))))))
 
 (define (add-zsh-atuin-packages config)
   (list (home-zsh-atuin-configuration-package config)))
 
 (define home-zsh-atuin-service-type
   (service-type
-   (name 'home-zsh-atuin)
-   (extensions
-    (list (service-extension
-           home-zsh-service-type
-           add-zsh-atuin)
-          (service-extension
-           home-profile-service-type
-           add-zsh-atuin-packages)
-          (service-extension
-           home-xdg-configuration-files-service-type
-           add-zsh-atuin-configuration)))
-   (compose identity)
-   (default-value (home-zsh-atuin-configuration))
-   (description "Install and configure atuin.")))
+    (name 'home-zsh-atuin)
+    (extensions
+     (list (service-extension
+            home-zsh-service-type
+            add-zsh-atuin)
+           (service-extension
+            home-profile-service-type
+            add-zsh-atuin-packages)
+           (service-extension
+            home-xdg-configuration-files-service-type
+            add-zsh-atuin-configuration)))
+    (compose identity)
+    (default-value (home-zsh-atuin-configuration))
+    (description "Install and configure atuin.")))