Move picom configuration to data

This configuration is for now specific to data, rincewind will have a different
configuration.

3 files changed, 39 insertions, 30 deletions

diff --git a/oni/home/config/common.scm b/oni/home/config/common.scm
index 44962d6..f83dece 100644
--- a/oni/home/config/common.scm
+++ b/oni/home/config/common.scm
@@ -189,16 +189,3 @@ LocalForward 2812 localhost:2812"))
                (color14 . "#7126f01ff01f")
                (color7 . "#969696")
                (color15 . "#ededed"))))))
-
-(define home-picom-service
-  (service home-picom-service-type
-           (home-picom-configuration
-            (config
-             '((detect-transient . #t)
-               (shadow . #t)
-               (wintypes ((dnd ((shadow . #f)))
-                          (dock ((shadow . #f)))))
-               (shadow-radius . 10)
-               (shadow-exclude ("name = 'mowedline'"
-                                "class_g = 'trayer'"
-                                "bounding_shaped")))))))
diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm
index 97d5e4f..11628f3 100644
--- a/oni/home/config/data.scm
+++ b/oni/home/config/data.scm
@@ -1,31 +1,47 @@
 (define-module (oni home config data)
-  #:use-module (gnu home)
-  #:use-module (gnu home services)
   #:use-module (gnu home services desktop)
-  #:use-module (gnu services)
-  #:use-module (gnu packages)
+  #:use-module (gnu home services)
+  #:use-module (gnu home)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages shellutils)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages)
+  #:use-module (gnu services)
   #:use-module (guix gexp)
-  #:use-module (oni home services rofi)
-  #:use-module (oni home services xsession)
-  #:use-module (oni home services xbindkeys)
-  #:use-module (oni home services zsh)
+  #:use-module (oni home config common)
+  #:use-module (oni home services cmst)
+  #:use-module ((oni home services compton)
+                #:select (home-picom-service-type
+                          home-picom-configuration))
+  #:use-module (oni home services dunst)
+  #:use-module (oni home services environment)
   #:use-module (oni home services herbstluftwm)
-  #:use-module (oni home services polybar)
   #:use-module (oni home services kdeconnect)
-  #:use-module (oni home services cmst)
+  #: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 dunst)
-  #:use-module (oni home services environment)
+  #:use-module (oni home services xbindkeys)
+  #:use-module (oni home services xsession)
+  #:use-module (oni home services zsh)
   #:use-module (oni packages hlwm-run-or-raise)
   #:use-module (oni packages pick-random-wallpaper)
-  #:use-module (oni home config common)
   #:use-module (oni packages shutdown-rofi))
 
+(define data-picom-service
+  (service home-picom-service-type
+           (home-picom-configuration
+            (config
+             '((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 (list (specification->package+output "glibc-locales")
                  (specification->package+output "font-fantasque-sans")
@@ -46,7 +62,7 @@
    home-xmodmap-service
    home-openssh-service
    home-kitty-service
-   home-picom-service
+   data-picom-service
 
    ;; This has to be the first extension because it needs to be added to the
    ;; configuration last.
diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 4e4cacc..cd7adc8 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -9,6 +9,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages music)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages wm)
   #:use-module (gnu packages)
   #:use-module (gnu services)
   #:use-module (guix channels)
@@ -23,19 +24,21 @@
   #:use-module (oni home services environment)
   #:use-module (oni home services flameshot)
   #:use-module (oni home services kdeconnect)
+  #:use-module (oni home services mpd)
   #:use-module (oni home services polybar)
   #:use-module (oni home services rofi)
   #:use-module (oni home services syncthing)
   #:use-module (oni home services zsh)
   #:use-module (oni packages count-emails)
+  #:use-module (oni packages emacs)
   #:use-module (oni packages hlwm-run-or-raise)
   #:use-module (oni packages inbox-size)
+  #:use-module (oni packages mpd-random-albums)
   #:use-module (oni packages notmuch-collect-tasks)
   #:use-module (oni packages notmuch-tag-mailinglists)
   #:use-module (oni packages pick-random-wallpaper)
   #:use-module (oni packages shutdown-rofi)
-  #:use-module (oni packages mpd-random-albums)
-  #:use-module (oni home services mpd)
+  #:use-module (oni packages emacs-outli)
   #:use-module (oop goops))
 
 (define (with-master-branch package)
@@ -61,7 +64,10 @@
                  fakeroot               ; Needed for build arch packages
                  tmsu
                  mpd-random-albums
-                 ))
+                 emacs-inkplate
+                 emacs-outli
+                 emacs-litable
+                 stumpwm))
 
  (services
   (list