diff --git a/ops/nixos/lib/graphical-client.nix b/ops/nixos/lib/graphical-client.nix index e7e2728b91..827d6e5c56 100644 --- a/ops/nixos/lib/graphical-client.nix +++ b/ops/nixos/lib/graphical-client.nix @@ -22,5 +22,8 @@ in sound.enable = true; hardware.pulseaudio.enable = true; + + services.dbus.packages = [ depot.nix.pkgs.flameshot ]; + systemd.packages = [ depot.nix.pkgs.flameshot ]; }; } diff --git a/ops/nixos/lib/home-manager/graphical-client.nix b/ops/nixos/lib/home-manager/graphical-client.nix index d98914df55..3246991c32 100644 --- a/ops/nixos/lib/home-manager/graphical-client.nix +++ b/ops/nixos/lib/home-manager/graphical-client.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, depot, lib, config, ... }: { imports = [ ./client.nix ]; @@ -33,8 +33,7 @@ executable = true; text = '' #!/usr/bin/env bash - set -euxo pipefail - import png:/dev/stdout | pngquant - | xclip -t image/png -selection clipboard -in + exec ${depot.nix.pkgs.flameshot}/bin/flameshot gui ''; }; home.file.".xprofile".text = '' @@ -56,7 +55,7 @@ modifier = config.xsession.windowManager.i3.config.modifier; in lib.mkOptionDefault { "${modifier}+l" = "exec loginctl lock-session"; - "${modifier}+p" = "exec screencap"; + "${modifier}+p" = "exec ${depot.nix.pkgs.flameshot}/bin/flameshot gui"; }; startup = [ { command = "xss-lock --transfer-sleep-lock -- i3lock --nofork"; notification = false; }