diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix index 43251e2..d6b36dd 100644 --- a/machines/calcite/configuration.nix +++ b/machines/calcite/configuration.nix @@ -71,21 +71,6 @@ layout = "us"; xkbVariant = ""; }; - # Keyboard mapping on internal keyboard - services.keyd = { - enable = true; - keyboards = { - "internal" = { - ids = [ "0b05:1866" ]; - settings = { - main = { - capslock = "overload(control, esc)"; - leftcontrol = "capslock"; - }; - }; - }; - }; - }; # Enable CUPS to print documents. services.printing.enable = true; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index e89ad69..1b91ad5 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -3,6 +3,5 @@ imports = [ ./restic.nix ./vaultwarden.nix - ./prometheus.nix ]; } \ No newline at end of file diff --git a/modules/nixos/prometheus.nix b/modules/nixos/prometheus.nix deleted file mode 100644 index ac0a976..0000000 --- a/modules/nixos/prometheus.nix +++ /dev/null @@ -1,48 +0,0 @@ - -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.custom.prometheus; -in -{ - options = { - custom.prometheus = { - enable = mkEnableOption "Prometheus instance"; - exporters = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable Prometheus exporter on every supported services"; - }; - }; - }; - }; - - config = { - services.prometheus = mkIf cfg.enable { - enable = true; - port = 9091; - exporters = { - node = { - enable = true; - enabledCollectors = [ "systemd" ]; - port = 9100; - }; - }; - scrapeConfigs = [ - { job_name = "prometheus"; - static_configs = [ - { targets = [ "localhost:${toString config.services.prometheus.port}" ]; } - ]; - } - { job_name = "node"; - static_configs = [ - { targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; } - ]; - } - ]; - }; - }; -} \ No newline at end of file