Fixed duplicated systemPackages
This commit is contained in:
parent
ac23e2fafc
commit
7382cf21a8
|
@ -38,7 +38,7 @@
|
||||||
|
|
||||||
nixosModules.default = { config, pkgs, ... }: {
|
nixosModules.default = { config, pkgs, ... }: {
|
||||||
imports = [ ./module.nix ];
|
imports = [ ./module.nix ];
|
||||||
_module.args.piwatcherPkgs = self.packages;
|
_module.args.satnogsDemoDisplayPkgs = self.packages;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
17
module.nix
17
module.nix
|
@ -38,8 +38,13 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = with pkgs; [
|
||||||
cfg.package
|
cfg.package
|
||||||
|
|
||||||
|
unclutter
|
||||||
|
xorg.xhost
|
||||||
|
xorg.xrandr
|
||||||
|
feh
|
||||||
];
|
];
|
||||||
|
|
||||||
users.users = mkIf (cfg.user == "satnogs-demo") {
|
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
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
# programs.mtr.enable = true;
|
# programs.mtr.enable = true;
|
||||||
|
|
Loading…
Reference in New Issue