remove x11-only services

1 files changed, 32 insertions, 11 deletions

diff --git a/home.scm b/home.scm
index 65fc487..8808164 100644
--- a/home.scm
+++ b/home.scm
@@ -44,6 +44,8 @@
             "xdg-utils" ;; For "xdg-open, etc
             "xdg-dbus-proxy"
             "shared-mime-info"
+            "xorg-server-xwayland"
+            "qtwayland@5"
 
             "adwaita-icon-theme"
             "hicolor-icon-theme"
@@ -81,7 +83,6 @@
             "ghostscript"
 
             "syncthing-gtk"
-            "stow"
 
             "emacs-pgtk"
             "emacs-guix"
@@ -92,8 +93,11 @@
             "emacs-enwc"
             "emacs-emms"
             "emacs-compile-angel"
+            "book-sicp"
 
             "pinentry-fuzzel"
+
+            "btop"
             ))))
 
    (services
@@ -120,7 +124,9 @@
       (service home-gpg-agent-service-type
                (home-gpg-agent-configuration
                 (pinentry-program
-                 (file-append pinentry-fuzzel "/bin/pinentry-fuzzel"))))
+                 (file-append pinentry-fuzzel "/bin/pinentry-fuzzel"))
+                (default-cache-ttl 28800)
+                (max-cache-ttl 28800)))
 
       (service home-ssh-agent-service-type)
 
@@ -156,13 +162,25 @@
                         (url
                          "git://git.omnifarious.net/channel.git"))))
 
-      (service home-redshift-service-type
-               (home-redshift-configuration
-                (location-provider 'manual)
-                (latitude 45.27)    ;northern hemisphere
-                (longitude -66.06))) ;west of Greenwich
-
-      (service home-unclutter-service-type)
+      (simple-service 'profile-env-vars-service
+                      home-environment-variables-service-type
+                      '( ;; Sort hidden (dot) files first in `ls` listings
+                        ("LC_COLLATE" . "C")
+
+                        ;; Emacs is our editor
+                        ("VISUAL" . "emacsclient")
+                        ("EDITOR" . "emacsclient")
+
+                        ;; Set Wayland-specific environment variables (taken from RDE)
+                        ("XDG_CURRENT_DESKTOP" . "sway")
+                        ("XDG_SESSION_TYPE" . "wayland")
+                        ("RTC_USE_PIPEWIRE" . "true")
+                        ("SDL_VIDEODRIVER" . "wayland")
+                        ("MOZ_ENABLE_WAYLAND" . "1")
+                        ("CLUTTER_BACKEND" . "wayland")
+                        ("ELM_ENGINE" . "wayland_egl")
+                        ("ECORE_EVAS_ENGINE" . "wayland-egl")
+                        ("QT_QPA_PLATFORM" . "wayland-egl")))
 
       (service home-sway-service-type
                (sway-configuration
@@ -298,11 +316,14 @@
                 (outputs
                  (list (sway-output
                         (identifier '*)
-                        (background "/home/mitch/Pictures/Backgrounds/lain-dining-room.jpg"))))
+                        (background "/home/mitch/Pictures/Backgrounds/lain-dining-room.jpg"))
+                       (sway-output
+                        (identifier 'eDP-1))))
                 (extra-content
                  '("for_window [title=\"Icecat — Sharing Indicator\"] kill"
-                   "for_window [title=\".* - mpv$\"] floating enable, sticky enable"
+                   "for_window [title=\".* - mpv$\"] floating enable, sticky enable, inhibit_idle fullscreen"
                    "for_window [app_id=\"Icecat\"] inhibit_idle fullscreen"
+                   "for_window [appid=\"org.jellyfin.JellyfinDesktop\"] inhibit_idle fullscreen"
                    "floating_modifier $mod")))))
 
      %base-home-services))))