From 14cb90cd52ebb1495c8679a92ea01cef0bf03d2b Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Fri, 9 Sep 2022 17:16:13 -0400
Subject: [PATCH] fixes for latest picom on nixos desktop

---
 hosts/desktop/default.nix   |  2 +-
 modules/graphical/picom.nix | 42 ++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index bb022f6..6cc6237 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -16,10 +16,10 @@ nixpkgs.lib.nixosSystem {
       gui = {
         enable = true;
         compositor.enable = true;
-        colorscheme = (import ../../modules/colorscheme/gruvbox);
         wallpaper = "${wallpapers}/gruvbox/road.jpg";
         gtk.theme = { name = "Adwaita-dark"; };
       };
+      colorscheme = (import ../../modules/colorscheme/gruvbox);
       passwordHash =
         "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
     }
diff --git a/modules/graphical/picom.nix b/modules/graphical/picom.nix
index d3bc782..6c555b4 100644
--- a/modules/graphical/picom.nix
+++ b/modules/graphical/picom.nix
@@ -6,34 +6,34 @@
 
         services.picom = {
           enable = true;
-          blur = false;
-          blurExclude = [ ];
-          # extraOptions = ''
-          # shadow-radius = 20
-          # '';
-          # extraOptions = ''
-          # shadow-radius = 20
-          # corner-radius = 10
-          # blur-size = 20
-          # rounded-corners-exclude = [
-          # "window_type = 'dock'",
-          # "class_g = 'i3-frame'"
-          # ]
-          # '';
+          settings = {
+            blur = false;
+            blurExclude = [ ];
+            inactiveDim = "0.05";
+            noDNDShadow = false;
+            noDockShadow = false;
+            # shadow-radius = 20
+            # '';
+            # shadow-radius = 20
+            # corner-radius = 10
+            # blur-size = 20
+            # rounded-corners-exclude = [
+            # "window_type = 'dock'",
+            # "class_g = 'i3-frame'"
+            # ]
+            # '';
+          };
           fade = false;
           experimentalBackends = true;
-          inactiveDim = "0.05";
-          inactiveOpacity = "1.0";
-          menuOpacity = "1.0";
-          noDNDShadow = false;
-          noDockShadow = false;
-          opacityRule = [
+          inactiveOpacity = 1.0;
+          menuOpacity = 1.0;
+          opacityRules = [
             "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'" # Hide tabbed windows
           ];
           shadow = false;
           shadowExclude = [ ];
           shadowOffsets = [ (-10) (-10) ];
-          shadowOpacity = "0.5";
+          shadowOpacity = 0.5;
           vSync = true;
         };