refactor(izumi): consolidate ESSENTIAL-HOME-SERVICES

1 files changed, 135 insertions, 135 deletions

diff --git a/systems/izumi/home-configuration.scm b/systems/izumi/home-configuration.scm
index 7fc60c2..02781a3 100644
--- a/systems/izumi/home-configuration.scm
+++ b/systems/izumi/home-configuration.scm
@@ -48,139 +48,139 @@
                   (services (append (list izumi-channels-service-type)
                                     (list
                                      (simple-service
-                                     'emacs-home-profile
-                                     home-profile-service-type
-                                     (append
-                                      (list emacs-guix emacs-nix-mode)
-                                      (list
-                                       (let
-                                           ((commit* "wip-algo-tn"))
-                                         (package
-                                          (name "emacs-org-fc")
-                                          (version (git-version "0.1.2" "0" commit*))
-                                          (source
-                                           (origin
-                                            (method git-fetch)
-                                            (uri
-                                             (git-reference
-                                              (url "https://git.marekpasnikowski.pl/org-fc.git")
-                                              (commit commit*)))
-                                            (file-name (git-file-name name version))
-                                            (sha256 (base32 "1i8ii1garx2pdg08a12yzsd0fhwdzcpxp9m97zj8m5s275i8ccaj"))))
-                                          (build-system emacs-build-system)
-                                          (arguments
-                                           (list
-                                            #:include #~ (cons* "\\.awk$" "\\.org$" %default-include)
-                                            #:exclude #~ (cons "^test/" %default-exclude)
-                                            #:tests? #t
-                                            #:test-command
-                                            #~
+                                      'emacs-home-profile
+                                      home-profile-service-type
+                                      (append
+                                       (list emacs-guix emacs-nix-mode)
+                                       (list
+                                        (let
+                                            ((commit* "wip-algo-tn"))
+                                          (package
+                                           (name "emacs-org-fc")
+                                           (version (git-version "0.1.2" "0" commit*))
+                                           (source
+                                            (origin
+                                             (method git-fetch)
+                                             (uri
+                                              (git-reference
+                                               (url "https://git.marekpasnikowski.pl/org-fc.git")
+                                               (commit commit*)))
+                                             (file-name (git-file-name name version))
+                                             (sha256 (base32 "1i8ii1garx2pdg08a12yzsd0fhwdzcpxp9m97zj8m5s275i8ccaj"))))
+                                           (build-system emacs-build-system)
+                                           (arguments
                                             (list
-                                             "emacs"
-                                             "--batch"
-                                             "-L" "."
-                                             "-L" "tests/"
-                                             "-l" "tests/org-fc-filter-test.el"
-                                             "-l" "tests/org-fc-indexer-test.el"
-                                             "-l" "tests/org-fc-review-data-test.el"
-                                             "-f" "ert-run-tests-batch-and-exit")
-                                            #:phases
-                                            #~
-                                            (modify-phases
-                                             %standard-phases
-                                             (add-after
-                                              'unpack
-                                              'qualify-paths
-                                              (lambda*
-                                               (#:key inputs
-                                                #:allow-other-keys)
-                                               (substitute*
-                                                "org-fc-awk.el"
-                                                (("\"find ")
-                                                 (string-append
-                                                  "\""
-                                                  (search-input-file inputs "/bin/find")
-                                                  " "))
-                                                (("\"gawk ")
-                                                 (string-append
-                                                  "\""
-                                                  (search-input-file inputs "/bin/gawk")
-                                                  " "))
-                                                (("\"xargs ")
-                                                 (string-append
-                                                  "\""
-                                                  (search-input-file inputs "/bin/xargs")
-                                                  " "))))))))
-                                          (inputs (list findutils gawk))
-                                          (propagated-inputs (list emacs-hydra))
-                                          (home-page "https://www.leonrische.me/fc/index.html")
-                                          (synopsis "Spaced repetition system for Emacs Org mode")
-                                          (description
-                                           (string-append
-                                            "Org-fc is a spaced-repetition system for Emacs' Org mode.\n"
-                                            "It allows you to mark headlines in a file as flashcards, turning pieces of\n"
-                                            "knowledge you want to learn into a question-answer test.  These cards are\n"
-                                            "reviewed at regular interval.  After each review, the next review interval is\n"
-                                            "calculated based on how well you remembered the contents of the card.\n"))
-                                          (license license:gpl3+))))))
-                                    (simple-service 'home-files
-                                                    home-files-service-type
-                                                    (list (list ".config/emacs/init.el"
-                                                                (local-file "home-files/emacs-configuration.el" ))
-                                                          (list ".gnus"
-                                                                (local-file "home-files/gnus-configuration.el"))
-                                                          (list ".gitconfig"
-                                                                (local-file "home-files/gitconfig"))
-                                                          (list ".config/git/ignore"
-                                                                ;; https://github.com/github/gitignore/blob/main/Global/Emacs.gitignore
-                                                                (local-file "home-files/git-ignore.conf"))))
-                                     (simple-service
-                                      'environment-variables
-                                      home-environment-variables-service-type
-                                      `(("EDITOR" . "emacsclient -nw"))))
-                                    (list
-                                     (let*
-                                         ((and "&& ")
-                                          (collect-garbage "sudo guix gc -d 7d ")
-                                          (configuration-prefix
-                                           "/home/marek/Publiczny/src/deployment/systems/izumi/")
-                                          (pull-guix "guix pull ")
-                                          (reconfigure-home
-                                           (string-append
-                                            "guix home delete-generations 7d ; "
-                                            "guix home reconfigure "
-                                            configuration-prefix
-                                            "home-configuration.scm "))
-                                          (reconfigure-system
-                                           (string-append
-                                            "sudo guix system delete-generations 7d ; "
-                                            "sudo guix system reconfigure "
-                                            configuration-prefix
-                                            "system-configuration.scm "))
-                                          (update-system
-                                           (string-append
-                                            pull-guix
-                                            and
-                                            reconfigure-system
-                                            and
-                                            reconfigure-home
-                                            and
-                                            collect-garbage)))
-                                       (simple-service
-                                        'bash-extension
-                                        home-bash-service-type
-                                        (home-bash-extension
-                                         (aliases
-                                          `(("collect-garbage" . ,collect-garbage)
-                                            ("edit" . "$EDITOR")
-                                            ("pull-guix" . ,pull-guix)
-                                            ("reconfigure-home" . ,reconfigure-home)
-                                            ("reconfigure-system" . ,reconfigure-system)
-                                            ("update-system" . ,update-system)))
-                                         (bash-profile
-                                          (list
-                                           (mixed-text-file
-                                            "newline-prompt"
-                                            "PS1=${PS1%?}\n"
-                                            "PS1=${PS1%?}\\n'$ '\n"
-                                            "PS1=\"\\n$PS1\""))))))))))
+                                             #:include #~ (cons* "\\.awk$" "\\.org$" %default-include)
+                                             #:exclude #~ (cons "^test/" %default-exclude)
+                                             #:tests? #t
+                                             #:test-command
+                                             #~
+                                             (list
+                                              "emacs"
+                                              "--batch"
+                                              "-L" "."
+                                              "-L" "tests/"
+                                              "-l" "tests/org-fc-filter-test.el"
+                                              "-l" "tests/org-fc-indexer-test.el"
+                                              "-l" "tests/org-fc-review-data-test.el"
+                                              "-f" "ert-run-tests-batch-and-exit")
+                                             #:phases
+                                             #~
+                                             (modify-phases
+                                              %standard-phases
+                                              (add-after
+                                               'unpack
+                                               'qualify-paths
+                                               (lambda*
+                                                (#:key inputs
+                                                 #:allow-other-keys)
+                                                (substitute*
+                                                 "org-fc-awk.el"
+                                                 (("\"find ")
+                                                  (string-append
+                                                   "\""
+                                                   (search-input-file inputs "/bin/find")
+                                                   " "))
+                                                 (("\"gawk ")
+                                                  (string-append
+                                                   "\""
+                                                   (search-input-file inputs "/bin/gawk")
+                                                   " "))
+                                                 (("\"xargs ")
+                                                  (string-append
+                                                   "\""
+                                                   (search-input-file inputs "/bin/xargs")
+                                                   " "))))))))
+                                           (inputs (list findutils gawk))
+                                           (propagated-inputs (list emacs-hydra))
+                                           (home-page "https://www.leonrische.me/fc/index.html")
+                                           (synopsis "Spaced repetition system for Emacs Org mode")
+                                           (description
+                                            (string-append
+                                             "Org-fc is a spaced-repetition system for Emacs' Org mode.\n"
+                                             "It allows you to mark headlines in a file as flashcards, turning pieces of\n"
+                                             "knowledge you want to learn into a question-answer test.  These cards are\n"
+                                             "reviewed at regular interval.  After each review, the next review interval is\n"
+                                             "calculated based on how well you remembered the contents of the card.\n"))
+                                           (license license:gpl3+))))))
+                                     (simple-service 'home-files
+                                                     home-files-service-type
+                                                     (list (list ".config/emacs/init.el"
+                                                                 (local-file "home-files/emacs-configuration.el" ))
+                                                           (list ".gnus"
+                                                                 (local-file "home-files/gnus-configuration.el"))
+                                                           (list ".gitconfig"
+                                                                 (local-file "home-files/gitconfig"))
+                                                           (list ".config/git/ignore"
+                                                                 ;; https://github.com/github/gitignore/blob/main/Global/Emacs.gitignore
+                                                                 (local-file "home-files/git-ignore.conf"))))
+ (simple-service
+  'environment-variables
+  home-environment-variables-service-type
+  `(("EDITOR" . "emacsclient -nw"))))
+(list
+ (let*
+     ((and "&& ")
+      (collect-garbage "sudo guix gc -d 7d ")
+      (configuration-prefix
+       "/home/marek/Publiczny/src/deployment/systems/izumi/")
+      (pull-guix "guix pull ")
+      (reconfigure-home
+       (string-append
+        "guix home delete-generations 7d ; "
+        "guix home reconfigure "
+        configuration-prefix
+        "home-configuration.scm "))
+      (reconfigure-system
+       (string-append
+        "sudo guix system delete-generations 7d ; "
+        "sudo guix system reconfigure "
+        configuration-prefix
+        "system-configuration.scm "))
+      (update-system
+       (string-append
+        pull-guix
+        and
+        reconfigure-system
+        and
+        reconfigure-home
+        and
+        collect-garbage)))
+   (simple-service
+    'bash-extension
+    home-bash-service-type
+    (home-bash-extension
+     (aliases
+      `(("collect-garbage" . ,collect-garbage)
+        ("edit" . "$EDITOR")
+        ("pull-guix" . ,pull-guix)
+        ("reconfigure-home" . ,reconfigure-home)
+        ("reconfigure-system" . ,reconfigure-system)
+        ("update-system" . ,update-system)))
+     (bash-profile
+      (list
+       (mixed-text-file
+        "newline-prompt"
+        "PS1=${PS1%?}\n"
+        "PS1=${PS1%?}\\n'$ '\n"
+        "PS1=\"\\n$PS1\""))))))))))