libkookie: compton: compositor has been renamed to picom

4 files changed, 7 insertions, 8 deletions

diff --git a/infra/libkookie/modules/workstation/ui/i3/core/compton.conf b/infra/libkookie/modules/workstation/ui/i3/core/picom.conf
index 254846b9bf6f..903e29e1b346 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
index 3d20aabc122a..a706a569fe22 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 1bd03abf367f..80d1827d881c 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 2453975f5292..b0859c6ab393 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;