diff --git a/flake.lock b/flake.lock index 7315300..db46eb1 100644 --- a/flake.lock +++ b/flake.lock @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1744380363, - "narHash": "sha256-cXjAUuAfQDPSLSsckZuTioQ986iqSPTzx8D7dLAcC+Q=", + "lastModified": 1742305478, + "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e43c6bcb101ba3301522439c459288c4a248f624", + "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744333010, - "narHash": "sha256-VBaAreKB9fsgh5fjyK62UA03aPLDL2KhmLvOEbWT8q4=", + "lastModified": 1742278753, + "narHash": "sha256-/PaeiSHDZ2vrToGwnBaY9Pzi1dZe89QpIinQnFO12xU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c6f8c36e22e0f41dd17e91734f0e748cf267dd1f", + "rev": "8b3c5da082e4102467fe347183c4aff7c28db920", "type": "github" }, "original": { @@ -424,11 +424,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1744273222, - "narHash": "sha256-NWh4+o36VxbGxa8EG6fESZYRIvBy86rD7SOXNPjDR6k=", + "lastModified": 1742251389, + "narHash": "sha256-X0tTZ07s549yGg9q8Nwf+75745T8gtxFLbPs0WMo4TU=", "owner": "neovim", "repo": "neovim", - "rev": "dc00b379658ff7d545bd49161a7e81d83474b194", + "rev": "3b1d0e7f701b53d72e4fdf5a721d2684d055cc1d", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1744224272, - "narHash": "sha256-cqePj5nuC7flJWNncaVAFq1YZncU0PSyO0DEqGn+vYc=", + "lastModified": 1742165923, + "narHash": "sha256-WKzuVsHXjuxYjS9KxKdpoPWpT37LofyS5llSssEw058=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "113883e37d985d26ecb65282766e5719f2539103", + "rev": "95eac71bf52b271523d0ca81dbbeb3182990fc24", "type": "github" }, "original": { @@ -512,11 +512,11 @@ ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1742217219, + "narHash": "sha256-pLRjj0jTL1TloB0ptEwVF51IJJX8a17dSxg+gqiWb30=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "83900d5154d840dfae1e0367c5290f59b9dccf03", "type": "github" }, "original": { @@ -558,11 +558,11 @@ }, "nixpkgsSmall": { "locked": { - "lastModified": 1744325773, - "narHash": "sha256-bZpSB/MouP20RP9ig0GCGkn/bT6K+cP6y6DMnoCw7tk=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58aff6bffd4df979cefa2b99ac582017501be2af", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -574,11 +574,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744157173, - "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", + "lastModified": 1742206328, + "narHash": "sha256-q+AQ///oMnyyFzzF4H9ShSRENt3Zsx37jTiRkLkXXE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f", + "rev": "096478927c360bc18ea80c8274f013709cf7bdcd", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -697,11 +697,11 @@ "nuschtosSearch": "nuschtosSearch_2" }, "locked": { - "lastModified": 1744383153, - "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", + "lastModified": 1742255305, + "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", "owner": "nix-community", "repo": "nixvim", - "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", + "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", "type": "github" }, "original": { @@ -744,11 +744,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -797,11 +797,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1744103455, - "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", + "lastModified": 1742239755, + "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", + "rev": "787afce414bcce803b605c510b60bf43c11f4b55", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -882,11 +882,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1744044972, - "narHash": "sha256-17L0FA2S3+237RN2o/gKnIyBmfoChVxyrGiYPAovpSU=", + "lastModified": 1740745001, + "narHash": "sha256-XZEIwnwOYgb1wECvT83HB314bd/JBYwSaTaj2EeqWrc=", "owner": "abenz1267", "repo": "walker", - "rev": "b2b47b27ac64b1a9820216520ad61c3989d27c87", + "rev": "350d5e078b997b5ca07eda39e207048ee26bbb9d", "type": "github" }, "original": { diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index 896da0c..8ec97c9 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -112,7 +112,6 @@ in "aspnetcore-runtime-wrapped-6.0.36" "dotnet-sdk-6.0.428" "dotnet-sdk-wrapped-6.0.428" - "python3.12-django-3.1.14" ]; # seems like sabnzbd needs some unfree pkgs... diff --git a/hosts/sisyphe/features/multimedia/sabnzbd.nix b/hosts/sisyphe/features/multimedia/sabnzbd.nix index 5a275f1..75a85d3 100644 --- a/hosts/sisyphe/features/multimedia/sabnzbd.nix +++ b/hosts/sisyphe/features/multimedia/sabnzbd.nix @@ -1,11 +1,24 @@ -{ ... }: +{ config, pkgs, ... }: { services.sabnzbd = { enable = true; openFirewall = true; }; - services.caddy.virtualHosts."http://nzb.sisyphe.normandy.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://nzb.normandy.sisyphe.hypervirtual.world".extraConfig = '' reverse_proxy 8080 ''; + + /* + services.prometheus.exporters.sabnzbd = { + enable = true; + servers = [ + { + sisyphe = { + + }; + } + ]; + }; + */ } diff --git a/hosts/sisyphe/features/prometheus.nix b/hosts/sisyphe/features/prometheus.nix index edb6fcf..0c32ac4 100644 --- a/hosts/sisyphe/features/prometheus.nix +++ b/hosts/sisyphe/features/prometheus.nix @@ -11,54 +11,23 @@ ]; port = 9002; }; - borgmatic = { - enable = true; - }; - systemd = { - enable = true; - }; - sabnzbd = { - enable = true; - servers = [ - { - "sisyphe" = { - apiKeyFile = "/run/secrets/sabnbzd_apikey"; - }; - } - ]; - }; - redis = { - enable = true; - }; - postgres = { - enable = true; - }; - pihole = { - enable = true; - piholeHostname = "192.168.1.25"; - }; - php-fpm = { - enable = true; - }; - nextcloud = { - enable = true; - url = "https://cloud.hypervirtual.world"; - tokenFile = "/run/secrets/nextcloudTokenFile"; - }; }; scrapeConfigs = [ - + /* + { + job_name = "synapse"; + scrape_interval = "15s"; + metrics_path = "/_synapse/metrics"; + static_configs = [ { targets = [ "localhost:9000" ]; } ]; + } + */ { job_name = "homelab-stats"; static_configs = [ - { - targets = [ - "localhost:${builtins.toString config.services.prometheus.exporters.node.port}" - "192.168.1.197:9100" - ]; - } + { targets = [ "localhost:${builtins.toString config.services.prometheus.exporters.node.port}" ]; } ]; } ]; + }; } diff --git a/hosts/sisyphe/features/services/archivebox.nix b/hosts/sisyphe/features/services/archivebox.nix index 98a5665..d0685d3 100644 --- a/hosts/sisyphe/features/services/archivebox.nix +++ b/hosts/sisyphe/features/services/archivebox.nix @@ -1,32 +1,6 @@ -{ config, pkgs, ... }: +{config, pkgs, ...}: { environment.systemPackages = with pkgs; [ archivebox - nodejs_23 ]; - - services.caddy.virtualHosts."archive.hypervirtual.world".extraConfig = '' - reverse_proxy 15632 - ''; - - systemd.services."archivebox-web" = { - enable = true; - description = "Runs the archivebox web UI"; - preStart = '' - mkdir -p /srv/archivebox - chown archivebox:archivebox /srv/archivebox - if [ ! -f /srv/archivebox/index.sqlite3 ]; then - sudo -u archivebox ${pkgs.archivebox}/bin/archivebox init --path /srv/archivebox - fi - ''; - serviceConfig = { - ExecStart = "${pkgs.archivebox}/bin/archivebox server 0.0.0.0:15632 --path /srv/archivebox"; - Restart = "always"; - User = "archivebox"; - Group = "archivebox"; - WorkingDirectory = "/var/lib/archivebox"; - }; - wantedBy = [ "multi-user.target" ]; - }; - } diff --git a/shared/default.nix b/shared/default.nix index 235339c..26a9e5a 100644 --- a/shared/default.nix +++ b/shared/default.nix @@ -7,6 +7,7 @@ }: { environment.systemPackages = [ + inputs.miovim.packages.${system}.default pkgs.curl pkgs.unzip pkgs.kitty.terminfo