Flyover: Add package and home service

3 files changed, 47 insertions, 35 deletions

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 888c948..c002b87 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -70,28 +70,7 @@
                 #:select (home-copyq-service-type))
   #:use-module ((oni home services dunst)
                 #:select (home-dunst-default-service))
-  #:use-module ((oni home services emacs)
-                #:select (home-emacs-service-type
-                          home-emacs-configuration
-                          home-emacs-helpful-configuration
-                          home-emacs-yasnippet-capf-configuration
-                          home-emacs-envrc-configuration
-                          home-emacs-dashboard-service-type
-                          home-emacs-dashboard-configuration
-                          home-emacs-eros-service-type
-                          home-emacs-ace-link-service-type
-                          home-emacs-ace-link-configuration
-                          home-emacs-ace-link-notmuch-service-type
-                          home-emacs-ace-link-notmuch-configuration
-                          home-emacs-golden-ratio-service-type
-                          home-emacs-pinentry-service-type
-                          home-emacs-vterm-service-type
-                          home-emacs-vterm-configuration
-                          home-emacs-org-modern-service-type
-                          home-emacs-org-modern-configuration
-                          home-wakatime-service-type
-                          home-wakatime-configuration
-                          home-emacs-org-journal-service-type))
+  #:use-module (oni home services emacs)
   #:use-module ((oni home services environment)
                 #:select (home-environment-service))
   #:use-module ((oni home services flameshot)
@@ -145,14 +124,7 @@
                           home-zsh-atuin-configuration))
   #:use-module ((oni packages count-emails)
                 #:select (count-emails))
-  #:use-module ((oni packages emacs)
-                #:select (emacs-inkplate
-                          emacs-outli
-                          emacs-syncthing-status
-                          emacs-nginx-mode
-                          emacs-next-org-modern
-                          emacs-indexed
-                          my-emacs-org-roam))
+  #:use-module (oni packages emacs)
   #:use-module ((oni packages emacs-config)
                 #:select (emacs-oni-org-roam
                           emacs-oni-elfeed
@@ -432,6 +404,8 @@
              (home-emacs-org-modern-configuration
               (package emacs-next-org-modern)))
     (service home-emacs-org-journal-service-type)
+    (service home-emacs-flyover-service-type)
+
     (service home-wakatime-service-type
              (home-wakatime-configuration
               (api-url "https://waka.ryuslash.org/api")
diff --git a/oni/home/services/emacs.scm b/oni/home/services/emacs.scm
index 5a93fb9..be0fc7c 100644
--- a/oni/home/services/emacs.scm
+++ b/oni/home/services/emacs.scm
@@ -39,10 +39,7 @@
                           mixed-text-file))
   #:use-module ((guix packages)
                 #:select (package?))
-  #:use-module ((oni packages emacs)
-                #:select (emacs-yasnippet-capf
-                          emacs-golden-ratio
-                          emacs-ace-link-notmuch))
+  #:use-module (oni packages emacs)
   #:use-module ((rosenthal packages binaries)
                 #:select (wakatime-cli-bin))
   #:use-module ((rosenthal packages emacs-xyz)
@@ -87,7 +84,10 @@
             home-emacs-org-caldav-configration
 
             home-emacs-org-journal-service-type
-            home-emacs-org-journal-configuration))
+            home-emacs-org-journal-configuration
+
+            home-emacs-flyover-service-type
+            home-emacs-flyover-configuration))
 
 (define-maybe string)
 
@@ -855,3 +855,37 @@
    (compose identity)
    (default-value (home-emacs-org-journal-configuration))
    (description "Install and configure emacs-org-journal")))
+
+;;; Flyover
+
+(define-configuration/no-serialization home-emacs-flyover-configuration
+  (package
+    (package emacs-flyover)
+    "Package to install and configure for flyover.")
+  (extra-content
+   (text-config '())
+   "Extra content for emacs-flyover configuration."))
+
+(define (add-emacs-flyover-configuration config)
+  (home-emacs-extension
+   (configurations
+    (append
+     (list (local-file "emacs/flyover.el"))
+     (home-emacs-flyover-configuration-extra-content config)))))
+
+(define (add-emacs-flyover-packages config)
+  (list (home-emacs-flyover-configuration-package config)))
+
+(define home-emacs-flyover-service-type
+  (service-type
+   (name 'home-emacs-flyover)
+   (extensions
+    (list (service-extension
+           home-emacs-service-type
+           add-emacs-flyover-configuration)
+          (service-extension
+           home-profile-service-type
+           add-emacs-flyover-packages)))
+   (compose identity)
+   (default-value (home-emacs-flyover-configuration))
+   (description "Install and configure emacs-flyover")))
diff --git a/oni/home/services/emacs/flyover.el b/oni/home/services/emacs/flyover.el
new file mode 100644
index 0000000..f9259df
--- /dev/null
+++ b/oni/home/services/emacs/flyover.el
@@ -0,0 +1,4 @@
+(use-package flyover
+  :hook ((flycheck-mode . flyover-mode))
+  :custom
+  (flyover-virtual-line-type 'straight-arrow))