From 91391f9d86a4b83665b0452ad4b55b3e3a568fc6 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 9 Apr 2024 22:06:32 -0500 Subject: [PATCH] revert swatidle back to sway/config --- home/gui/files/sway/default | 10 +++++----- home/gui/files/sway/pocket2 | 1 + home/gui/sway.nix | 34 +++++++++++++++++++--------------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/home/gui/files/sway/default b/home/gui/files/sway/default index 8b51f64..7408e25 100644 --- a/home/gui/files/sway/default +++ b/home/gui/files/sway/default @@ -4,11 +4,11 @@ set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle- set $lock /home/don/bin/lock.sh #set $lock 'swaylock -f -c 000000' -#exec swayidle -w \ -# timeout 300 $lock \ -# timeout 360 'swaymsg "output * dpms off"' \ -# resume 'swaymsg "output * dpms on"' \ -# before-sleep $lock +exec swayidle -w \ + timeout 300 $lock \ + timeout 360 'swaymsg "output * dpms off"' \ + resume 'swaymsg "output * dpms on"' \ + before-sleep $lock floating_modifier $mod diff --git a/home/gui/files/sway/pocket2 b/home/gui/files/sway/pocket2 index b1e1dbc..3c08834 100644 --- a/home/gui/files/sway/pocket2 +++ b/home/gui/files/sway/pocket2 @@ -1,3 +1,4 @@ +# POCKET2 set $mod Mod1 set $terminal_path /home/don/bin/mynewterm set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle-00.iec958-stereo diff --git a/home/gui/sway.nix b/home/gui/sway.nix index 867846e..eabd9f1 100644 --- a/home/gui/sway.nix +++ b/home/gui/sway.nix @@ -1,7 +1,11 @@ -{ inputs, pkgs, outputs, ... }: +{ inputs, pkgs, hostname, outputs, ... }: { - # xdg.configFile."sway/config".source = files/sway/${inputs.networking.hostName}; xdg.configFile."sway/config".source = files/sway/default; + # xdg.configFile."sway/config".source = files/sway/${inputs.networking.hostName}; + #xdg.configFile."sway/config".source = {hostname ? "default"}: ./files/sway/${hostname}; + # xdg.configFile."sway/config".source = if builtins.pathExists ./files/sway/${inputs.networking.hostName} then ./files/sway/${inputs.networking.hostName} else ./files/sway/default ; + + #xdg.configFile."sway/config".source = files/sway/default; # services.wayland-pipewire-idle-inhibit = { # enable = true; # systemdTarget = "sway-session.target"; @@ -15,19 +19,19 @@ # ]; # }; # }; - services = { - swayidle = { - enable = true; - timeouts = [ - { timeout = 300; command = "/home/bin/don/lock.sh"; } - { timeout = 360; command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'"; } - ]; - events = [ - { event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; } - { event = "before-sleep"; command = "/home/bin/don/lock.sh"; } - ]; - }; - }; + # services = { + # swayidle = { + # enable = true; + # timeouts = [ + # { timeout = 300; command = "/home/bin/don/lock.sh"; } + # { timeout = 360; command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'"; } + # ]; + # events = [ + # { event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; } + # { event = "before-sleep"; command = "/home/bin/don/lock.sh"; } + # ]; + # }; + # }; programs = { swaylock = { enable = true;