diff --git a/modules/main.nix b/modules/main.nix index 2045f22..18f1501 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -20,16 +20,7 @@ (import ./skyg) (import ./nixos) (import ./network-drives.nix) - ] ++ (if os.enable then - [ - (import ./os ({ - user = user; - hostName = hostName; - } // os)) - ] - else - [ ]) - ; + ]; # Share defaults skyg.user = user; skyg.core.hostName = hostName; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 17f1289..b5b4324 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -3,5 +3,6 @@ imports = [ ./audiobookshelf.nix ./coral-tpu-udev.nix + ./exporters.nix ]; } diff --git a/modules/nixos/server/exporters.nix b/modules/nixos/server/exporters.nix new file mode 100644 index 0000000..18ead42 --- /dev/null +++ b/modules/nixos/server/exporters.nix @@ -0,0 +1,21 @@ +{ config, lib, ... }: +with lib; +let cfg = config.skyg.server.exporters; +in { + options = { + skyg.server.exporters = { + enable = mkEnableOption + "Enable Special prom exporters for servers"; + }; + }; + config = mkIf cfg.enable { + services.prometheus.exporters = { + node = { + enable = true; + enabledCollectors = [ "systemd" ]; + openFirewall = true; + port = 9100; + }; + }; + }; +} diff --git a/modules/os/default.nix b/modules/os/default.nix deleted file mode 100644 index 82c9432..0000000 --- a/modules/os/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ user -, hostName -, firewall -, enableFonts ? true -, enableNetworking ? true -, enableSSH ? true -, containers ? { runtime = null; } -, hardware ? { enable = false; } -, enablePrometheusExporters ? false -, ... -}: -{ pkgs, ... }: { - imports = (if enableSSH then - [ - (import ./ssh.nix { - enableSSHServer = true; - user = user; - }) - ] - else - [ ]) - ++ (if enablePrometheusExporters then [ ./exporters.nix ] else [ ]); -} diff --git a/modules/os/exporters.nix b/modules/os/exporters.nix deleted file mode 100644 index 691cdfa..0000000 --- a/modules/os/exporters.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: { - services.prometheus.exporters = { - node = { - enable = true; - enabledCollectors = [ "systemd" ]; - openFirewall = true; - port = 9100; - }; - }; -}