diff --git a/default.nix b/default.nix index 6d856c3..59ad69a 100644 --- a/default.nix +++ b/default.nix @@ -3,17 +3,18 @@ let inherit (pkgs) lib; bin = pkgs.callPackage ./bin/default.nix {}; -i3 = with_lock: pkgs.callPackage ./i3/i3.nix { +i3 = with_lock: compton_name: pkgs.callPackage ./i3/i3.nix { inherit (bin) screenshot_public; inherit with_lock; + inherit compton_name; }; xres = dpi: pkgs.callPackage ./x/default.nix { inherit dpi; }; in lib.mapAttrs (k: paths: pkgs.symlinkJoin { inherit paths; name = "dotfiles-${k}"; } ) { - ascanius = [(i3 true) (xres 109)]; - woodhouse = [(i3 false) (xres 44)]; + ascanius = [(i3 true "default") (xres 109)]; + woodhouse = [(i3 false "default") (xres 44)]; pennyworth = []; frumar = []; - jarvis = [(i3 true) (xres 192)]; + jarvis = [(i3 true "intel") (xres 192)]; } diff --git a/i3/i3.nix b/i3/i3.nix index d3f6140..23616f1 100644 --- a/i3/i3.nix +++ b/i3/i3.nix @@ -1,7 +1,7 @@ {writeTextDir, writeScript, lib, rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps , i3lock-fancy, xset, alsaUtils, light, screenshot_public, xorg, -with_lock ? true}: +with_lock ? true, compton_name ? "default"}: let locker = writeScript "dlock.sh" '' @@ -167,7 +167,7 @@ bar { } exec --no-startup-id ${nitrogen}/bin/nitrogen --restore -exec --no-startup-id ${compton-git}/bin/compton --config /home/yorick/dotfiles/x/compton.conf +exec --no-startup-id ${compton-git}/bin/compton --config /home/yorick/dotfiles/x/compton_${compton_name}.conf '' + (lib.optionalString with_lock '' diff --git a/x/compton.conf b/x/compton_default.conf similarity index 100% rename from x/compton.conf rename to x/compton_default.conf diff --git a/x/compton_intel.conf b/x/compton_intel.conf new file mode 100644 index 0000000..177f251 --- /dev/null +++ b/x/compton_intel.conf @@ -0,0 +1,5 @@ +backend = "glx"; +#paint-on-overlay = true; +glx-no-stencil = true; +#glx-swap-method = 4; +unredir-if-possible = true;