diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix index b48252b2..742be180 100644 --- a/hosts/common/programs/assorted.nix +++ b/hosts/common/programs/assorted.nix @@ -801,6 +801,8 @@ in sane-die-with-parent.sandbox.enable = false; #< it's a launcher; can't sandbox + sane-weather = {}; + screen.sandbox.enable = false; #< tty; needs to run anything sequoia.sandbox.method = "bwrap"; # TODO:sandbox: untested diff --git a/hosts/common/programs/conky/default.nix b/hosts/common/programs/conky/default.nix index 6b34370a..c18f16a7 100644 --- a/hosts/common/programs/conky/default.nix +++ b/hosts/common/programs/conky/default.nix @@ -1,5 +1,11 @@ { pkgs, ... }: { + sane.programs.sane-battery-estimate = { + packageUnwrapped = pkgs.static-nix-shell.mkBash { + pname = "sane-battery-estimate"; + srcRoot = ./.; + }; + }; sane.programs.conky = { sandbox.method = "bwrap"; sandbox.net = "clearnet"; #< for the scripts it calls (weather) @@ -11,18 +17,16 @@ ]; sandbox.whitelistWayland = true; - fs.".config/conky/conky.conf".symlink.target = - let - # TODO: make this just another `suggestedPrograms`! - battery_estimate = pkgs.static-nix-shell.mkBash { - pname = "battery_estimate"; - srcRoot = ./.; - }; - in pkgs.substituteAll { - src = ./conky.conf; - bat = "${battery_estimate}/bin/battery_estimate"; - weather = "timeout 20 ${pkgs.sane-weather}/bin/sane-weather"; - }; + suggestedPrograms = [ + "sane-battery-estimate" + "sane-weather" + ]; + + fs.".config/conky/conky.conf".symlink.target = pkgs.substituteAll { + src = ./conky.conf; + bat = "sane-battery-estimate"; + weather = "timeout 20 sane-weather"; + }; services.conky = { description = "conky dynamic desktop background"; diff --git a/hosts/common/programs/conky/battery_estimate b/hosts/common/programs/conky/sane-battery-estimate similarity index 99% rename from hosts/common/programs/conky/battery_estimate rename to hosts/common/programs/conky/sane-battery-estimate index ce36d220..6461636a 100755 --- a/hosts/common/programs/conky/battery_estimate +++ b/hosts/common/programs/conky/sane-battery-estimate @@ -1,4 +1,3 @@ -#!/bin/sh #!/usr/bin/env nix-shell #!nix-shell -i bash