diff --git a/.gitignore b/.gitignore index d9b4996..c53f4fb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ dkim_private.pem install.log .direnv +.agents \ No newline at end of file diff --git a/configuration.nix b/configuration.nix index 6ad6d2e..c858860 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,6 +10,7 @@ ./modules/matrix.nix ./modules/monitoring.nix ./modules/ntfy.nix + ./modules/uptime-kuma.nix ./secrets/secrets-scheme.nix # Impure Secrets ./secrets/secrets.nix diff --git a/flake.lock b/flake.lock index abf2aea..71174f0 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fd6d838..2941802 100644 --- a/flake.nix +++ b/flake.nix @@ -24,8 +24,14 @@ devShells.x86_64-linux.default = let pkgs = nixpkgs.legacyPackages.x86_64-linux; + deploy = pkgs.writeShellScriptBin "nhs" '' + nh os switch --hostname extremist-software --target-host root@extremist-software --impure path:. "$@" + ''; in pkgs.mkShell { - packages = [ pkgs.nh ]; + packages = [ + pkgs.nh + deploy + ]; }; }; } diff --git a/modules/caddy.nix b/modules/caddy.nix index 14e6635..a06049b 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -63,6 +63,12 @@ reverse_proxy localhost:3001 # Grafana ''; }; + + "uptime.extremist.software" = { + extraConfig = '' + reverse_proxy localhost:4001 + ''; + }; "ntfy.extremist.software" = { extraConfig = '' diff --git a/modules/searx.nix b/modules/searx.nix index bca9cae..262480a 100644 --- a/modules/searx.nix +++ b/modules/searx.nix @@ -14,17 +14,16 @@ search = { request_timeout = 1.5; }; - use_default_settings = { - engines = { - keep_only = [ - "google" - "wikipedia" - ]; - }; + ui = { + categories_as_tabs = [ "general" "images" ]; }; engines = [ - { name = "google"; engine = "google"; disabled = false; } - { name = "wikipedia"; engine = "wikipedia"; disabled = false; } + { name = "google"; engine = "google"; categories = "general"; disabled = false; } + { name = "wikipedia"; engine = "wikipedia"; categories = "general"; disabled = false; } + { name = "google images"; engine = "google_images"; categories = "images"; disabled = false; } + { name = "duckduckgo images"; engine = "duckduckgo_images"; categories = "images"; disabled = false; } + { name = "bing images"; engine = "bing_images"; categories = "images"; disabled = false; } + { name = "qwant images"; engine = "qwant_images"; categories = "images"; disabled = false; } ]; }; }; diff --git a/modules/uptime-kuma.nix b/modules/uptime-kuma.nix new file mode 100644 index 0000000..8ae0d6f --- /dev/null +++ b/modules/uptime-kuma.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ + services.uptime-kuma = { + enable = true; + settings = { + PORT = "4001"; + HOST = "127.0.0.1"; + }; + }; +}