sway: use caffeinated instead of disabling swayidle
This commit is contained in:
parent
9f4328a73a
commit
cc6110dcac
7 changed files with 57 additions and 18 deletions
51
pkgs/caffeinated/default.nix
Normal file
51
pkgs/caffeinated/default.nix
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
{
|
||||||
|
stdenv,
|
||||||
|
lib,
|
||||||
|
fetchFromGitHub,
|
||||||
|
|
||||||
|
pkgconf,
|
||||||
|
pkg-config,
|
||||||
|
wayland-scanner,
|
||||||
|
|
||||||
|
systemd,
|
||||||
|
libbsd,
|
||||||
|
wayland,
|
||||||
|
wayland-protocols,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "caffeinated";
|
||||||
|
version = "2022-12-08";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "electrickite";
|
||||||
|
repo = "caffeinated";
|
||||||
|
rev = "5a8eff054bdce225a19cf3ab785dc1bbc9bd3265";
|
||||||
|
hash = "sha256-X1w/YWljcwb5ZH8Nt92CDhPU/yqBLH3lBS7yVJUeyzY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkgconf
|
||||||
|
pkg-config
|
||||||
|
wayland-scanner
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
systemd
|
||||||
|
libbsd
|
||||||
|
wayland
|
||||||
|
wayland-protocols
|
||||||
|
];
|
||||||
|
|
||||||
|
makeFlags = [ "WAYLAND=1" ];
|
||||||
|
|
||||||
|
installFlags = [ "PREFIX=$(out)" ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Utility to prevent the system from entering an idle state";
|
||||||
|
homepage = "https://github.com/electrickite/caffeinated";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
maintainers = with lib.maintainers; [ lelgenio ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
{ pkgs, inputs }:
|
{ pkgs, inputs }:
|
||||||
rec {
|
rec {
|
||||||
|
caffeinated = pkgs.callPackage ./caffeinated { };
|
||||||
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
|
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
|
||||||
lipsum = pkgs.callPackage ./lipsum.nix { };
|
lipsum = pkgs.callPackage ./lipsum.nix { };
|
||||||
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
swayidlectl() {
|
|
||||||
systemctl --user $1 swayidle.service
|
|
||||||
}
|
|
||||||
|
|
||||||
if swayidlectl status > /dev/null; then
|
|
||||||
swayidlectl stop
|
|
||||||
else
|
|
||||||
swayidlectl start
|
|
||||||
fi
|
|
|
@ -44,7 +44,6 @@
|
||||||
];
|
];
|
||||||
_diffr = [ diffr ];
|
_diffr = [ diffr ];
|
||||||
_thunar-terminal = [ terminal ];
|
_thunar-terminal = [ terminal ];
|
||||||
_sway_idle_toggle = [ swayidle ];
|
|
||||||
kak-pager = [
|
kak-pager = [
|
||||||
fish
|
fish
|
||||||
_diffr
|
_diffr
|
||||||
|
|
|
@ -154,6 +154,7 @@ in
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wtype
|
wtype
|
||||||
wl-crosshair
|
wl-crosshair
|
||||||
|
caffeinated
|
||||||
|
|
||||||
grim
|
grim
|
||||||
satty
|
satty
|
||||||
|
|
|
@ -19,7 +19,7 @@ let
|
||||||
'';
|
'';
|
||||||
_suspend = pkgs.writeShellScriptBin "_suspend" ''
|
_suspend = pkgs.writeShellScriptBin "_suspend" ''
|
||||||
${pkgs.sway}/bin/swaymsg mode default
|
${pkgs.sway}/bin/swaymsg mode default
|
||||||
systemctl --user start swayidle.service
|
pkill caffeinated || true
|
||||||
systemctl suspend
|
systemctl suspend
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ let
|
||||||
|
|
||||||
system_binds = {
|
system_binds = {
|
||||||
"--locked Ctrl+${mod}+z" = "exec ${_suspend}/bin/_suspend";
|
"--locked Ctrl+${mod}+z" = "exec ${_suspend}/bin/_suspend";
|
||||||
"${mod}+Alt+c" = "exec ${pkgs._sway_idle_toggle}/bin/_sway_idle_toggle";
|
"${mod}+Alt+c" = "exec pkill caffeinated || exec caffeinated";
|
||||||
};
|
};
|
||||||
|
|
||||||
screenshot_binds = {
|
screenshot_binds = {
|
||||||
|
|
|
@ -3,12 +3,10 @@
|
||||||
osConfig,
|
osConfig,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
font,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config.my)
|
inherit (config.my)
|
||||||
key
|
|
||||||
theme
|
theme
|
||||||
accent
|
accent
|
||||||
font
|
font
|
||||||
|
@ -170,8 +168,8 @@ in
|
||||||
};
|
};
|
||||||
"custom/caffeine" = {
|
"custom/caffeine" = {
|
||||||
format = "{}";
|
format = "{}";
|
||||||
exec = "systemctl --user status swayidle > /dev/null && echo || echo ";
|
exec = "pgrep caffeinated > /dev/null && echo '' || echo '' ";
|
||||||
on-click = "${pkgs._sway_idle_toggle}/bin/_sway_idle_toggle";
|
on-click = "pkill caffeinated || exec caffeinated";
|
||||||
interval = 1;
|
interval = 1;
|
||||||
tooltip = false;
|
tooltip = false;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue