refactor(izumi): consolidate EMACS-HOME-PROFILE

2 files changed, 172 insertions, 177 deletions

diff --git a/systems/izumi/home-configuration.scm b/systems/izumi/home-configuration.scm
index faa6d9e..6697d57 100644
--- a/systems/izumi/home-configuration.scm
+++ b/systems/izumi/home-configuration.scm
@@ -46,92 +46,92 @@
                   (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
+                                     '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
+                                            #~
                                             (list
-                                     	#: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"))))
+                                             "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
diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index 7294007..76a64bb 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -370,18 +370,93 @@
 #+NAME: ESSENTIAL-HOME-SERVICES
 #+BEGIN_SRC scheme
   (list
-   <<EMACS-HOME-PROFILE>>
-   (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
+   '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
+          #~
+          (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
@@ -449,83 +524,3 @@
    (guix gexp))
 #+END_SRC
 
-#+NAME: EMACS-HOME-PROFILE
-#+BEGIN_SRC scheme
-  (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
-  	#~
-  	(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+))))))
-#+END_SRC
-