diff --git a/flake.lock b/flake.lock index ef03ac3..8daf794 100644 --- a/flake.lock +++ b/flake.lock @@ -223,22 +223,6 @@ "type": "github" } }, - "picom": { - "flake": false, - "locked": { - "lastModified": 1606582992, - "narHash": "sha256-R+YUGBrLst6CpUgG9VCwaZ+LiBSDWTp0TLt1Ou4xmpQ=", - "owner": "jonaburg", - "repo": "picom", - "rev": "a8445684fe18946604848efb73ace9457b29bf80", - "type": "github" - }, - "original": { - "owner": "jonaburg", - "repo": "picom", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -247,7 +231,6 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs_3", "nur": "nur", - "picom": "picom", "stable": "stable", "statix": "statix", "utils": "utils" diff --git a/flake.nix b/flake.nix index 6e3fce5..e522311 100644 --- a/flake.nix +++ b/flake.nix @@ -18,10 +18,6 @@ statix.url = "github:nerdypepper/statix"; - picom = { - url = "github:jonaburg/picom"; - flake = false; - }; forgit-git = { url = "github:wfxr/forgit"; flake = false; diff --git a/modules/services/picom.nix b/modules/services/picom.nix index a1d41af..27d9ad5 100644 --- a/modules/services/picom.nix +++ b/modules/services/picom.nix @@ -2,22 +2,16 @@ { home-manager.users.moritz = { - services.picom = { enable = true; + package = pkgs.picom-next; blur = true; blurExclude = [ "class_g = 'Polybar'" ]; experimentalBackends = true; - inactiveOpacity = "0.90"; + inactiveOpacity = "0.97"; opacityRule = [ "100:fullscreen" "100:class_g = 'Polybar'" ]; vSync = true; extraOptions = '' - corner-radius = 10; - rounded-corners-exclude = [ - "class_g = 'Polybar'" - ] - round-borders = 1; - # improve performance glx-no-rebind-pixmap = true; glx-no-stencil = true; @@ -29,11 +23,6 @@ blur-background-fixed = false; blur-method = "dual_kawase"; blur-strength = 2; - use-ewmh-active-win = true; - detect-rounded-corners = true; - - # stop compositing if there's a fullscreen program - unredir-if-possible = true; # group wintypes and don't focus a menu (Telegram) detect-transient = true; diff --git a/overlays/default.nix b/overlays/default.nix index 1182f1c..d16b496 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,6 @@ { inputs }: final: prev: { - picom = prev.picom.overrideAttrs (old: { src = inputs.picom; }); stable = import inputs.stable { inherit (prev) system; config.allowUnfree = true;