{machines,modules}/devhell: Rework compton

Compton has been bumped to version 7, and with it the nix definition has
changed. Additionally to adopting the new options I'm also moving
compton to the overall services and have removed compton references from
each machine.

4 files changed, 6 insertions, 25 deletions

diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix
index 3697a3a2..13f02c3a 100644
--- a/machines/devhell/eir.nix
+++ b/machines/devhell/eir.nix
@@ -116,13 +116,6 @@
     '';
   };
 
-  services.compton = {
-    enable = true;
-    extraOptions = ''
-      inactive-dim = 0.2;
-    '';
-  };
-
   services.xserver = {
     enable = true;
     layout = "gb";
diff --git a/machines/devhell/gunnr.nix b/machines/devhell/gunnr.nix
index 864ff1af..d746b0aa 100644
--- a/machines/devhell/gunnr.nix
+++ b/machines/devhell/gunnr.nix
@@ -89,15 +89,6 @@
 
   services.zfs.autoScrub.enable = true;
 
-  services.compton = {
-    enable = true;
-    backend = "glx";
-    vSync = "drm";
-    extraOptions = ''
-      inactive-dim = 0.2;
-    '';
-  };
-
   services.xserver = {
     enable = true;
     layout = "dvorak";
diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix
index 431dfd94..ee21cfa0 100644
--- a/machines/devhell/hildr.nix
+++ b/machines/devhell/hildr.nix
@@ -114,15 +114,6 @@
     '';
   };
 
-  services.compton = {
-    enable = true;
-    backend = "glx";
-    vSync = "drm";
-    extraOptions = ''
-      inactive-dim = 0.2;
-    '';
-  };
-
   services.xserver = {
     enable = true;
     layout = "gb";
diff --git a/modules/user/devhell/profiles/services.nix b/modules/user/devhell/profiles/services.nix
index 2eda4185..e408f4cc 100644
--- a/modules/user/devhell/profiles/services.nix
+++ b/modules/user/devhell/profiles/services.nix
@@ -37,6 +37,12 @@ in {
       };
     };
 
+    services = {
+      compton.enable = true;
+      vSync = true;
+      backend = "glx";
+    };
+
     services.xserver = {
       displayManager.lightdm = {
         enable = true;