diff --git a/flake.nix b/flake.nix index c2f3b48..5f9c82d 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ nixosModules.default = { config, pkgs, ... }: { imports = [ ./module.nix ]; - _module.args.piwatcherPkgs = self.packages; + _module.args.satnogsDemoDisplayPkgs = self.packages; }; }; } diff --git a/module.nix b/module.nix index 0f69f00..c2ffe03 100644 --- a/module.nix +++ b/module.nix @@ -38,8 +38,13 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ + environment.systemPackages = with pkgs; [ cfg.package + + unclutter + xorg.xhost + xorg.xrandr + feh ]; users.users = mkIf (cfg.user == "satnogs-demo") { @@ -78,16 +83,6 @@ in ''; }; - - - environment.systemPackages = with pkgs; [ - unclutter - xorg.xhost - xorg.xrandr - feh - chromium - ]; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true;