diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index e7e5257..987af3b 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -33,11 +33,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1750459395, - "narHash": "sha256-i6Khg4dcHXl6keWUW8vv7+aUAFdM+1rahFg59qx2xQ8=", + "lastModified": 1750780721, + "narHash": "sha256-EgWdBolm8wPXY9iuTHPXykJiQRzSnfXzkCXpNooxEB8=", "ref": "refs/heads/master", - "rev": "1b02f9ea95ec7e81a45ec40159991065856482b7", - "revCount": 489, + "rev": "2004734c7b7d77638874b63e147970199830c3fd", + "revCount": 500, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index 109440d..3f5c1ff 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -49,6 +49,9 @@ systemName = configuration_name; boot.systemd.enable = true; secrets.enable = true; + general = { + reporting.enable = true; + }; programs = { tailnet.enable = true; ssh.enable = true; diff --git a/hosts/h001/mods/default.nix b/hosts/h001/mods/default.nix index 5d1fb62..dbd2ac6 100644 --- a/hosts/h001/mods/default.nix +++ b/hosts/h001/mods/default.nix @@ -6,6 +6,5 @@ ./adguardhome.nix ./nixarr.nix ./monitoring.nix - ./reporting.nix ]; } diff --git a/hosts/h001/mods/reporting.nix b/hosts/h001/mods/reporting.nix deleted file mode 100644 index 7a9eadb..0000000 --- a/hosts/h001/mods/reporting.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - config, - ... -}: -{ - config = { - services.prometheus.exporters.node = { - enable = true; - port = 9100; - }; - # Create necessary directories with appropriate permissions - systemd.tmpfiles.rules = [ - "d /tmp/positions 1777 - - -" # World-writable directory for positions file - "f /tmp/positions.yaml 0666 - - -" # World-writable positions file - ]; - users.groups.systemd-journal.members = [ "promtail" ]; - services.promtail = { - enable = true; - extraFlags = [ - "-config.expand-env=true" - ]; - configuration = { - server = { - http_listen_port = 9080; - grpc_listen_port = 0; - }; - positions = { - filename = "/tmp/positions.yaml"; # Changed from /var/lib/promtail/positions.yaml - }; - clients = [ - { - url = "http://100.64.0.13:3100/loki/api/v1/push"; # Points to your Loki instance - } - ]; - scrape_configs = [ - { - job_name = "journal"; - journal = { - json = false; - max_age = "12h"; - path = "/var/log/journal"; - labels = { - job = "systemd-journal"; - host = config.networking.hostName; - }; - }; - relabel_configs = [ - { - source_labels = [ "__journal__systemd_unit" ]; - target_label = "unit"; - } - ]; - } - ]; - }; - }; - }; -} diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index fa25b98..6a5181b 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -29,17 +29,22 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "path": "../../common", - "type": "path" + "lastModified": 1750780721, + "narHash": "sha256-EgWdBolm8wPXY9iuTHPXykJiQRzSnfXzkCXpNooxEB8=", + "ref": "refs/heads/master", + "rev": "2004734c7b7d77638874b63e147970199830c3fd", + "revCount": 500, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -173,6 +178,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -188,7 +209,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1750622754, "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", @@ -204,7 +225,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1750188666, "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", @@ -1120,7 +1141,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1140,13 +1161,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 853d248..bd71054 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -3,8 +3,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # Use relative to get current version for testing - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; };