Use intray fork
This commit is contained in:
parent
1692a4c585
commit
eb8b347dad
|
@ -69,7 +69,7 @@
|
||||||
# smos.inputs.home-manager.follows = "home-manager";
|
# smos.inputs.home-manager.follows = "home-manager";
|
||||||
|
|
||||||
# Intray
|
# Intray
|
||||||
intray.url = "github:NorfairKing/intray";
|
intray.url = "github:Mateiadrielrafael/intray";
|
||||||
# intray.inputs.nixpkgs.follows = "nixpkgs";
|
# intray.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# intray.inputs.home-manager.follows = "home-manager";
|
# intray.inputs.home-manager.follows = "home-manager";
|
||||||
|
|
||||||
|
|
|
@ -7,24 +7,15 @@ let
|
||||||
webPort = 8403;
|
webPort = 8403;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# {{{ Import intray module
|
|
||||||
imports = [
|
imports = [
|
||||||
../../common/optional/services/nginx.nix
|
../../common/optional/services/nginx.nix
|
||||||
# We patch out the `intray` module to allow manual configuration for nginx
|
inputs.intray.nixosModules.x86_64-linux.default
|
||||||
({ lib, pkgs, config, ... }:
|
|
||||||
# NOTE: using `pkgs.system` before `module.options` is evaluated
|
|
||||||
# leads to infinite recursion!
|
|
||||||
let m = inputs.intray.nixosModules.x86_64-linux.default { inherit lib pkgs config; };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit (m) options;
|
|
||||||
config = builtins.removeAttrs m.config [ "networking" "services" ];
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
# }}}
|
|
||||||
# {{{ Configure intray
|
# {{{ Configure intray
|
||||||
services.intray.production = {
|
services.intray.production = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
configureNetworking = false;
|
||||||
api-server = {
|
api-server = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hosts = [ apiHost ];
|
hosts = [ apiHost ];
|
||||||
|
|
Loading…
Reference in a new issue