Use flameshot again, it's good now

This commit is contained in:
Natsu Kagami 2022-11-08 11:25:55 +01:00
parent dc4a31fdc2
commit c90e130948
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51

View file

@ -29,11 +29,11 @@ let
in in
f from; f from;
screenshotScript = pkgs.writeScriptBin "screenshot" '' flameshot = pkgs.unstable.flameshot.overrideAttrs
#! ${pkgs.fish}/bin/fish (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ (with pkgs.unstable; [ libsForQt5.kguiaddons ]);
${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png cmakeFlags = [ "-DUSE_WAYLAND_CLIPBOARD=true" ];
''; });
ignored-devices = [ "Surface_Headphones" ]; ignored-devices = [ "Surface_Headphones" ];
playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}"; playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}";
@ -121,6 +121,8 @@ in
{ command = "systemctl --user restart waybar"; always = true; } { command = "systemctl --user restart waybar"; always = true; }
# Startup programs # Startup programs
{ command = "${cfg.browser}"; } { command = "${cfg.browser}"; }
# Screenshot
{ command = "${flameshot}/bin/flameshot"; }
] ++ (if cfg.discord != null then [ ] ++ (if cfg.discord != null then [
{ command = "${cfg.discord}"; } { command = "${cfg.discord}"; }
] else [ ]); ] else [ ]);
@ -137,7 +139,7 @@ in
"${mod}+r" = "exec ${config.wayland.windowManager.sway.config.menu}"; "${mod}+r" = "exec ${config.wayland.windowManager.sway.config.menu}";
"${mod}+Shift+r" = "mode resize"; "${mod}+Shift+r" = "mode resize";
## Screenshot ## Screenshot
"Print" = "exec ${screenshotScript}/bin/screenshot"; "Print" = "exec ${flameshot}/bin/flameshot gui";
## Locking ## Locking
"${mod}+semicolon" = "exec ${pkgs.swaylock}/bin/swaylock" "${mod}+semicolon" = "exec ${pkgs.swaylock}/bin/swaylock"
+ (if cfg.wallpaper == "" then "" else " -i ${cfg.wallpaper} -s fit") + (if cfg.wallpaper == "" then "" else " -i ${cfg.wallpaper} -s fit")
@ -562,5 +564,7 @@ in
qt5.qtwayland qt5.qtwayland
# For waybar # For waybar
font-awesome font-awesome
flameshot
]); ]);
} }