From 517086541ed931d1ff7a8d5fc81369cf713e441a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 4 May 2023 19:32:12 -0300 Subject: [PATCH] waybar: extract _sway_idle_toggle script --- scripts/_sway_idle_toggle | 11 +++++++++++ scripts/default.nix | 1 + user/sway/sway-binds.nix | 10 +--------- user/waybar.nix | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 scripts/_sway_idle_toggle diff --git a/scripts/_sway_idle_toggle b/scripts/_sway_idle_toggle new file mode 100644 index 0000000..e77952c --- /dev/null +++ b/scripts/_sway_idle_toggle @@ -0,0 +1,11 @@ +#!/bin/sh + +swayidlectl() { + systemctl --user $1 swayidle.service +} + +if swayidlectl status > /dev/null; then + swayidlectl stop +else + swayidlectl start +fi diff --git a/scripts/default.nix b/scripts/default.nix index 72b5ff9..b4f57f8 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -28,6 +28,7 @@ create_scripts wl-copy-file = [ wl-clipboard fish ]; _diffr = [ diffr ]; _thunar-terminal = [ final.terminal ]; + _sway_idle_toggle = [ final.swayidle ]; kak-pager = [ fish final._diffr ]; kak-man-pager = [ final.kak-pager ]; musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ]; diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index fadcfd0..389d871 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -17,14 +17,6 @@ let systemctl suspend ''; - _sway_idle_toggle = pkgs.writeShellScriptBin "_sway_idle_toggle" '' - if systemctl --user status swayidle > /dev/null; then - systemctl --user stop swayidle.service - else - systemctl --user start swayidle.service - fi - ''; - # mod+1 to swich to workspace 1 # mod+shift+1 to move to workspace 1 workspace_binds = lib.forEachMerge (lib.range 1 10) (i: @@ -133,7 +125,7 @@ let system_binds = { "--locked Ctrl+${mod}+z" = "exec ${_suspend}/bin/_suspend"; - "${mod}+Alt+c" = "exec ${_sway_idle_toggle}/bin/_sway_idle_toggle"; + "${mod}+Alt+c" = "exec ${pkgs._sway_idle_toggle}/bin/_sway_idle_toggle"; }; screenshot_binds = { diff --git a/user/waybar.nix b/user/waybar.nix index e2d0901..2486c01 100644 --- a/user/waybar.nix +++ b/user/waybar.nix @@ -106,7 +106,7 @@ in "custom/caffeine" = { format = "{}"; exec = "systemctl --user status swayidle > /dev/null && echo 鈴 || echo "; - on-click = "_sway_idle_toggle"; + on-click = "${pkgs._sway_idle_toggle}/bin/_sway_idle_toggle"; interval = 1; tooltip = false; };