diff --git a/hosts/modules/gui/sway/default.nix b/hosts/modules/gui/sway/default.nix index 8000d221..a6a29e4b 100644 --- a/hosts/modules/gui/sway/default.nix +++ b/hosts/modules/gui/sway/default.nix @@ -115,17 +115,6 @@ in ''; }; - # TODO: split these into their own option scope - brightness_down_cmd = mkOption { - type = types.str; - default = "brightnessctl set 2%-"; - description = "command to run when use wants to decrease screen brightness"; - }; - brightness_up_cmd = mkOption { - type = types.str; - default = "brightnessctl set +2%"; - description = "command to run when use wants to increase screen brightness"; - }; screenshot_cmd = mkOption { type = types.str; default = "grimshot copy area"; diff --git a/hosts/modules/gui/sway/sway-config b/hosts/modules/gui/sway/sway-config index bb4ff047..61774516 100644 --- a/hosts/modules/gui/sway/sway-config +++ b/hosts/modules/gui/sway/sway-config @@ -16,8 +16,8 @@ set $emoji_picker splatmoji -s medium-light type set $locker swaylock --indicator-idle-visible --indicator-radius 100 --indicator-thickness 30 set $snippets_picker @snip_cmd@ set $screenshot @screenshot_cmd@ -set $brightness_up @brightness_up_cmd@ -set $brightness_down @brightness_down_cmd@ +set $brightness_up brightnessctl set +5% +set $brightness_down brightnessctl set 5%- # TODO: use native pipewire controls instead of pulsemixer? set $volume_up pulsemixer --change-volume +5 set $volume_down pulsemixer --change-volume -5 diff --git a/hosts/modules/gui/sway/sway-config.nix b/hosts/modules/gui/sway/sway-config.nix index 50be781e..a86dea2b 100644 --- a/hosts/modules/gui/sway/sway-config.nix +++ b/hosts/modules/gui/sway/sway-config.nix @@ -28,8 +28,6 @@ in substituteAll { inherit snip_cmd; inherit (swayCfg) background - brightness_down_cmd - brightness_up_cmd extra_lines screenshot_cmd font diff --git a/hosts/modules/gui/sxmo/default.nix b/hosts/modules/gui/sxmo/default.nix index 994e02cb..1db1eaa7 100644 --- a/hosts/modules/gui/sxmo/default.nix +++ b/hosts/modules/gui/sxmo/default.nix @@ -321,8 +321,6 @@ in xwayland = false; workspace_layout = "tabbed"; - brightness_down_cmd = "sxmo_brightness.sh down"; - brightness_up_cmd = "sxmo_brightness.sh up"; screenshot_cmd = "sxmo_screenshot.sh"; extra_lines = let