libkookie: compton: compositor has been renamed to picom

wip/yesman
Katharina Fey 4 years ago
parent 78a2961f10
commit 63597feaf7
  1. 2
      infra/libkookie/configuration/workstation/i3/tempest.nix
  2. 3
      infra/libkookie/modules/workstation/ui/i3/core/picom.conf
  3. 4
      infra/libkookie/modules/workstation/ui/i3/core/picom.nix
  4. 6
      infra/libkookie/modules/workstation/ui/i3/core/setup.nix
  5. 2
      infra/libkookie/modules/workstation/ui/i3/hm.nix

@ -6,7 +6,7 @@
# Then configure it # Then configure it
libkookie.ui.i3 = { libkookie.ui.i3 = {
compton = true; picom = true;
# TODO: include these files via git LFS # TODO: include these files via git LFS
wallpaper = /home/Pictures/Wallpapers/small-memory.webp; wallpaper = /home/Pictures/Wallpapers/small-memory.webp;

@ -2,6 +2,5 @@ unredir-if-possible = false;
vsync = "opengl"; vsync = "opengl";
### Opacity ### Opacity
menu-opacity = 0.90; opacity = 0.90;
frame-opacity = 0.90; # i.e. titlebars, borders
inactive-opacity-override = false; inactive-opacity-override = false;

@ -2,8 +2,8 @@
let cfg = config.libkookie.ui.i3; let cfg = config.libkookie.ui.i3;
in in
lib.mkIf cfg.compton { lib.mkIf cfg.picom {
text = '' text = ''
${builtins.readFile ./compton.conf} ${builtins.readFile ./picom.conf}
''; '';
} }

@ -20,8 +20,8 @@
# TODO: move this into the config module? # TODO: move this into the config module?
extraConfig = with pkgs; '' extraConfig = with pkgs; ''
# Setup compton compositor # Setup compositor
exec_always --no-startup-id "${coreutils}/bin/pkill compton; ${compton}/bin/compton --config ~/.config/i3/compton.conf" 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 # 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); xdg.configFile."i3/i3status.conf" = (import ./i3status.nix args);
} }

@ -9,7 +9,7 @@ let cfg = config.libkookie.ui.i3;
in in
{ {
options.libkookie.ui.i3 = with lib; { options.libkookie.ui.i3 = with lib; {
compton = mkEnableOption "window composition with compton"; picom = mkEnableOption "window composition with picom";
wallpaper = mkOption { wallpaper = mkOption {
type = types.path; type = types.path;

Loading…
Cancel
Save