diff --git a/.gitignore b/.gitignore index c53f4fb..d9b4996 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,3 @@ dkim_private.pem install.log .direnv -.agents \ No newline at end of file diff --git a/configuration.nix b/configuration.nix index c858860..6ad6d2e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,7 +10,6 @@ ./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 71174f0..abf2aea 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2941802..fd6d838 100644 --- a/flake.nix +++ b/flake.nix @@ -24,14 +24,8 @@ 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 - deploy - ]; + packages = [ pkgs.nh ]; }; }; } diff --git a/modules/caddy.nix b/modules/caddy.nix index a06049b..14e6635 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -63,12 +63,6 @@ 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 262480a..bca9cae 100644 --- a/modules/searx.nix +++ b/modules/searx.nix @@ -14,16 +14,17 @@ search = { request_timeout = 1.5; }; - ui = { - categories_as_tabs = [ "general" "images" ]; + use_default_settings = { + engines = { + keep_only = [ + "google" + "wikipedia" + ]; + }; }; engines = [ - { 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; } + { name = "google"; engine = "google"; disabled = false; } + { name = "wikipedia"; engine = "wikipedia"; disabled = false; } ]; }; }; diff --git a/modules/uptime-kuma.nix b/modules/uptime-kuma.nix deleted file mode 100644 index 8ae0d6f..0000000 --- a/modules/uptime-kuma.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.uptime-kuma = { - enable = true; - settings = { - PORT = "4001"; - HOST = "127.0.0.1"; - }; - }; -}