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: libkookie: compton: compositor has been renamed to picom

---
 infra/libkookie/modules/workstation/ui/i3/core/compton.conf | 7 -------
 infra/libkookie/modules/workstation/ui/i3/core/compton.nix  | 9 ---------
 infra/libkookie/modules/workstation/ui/i3/core/picom.conf   | 6 ++++++
 infra/libkookie/modules/workstation/ui/i3/core/picom.nix    | 9 +++++++++
 infra/libkookie/modules/workstation/ui/i3/core/setup.nix    | 6 +++---
 infra/libkookie/modules/workstation/ui/i3/hm.nix            | 2 +-
 6 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 infra/libkookie/modules/workstation/ui/i3/core/compton.conf
 delete mode 100644 infra/libkookie/modules/workstation/ui/i3/core/compton.nix
 create mode 100644 infra/libkookie/modules/workstation/ui/i3/core/picom.conf
 create mode 100644 infra/libkookie/modules/workstation/ui/i3/core/picom.nix

(limited to 'infra/libkookie/modules/workstation/ui')

diff --git a/infra/libkookie/modules/workstation/ui/i3/core/compton.conf b/infra/libkookie/modules/workstation/ui/i3/core/compton.conf
deleted file mode 100644
index 254846b9bf6f..000000000000
--- a/infra/libkookie/modules/workstation/ui/i3/core/compton.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-unredir-if-possible = false;
-vsync = "opengl";
-
-### Opacity
-menu-opacity = 0.90;
-frame-opacity = 0.90;  # i.e. titlebars, borders
-inactive-opacity-override = false;
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/compton.nix b/infra/libkookie/modules/workstation/ui/i3/core/compton.nix
deleted file mode 100644
index 3d20aabc122a..000000000000
--- a/infra/libkookie/modules/workstation/ui/i3/core/compton.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, lib, ... }:
-
-let cfg = config.libkookie.ui.i3;
-in
-lib.mkIf cfg.compton {
-  text = ''
-    ${builtins.readFile ./compton.conf}
-  '';
-}
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/picom.conf b/infra/libkookie/modules/workstation/ui/i3/core/picom.conf
new file mode 100644
index 000000000000..903e29e1b346
--- /dev/null
+++ b/infra/libkookie/modules/workstation/ui/i3/core/picom.conf
@@ -0,0 +1,6 @@
+unredir-if-possible = false;
+vsync = "opengl";
+
+### Opacity
+opacity = 0.90;
+inactive-opacity-override = false;
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/picom.nix b/infra/libkookie/modules/workstation/ui/i3/core/picom.nix
new file mode 100644
index 000000000000..a706a569fe22
--- /dev/null
+++ b/infra/libkookie/modules/workstation/ui/i3/core/picom.nix
@@ -0,0 +1,9 @@
+{ config, lib, ... }:
+
+let cfg = config.libkookie.ui.i3;
+in
+lib.mkIf cfg.picom {
+  text = ''
+    ${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;
-- 
cgit v1.2.3