summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-04-20 09:01:54 +0200
committermakefu <github@syntax-fehler.de>2021-04-20 09:01:54 +0200
commit610a81d723a8a6593ccb1adf7f87eef145953771 (patch)
tree13739e02a1b73671bf6cbaad125ab4620eee63c1 /lass/2configs
parentbba59bcf1115a14d913b5dff30fe6df0bc395233 (diff)
parent6b12f7ec6ab25eb482c73d9c3e1b892b0531ff6d (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/hass/default.nix6
-rw-r--r--lass/2configs/searx.nix23
-rw-r--r--lass/2configs/syncthing.nix6
-rw-r--r--lass/2configs/tests/dummy-secrets/searx.key1
4 files changed, 26 insertions, 10 deletions
diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
index 7765db84e..be9c32809 100644
--- a/lass/2configs/hass/default.nix
+++ b/lass/2configs/hass/default.nix
@@ -43,11 +43,9 @@ in {
services.home-assistant = {
enable = true;
- package = (unstable.home-assistant.overrideAttrs (old: {
+ package = unstable.home-assistant.overrideAttrs (old: {
doInstallCheck = false;
- })).override {
- extraPackages = _: [ dwdwfsapi ];
- };
+ });
configWritable = true;
lovelaceConfigWritable = true;
config = let
diff --git a/lass/2configs/searx.nix b/lass/2configs/searx.nix
new file mode 100644
index 000000000..ed6586a26
--- /dev/null
+++ b/lass/2configs/searx.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+let
+ port = 8889;
+in {
+ services.nginx.virtualHosts.search = {
+ serverAliases = [ "search.r" ];
+ locations."/".extraConfig = ''
+ proxy_set_header Host $host;
+ proxy_pass http://127.0.0.1:${builtins.toString port};
+ '';
+ };
+
+ services.searx = {
+ enable = true;
+ configFile = pkgs.writeText "searx.cfg" (builtins.toJSON {
+ use_default_settings = true;
+ server = {
+ port = port;
+ secret_key = builtins.readFile <secrets/searx.key>;
+ };
+ });
+ };
+}
diff --git a/lass/2configs/syncthing.nix b/lass/2configs/syncthing.nix
index 7801c758c..7b8850681 100644
--- a/lass/2configs/syncthing.nix
+++ b/lass/2configs/syncthing.nix
@@ -3,10 +3,6 @@
imports = [ <stockholm/krebs/2configs/syncthing.nix> ];
services.syncthing = {
group = "syncthing";
- declarative = {
- key = toString <secrets/syncthing.key>;
- cert = toString <secrets/syncthing.cert>;
- };
};
krebs.iptables.tables.filter.INPUT.rules = [
{ predicate = "-p tcp --dport 22000"; target = "ACCEPT";}
@@ -16,6 +12,4 @@
system.activationScripts.syncthing-home = mkDefault ''
${pkgs.coreutils}/bin/chmod a+x /home/lass
'';
-
- boot.kernel.sysctl."fs.inotify.max_user_watches" = 524288;
}
diff --git a/lass/2configs/tests/dummy-secrets/searx.key b/lass/2configs/tests/dummy-secrets/searx.key
new file mode 100644
index 000000000..bd88e01cd
--- /dev/null
+++ b/lass/2configs/tests/dummy-secrets/searx.key
@@ -0,0 +1 @@
+yolo