From eb8b347dad8662287a817f6ea4c26e4ac2df9ae1 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Fri, 2 Feb 2024 03:18:10 +0100 Subject: [PATCH] Use intray fork --- flake.nix | 2 +- hosts/nixos/lapetus/services/intray.nix | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 6efa6f8..efc6d27 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,7 @@ # smos.inputs.home-manager.follows = "home-manager"; # Intray - intray.url = "github:NorfairKing/intray"; + intray.url = "github:Mateiadrielrafael/intray"; # intray.inputs.nixpkgs.follows = "nixpkgs"; # intray.inputs.home-manager.follows = "home-manager"; diff --git a/hosts/nixos/lapetus/services/intray.nix b/hosts/nixos/lapetus/services/intray.nix index ba3bd82..6f4236f 100644 --- a/hosts/nixos/lapetus/services/intray.nix +++ b/hosts/nixos/lapetus/services/intray.nix @@ -7,24 +7,15 @@ let webPort = 8403; in { - # {{{ Import intray module imports = [ ../../common/optional/services/nginx.nix - # We patch out the `intray` module to allow manual configuration for nginx - ({ 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" ]; - }) + inputs.intray.nixosModules.x86_64-linux.default ]; - # }}} + # {{{ Configure intray services.intray.production = { enable = true; + configureNetworking = false; api-server = { enable = true; hosts = [ apiHost ];