diff --git a/configuration.nix b/configuration.nix index 3f4901d..640de1e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,6 @@ -{ pkgs, lib, userSettings, ... }: +{ pkgs, lib, userSettings, systemSettings, ... }: let stateVersion = "24.05"; - unstable = import {}; adHome = "/srv/appdaemon"; adNixPath = "${adHome}/ad-nix"; adPath = "/usr/src/app"; @@ -26,10 +25,7 @@ in (pkgs.writeShellScriptBin "nrbs" "sudo nixos-rebuild switch") (pkgs.writeShellScriptBin "nrbsu" "sudo nix-channel --update && sudo nixos-rebuild switch") (pkgs.writeShellScriptBin "nfs" "sudo nixos-rebuild switch --flake ${adNixPath} --impure") - (pkgs.writeShellScriptBin "ads" '' - cd ${adPath} - nix develop --no-pure-eval ${adNixPath}/appdaemon - '') + (pkgs.writeShellScriptBin "ads" "cd ${adPath} && nix develop --no-pure-eval ${adNixPath}/appdaemon") (pkgs.writeShellScriptBin "ad-clone" '' if [ ! -d ${adPath} ]; then sudo git clone -b ${adBranch} ${adRepo} ${adPath} @@ -38,16 +34,14 @@ in echo "${adPath} already exists" fi '') - # unstable.uv bash git eza gh sops - # appdaemon ]; - time.timeZone = "America/Chicago"; + time.timeZone = "${systemSettings.timeZone}"; virtualisation.docker.enable = true; virtualisation.oci-containers.backend = "docker"; diff --git a/promtail.nix b/promtail.nix index 52c137e..2131870 100644 --- a/promtail.nix +++ b/promtail.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: let lokiHost = "192.168.1.174:3100"; in @@ -7,6 +7,11 @@ in SupplementaryGroups = [ "docker" ]; }; + environment.systemPackages = with pkgs; [ + (pkgs.writeShellScriptBin "pc" "systemctl status promtail.service") + (pkgs.writeShellScriptBin "pw" "journalctl -u promtail.service -b -n 25 -f") + ]; + services.promtail = { enable = true; configuration = { diff --git a/telegraf.nix b/telegraf.nix index 2c23854..0825ab6 100644 --- a/telegraf.nix +++ b/telegraf.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: let influxURL = "http://panoptes.john-stream.com:8086"; organization = "homelab"; @@ -8,6 +8,11 @@ in { sops.secrets."telegraf_influx_token" = { }; + environment.systemPackages = with pkgs; [ + (pkgs.writeShellScriptBin "tc" "systemctl status telegraf.service") + (pkgs.writeShellScriptBin "tw" "journalctl -u telegraf.service -b -n 25 -f") + ]; + systemd.services.telegraf = { environment = { INFLUX_WRITE_TOKEN = token;