diff --git a/home/home-configuration.scm b/home/home-configuration.scm
index becb3e5..94c5b6a 100644
--- a/home/home-configuration.scm
+++ b/home/home-configuration.scm
@@ -5,89 +5,99 @@
 ;; need to capture the channels being used, as returned by "guix describe".
 ;; See the "Replicating Guix" section in the manual.
 
-(use-modules (gnu home)
-             (gnu packages)
-             (gnu services)
-             (guix gexp)
-             (gnu home services gnupg)
-             (gnu home services mcron)
-             (gnu home services pm)
-             (gnu home services shells)
-             (gnu home services shepherd)
-             (gnu home services ssh))
+(use-modules
+ (gnu home)
+ (gnu packages)
+ (gnu packages gnupg)
+ (gnu services)
+ (guix gexp)
+ (gnu home services gnupg)
+ (gnu home services mcron)
+ (gnu home services pm)
+ (gnu home services shells)
+ (gnu home services shepherd)
+ (gnu home services ssh))
 
 (home-environment
-  ;; Below is the list of packages that will show up in your
-  ;; Home profile, under ~/.guix-home/profile.
+ ;; Below is the list of packages that will show up in your
+ ;; Home profile, under ~/.guix-home/profile.
  (packages
   (specifications->packages
    (list pinentry-qt)))
-
-  ;; Below is the list of Home services.  To search for available
-  ;; services, run 'guix home search KEYWORD' in a terminal.
-  (services
-   (list
-    (service home-msmtp-service-type
-             (home-msmtp-configuration
-              (accounts
-               (list
-                (msmtp-account
-                 (name "LMail")
-                 (configuration
-                  (msmtp-configuration
-                   (host "lyrion.ch")
-                   (port 587)
-                   (user "dziltener")
-                   (password-eval "pass Privat/Mailaccount | head -n 1"))))
-                (msmtp-account
-                 (name "Red Sky")
-                 (configuration
-                  (msmtp-configuration
-                   (host "gmail.com")
-                   (port 587)
-                   (user "dz@redsky.io")
-                   (password-eval "pass Privat/RedSkyGMail"))))))))
-    (simple-service 'ziltis-environment-variable-service
-                    home-enviornment-variables-service-type
-                    `(("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store")
-                      ("SSH_ASKPASS" . "ksshaskpass")))
-    (service home-bash-service-type
-                  (home-bash-configuration
-                   (aliases '(("hh" . "hstr") ("l" . "ls -alh")
-                              ("ll" . "ls -l")
-                              ("ls" . "ls --color=tty")))
-                   (bashrc (list (local-file
-                                  "/home/zilti/projects/guixconfig//.bashrc"
-                                  "bashrc")))
-                   (bash-profile (list (local-file
-                                        "/home/zilti/projects/guixconfig//.bash_profile"
-                                        "bash_profile")))))
-    (service home-dicod-service-type)
-    (service home-batsignal-service-type)
-    (service home-shepherd-service-type)
-    (service home-mcron-service-type
-             (home-mcron-configuration
-              (jobs '())))
-    (simple-service 'ziltis-channels
-                    home-channels-service-type
-                    (list
-                     (channel
-                      (name 'ziltis-channel)
-                      (url "https://gitea.lyrion.ch/zilti/guixchannel.git"))))
-    (service home-openssh-service-type
-             (home-openssh-configuration
-              (hosts
-               (list (openssh-host (name "gitea.lyrion.ch")
-                                   (host-name "gitea.lyrion.ch")
-                                   (user "git")
-                                   (port 7920))))))
-    (service home-gpg-agent-service-type
-             (home-gpg-agent-configuration
-              (pinentry-program
-               (file-append pinentry-qt "/bin/pinentry-qt"))
-              (ssh-support? #t)
-              (default-cache-ttl 7200)
-              (default-cache-ttl-ssh 7200)
-              (extra-content "allow-emacs-pinentry\nallow-loopback-pinentry")))
-    (service home-dbus-service-type)
-    )))
+ ;; Below is the list of Home services.  To search for available
+ ;; services, run 'guix home search KEYWORD' in a terminal.
+ (services
+  (list
+   (service home-msmtp-service-type
+            (home-msmtp-configuration
+             (accounts
+              (list
+               (msmtp-account
+                (name "LMail")
+                (configuration
+                 (msmtp-configuration
+                  (host "lyrion.ch")
+                  (port 587)
+                  (user "dziltener")
+                  (password-eval "pass Privat/Mailaccount | head -n 1"))))
+               (msmtp-account
+                (name "Red Sky")
+                (configuration
+                 (msmtp-configuration
+                  (host "gmail.com")
+                  (port 587)
+                  (user "dz@redsky.io")
+                  (password-eval "pass Privat/RedSkyGMail"))))))))
+   (simple-service 'ziltis-environment-variable-service
+                   home-enviornment-variables-service-type
+                   `(("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store")
+                     ("SSH_ASKPASS" . "ksshaskpass")))
+   (service home-bash-service-type
+            (home-bash-configuration
+             (aliases
+              '(("hh" . "hstr")
+                ("l" . "ls -alh")
+                ("ll" . "ls -l")
+                ("ls" . "ls --color=tty")))
+             (bashrc
+              (list
+               (local-file
+                "/home/zilti/projects/guixconfig//.bashrc"
+                "bashrc")))
+             (bash-profile
+              (list
+               (local-file
+                "/home/zilti/projects/guixconfig//.bash_profile"
+                "bash_profile")))))
+   (service home-dicod-service-type)
+   (service home-batsignal-service-type)
+   (service home-shepherd-service-type)
+   (service home-mcron-service-type
+            (home-mcron-configuration
+             (jobs
+              '())))
+   (simple-service 'ziltis-channels
+                   home-channels-service-type
+                   (list
+                    (channel
+                     (name 'ziltis-channel)
+                     (url "https://gitea.lyrion.ch/zilti/guixchannel.git"))))
+   (service home-openssh-service-type
+            (home-openssh-configuration
+             (hosts
+              (list
+               (openssh-host
+                (name "gitea.lyrion.ch")
+                (host-name "gitea.lyrion.ch")
+                (user "git")
+                (port 7920))))))
+   (service home-gpg-agent-service-type
+            (home-gpg-agent-configuration
+             (pinentry-program
+              (file-append pinentry-qt "/bin/pinentry-qt"))
+             (ssh-support? #t)
+             (default-cache-ttl 7200)
+             (default-cache-ttl-ssh 7200)
+             (extra-content "allow-emacs-pinentry\nallow-loopback-pinentry")))
+   (service home-dbus-service-type)
+   )))
diff --git a/home/home.scm b/home/home.scm
deleted file mode 100644
index e69de29..0000000