data: fixup for use with Wayland

1 files changed, 8 insertions, 55 deletions

diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm
index 73e2f5a..235e60f 100644
--- a/oni/home/config/data.scm
+++ b/oni/home/config/data.scm
@@ -2,6 +2,7 @@
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services)
   #:use-module (gnu home services gnupg)
+  #:use-module (gnu home services niri)
   #:use-module (gnu home)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages emacs)
@@ -19,10 +20,6 @@
   #:use-module (gnu services)
   #:use-module (guix gexp)
   #:use-module (oni home config common)
-  #:use-module ((oni home services admin)
-                #:select (home-cbatticon-service-type))
-  #:use-module (oni home services cmst)
-  #:use-module (oni home services dunst)
   #:use-module ((oni home services emacs)
                 #:select (home-emacs-service-type
                           home-emacs-configuration
@@ -40,16 +37,7 @@
   #:use-module (oni home services kdeconnect)
   #:use-module ((oni home services mail)
                 #:select (home-mbsync-service-type))
-  #:use-module ((oni home services picom)
-                #:select (home-picom-service-type
-                          home-picom-configuration))
-  #:use-module (oni home services polybar)
-  #:use-module (oni home services rofi)
   #:use-module (oni home services syncthing)
-  #:use-module (oni home services unclutter)
-  #:use-module ((oni home services xdisorg)
-                #:select (home-xss-lock-service-type))
-  #:use-module (oni home services xsession)
   #:use-module ((oni packages emacs)
                 #:select (emacs-outli
                           emacs-syncthing-status))
@@ -95,23 +83,15 @@
                           emacs-oni-gnus))
   #:use-module (oni packages pick-random-wallpaper))
 
-(define data-picom-service
-  (service home-picom-service-type
-           (home-picom-configuration
-            (detect-transient #t)
-            (shadow #t)
-            (wintypes '((dnd (shadow . #f))
-                        (dock (shadow . #f))))
-            (shadow-radius 10)
-            (shadow-exclude '("name = 'mowedline'"
-                              "class_g = 'trayer'"
-                              "bounding_shaped")))))
-
 (home-environment
  (packages (append
             foreign-distro-compatibility-packages
             (list (specification->package+output "font-fantasque-sans")
                   (specification->package+output "font-comic-neue")
+                  (specification->package "swaylock")
+                  (specification->package "fuzzel")
+                  (specification->package "wezterm")
+                  (specification->package "signal-desktop")
                   font-dosis
                   pick-random-wallpaper
                   emacs-org-contacts
@@ -166,25 +146,10 @@
    (list
     home-channels-service
     home-environment-service
-    home-rofi-default-service
-    home-dunst-default-service
     home-redshift-service
     home-guile-service
-    home-xmodmap-service
     home-openssh-service
     home-kitty-service
-    data-picom-service
-
-    (service home-xsession-service-type
-             (home-xsession-configuration
-              (configuration
-               (list
-                (mixed-text-file
-                 "xsession"
-                 "xrdb -cpp m4 -merge \"${HOME}/.config/X11/Xresources\" -I\"${HOME}/.config/X11/Xresources.d\"\n"
-                 "xrandr --setprovideroutputsource modesetting NVIDIA-0\n"
-                 "xrandr --auto\n"
-                 "xrandr --dpi 96\n")))))
 
     (service home-gpg-agent-service-type
              (home-gpg-agent-configuration
@@ -192,21 +157,10 @@
               (extra-content
                "allow-emacs-pinentry\n")))
 
-    (service home-polybar-service-type
-             (home-polybar-configuration
-              (bar "data")))
-
     (service home-kdeconnect-service-type)
 
-    (service home-cmst-service-type)
-
     (service home-syncthing-service-type)
 
-    (service home-unclutter-service-type
-             (home-unclutter-configuration
-              (package unclutter-xfixes)
-              (exclude-root #t)))
-
     (service home-emacs-service-type
              (home-emacs-configuration
               (helpful-configuration
@@ -240,9 +194,6 @@
     (service home-emacs-pinentry-service-type)
     (service home-emacs-org-caldav-service-type)
 
-    (service home-xss-lock-service-type)
-    (service home-cbatticon-service-type)
-
     (service home-mbsync-service-type)
 
     (service home-git-service-type
@@ -258,4 +209,6 @@
     xfuncname = \"^\\\\*+ +(.+)\"
 [diff \"lisp\"]
     xfuncname = \"^[[:space:]]*?\\\\(def\\\\w+? ((\\\\w|-|'|:|=|<|>)+)\"
-")))))))
+")))
+
+    (service home-niri-service-type)))))