From 63597feaf7964667e8219ada7ac14dd8deca1349 Mon Sep 17 00:00:00 2001
From: Mx Kookie <kookie@spacekookie.de>
Date: Tue, 22 Dec 2020 21:52:01 +0100
Subject: [PATCH] libkookie: compton: compositor has been renamed to picom

---
 infra/libkookie/configuration/workstation/i3/tempest.nix    | 2 +-
 .../workstation/ui/i3/core/{compton.conf => picom.conf}     | 3 +--
 .../workstation/ui/i3/core/{compton.nix => picom.nix}       | 4 ++--
 infra/libkookie/modules/workstation/ui/i3/core/setup.nix    | 6 +++---
 infra/libkookie/modules/workstation/ui/i3/hm.nix            | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)
 rename infra/libkookie/modules/workstation/ui/i3/core/{compton.conf => picom.conf} (57%)
 rename infra/libkookie/modules/workstation/ui/i3/core/{compton.nix => picom.nix} (55%)

diff --git a/infra/libkookie/configuration/workstation/i3/tempest.nix b/infra/libkookie/configuration/workstation/i3/tempest.nix
index 556281862d9..0394f556f2f 100644
--- a/infra/libkookie/configuration/workstation/i3/tempest.nix
+++ b/infra/libkookie/configuration/workstation/i3/tempest.nix
@@ -6,7 +6,7 @@
 
   # Then configure it
   libkookie.ui.i3 = {
-    compton = true;
+    picom = true;
 
     # TODO: include these files via git LFS
     wallpaper = /home/Pictures/Wallpapers/small-memory.webp;
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/compton.conf b/infra/libkookie/modules/workstation/ui/i3/core/picom.conf
similarity index 57%
rename from infra/libkookie/modules/workstation/ui/i3/core/compton.conf
rename to infra/libkookie/modules/workstation/ui/i3/core/picom.conf
index 254846b9bf6..903e29e1b34 100644
--- a/infra/libkookie/modules/workstation/ui/i3/core/compton.conf
+++ b/infra/libkookie/modules/workstation/ui/i3/core/picom.conf
@@ -2,6 +2,5 @@ unredir-if-possible = false;
 vsync = "opengl";
 
 ### Opacity
-menu-opacity = 0.90;
-frame-opacity = 0.90;  # i.e. titlebars, borders
+opacity = 0.90;
 inactive-opacity-override = false;
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/compton.nix b/infra/libkookie/modules/workstation/ui/i3/core/picom.nix
similarity index 55%
rename from infra/libkookie/modules/workstation/ui/i3/core/compton.nix
rename to infra/libkookie/modules/workstation/ui/i3/core/picom.nix
index 3d20aabc122..a706a569fe2 100644
--- a/infra/libkookie/modules/workstation/ui/i3/core/compton.nix
+++ b/infra/libkookie/modules/workstation/ui/i3/core/picom.nix
@@ -2,8 +2,8 @@
 
 let cfg = config.libkookie.ui.i3;
 in
-lib.mkIf cfg.compton {
+lib.mkIf cfg.picom {
   text = ''
-    ${builtins.readFile ./compton.conf}
+    ${builtins.readFile ./picom.conf}
   '';
 }
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/setup.nix b/infra/libkookie/modules/workstation/ui/i3/core/setup.nix
index 1bd03abf367..80d1827d881 100644
--- a/infra/libkookie/modules/workstation/ui/i3/core/setup.nix
+++ b/infra/libkookie/modules/workstation/ui/i3/core/setup.nix
@@ -20,8 +20,8 @@
         # TODO: move this into the config module?
 
         extraConfig = with pkgs; ''
-          # Setup compton compositor
-          exec_always --no-startup-id "${coreutils}/bin/pkill compton; ${compton}/bin/compton --config ~/.config/i3/compton.conf"
+          # Setup compositor
+          exec_always --no-startup-id "${coreutils}/bin/pkill picom; ${picom}/bin/picom --config ~/.config/i3/picom.conf"
       
           # Make CAPSLOCK into ESC because it's 2018
           #
@@ -54,7 +54,7 @@
         '';
       };
 
-  xdg.configFile."i3/compton.conf" = (import ./compton.nix args);
+  xdg.configFile."i3/picom.conf" = (import ./picom.nix args);
 
   xdg.configFile."i3/i3status.conf" = (import ./i3status.nix args);
 }
diff --git a/infra/libkookie/modules/workstation/ui/i3/hm.nix b/infra/libkookie/modules/workstation/ui/i3/hm.nix
index 2453975f529..b0859c6ab39 100644
--- a/infra/libkookie/modules/workstation/ui/i3/hm.nix
+++ b/infra/libkookie/modules/workstation/ui/i3/hm.nix
@@ -9,7 +9,7 @@ let cfg = config.libkookie.ui.i3;
 in
 {
   options.libkookie.ui.i3 = with lib; {
-    compton = mkEnableOption "window composition with compton";
+    picom = mkEnableOption "window composition with picom";
     
     wallpaper = mkOption {
       type = types.path;