8 files changed, 29 insertions, 8 deletions
diff --git a/nixos/hosts/ev/default.nix b/nixos/hosts/ev/default.nix
index e59ec01..9842f4f 100644
--- a/nixos/hosts/ev/default.nix
+++ b/nixos/hosts/ev/default.nix
@@ -1,4 +1,3 @@
-# channel="nixos-small"
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
diff --git a/nixos/hosts/ev/kodi.nix b/nixos/hosts/ev/kodi.nix
index 2aea216..3862dfe 100644
--- a/nixos/hosts/ev/kodi.nix
+++ b/nixos/hosts/ev/kodi.nix
@@ -7,7 +7,10 @@ let
 in
 {
   config = {
-    users.extraUsers.kodi.isNormalUser = true;
+    users.users.kodi = {
+      isNormalUser = true;
+      extraGroups = ["audio"];
+    };
 
     services = {
       cage = {
diff --git a/nixos/hosts/ev/metadata.toml b/nixos/hosts/ev/metadata.toml
new file mode 100644
index 0000000..58f0301
--- /dev/null
+++ b/nixos/hosts/ev/metadata.toml
@@ -0,0 +1 @@
+channel = "nixos-small"
diff --git a/nixos/hosts/hamac/default.nix b/nixos/hosts/hamac/default.nix
index 7085ed3..523b7d6 100644
--- a/nixos/hosts/hamac/default.nix
+++ b/nixos/hosts/hamac/default.nix
@@ -1,12 +1,11 @@
-# channel="nixos"
 # See the configuration.nix(5) man page and the NixOS manual (accessible by running `nixos-help`).
 
+{ config, lib, pkgs, ... }:
+
 let
-  sources = import ../../npins;
+  sources = import <top/npins>;
   pkgs-unstable = import sources.nixpkgs-unstable {};
 in
-{ config, lib, pkgs, ... }:
-
 {
   _module.args = { inherit pkgs-unstable; };
   imports = [
diff --git a/nixos/hosts/hamac/metadata.toml b/nixos/hosts/hamac/metadata.toml
new file mode 100644
index 0000000..fc34e27
--- /dev/null
+++ b/nixos/hosts/hamac/metadata.toml
@@ -0,0 +1 @@
+channel = "nixos"
diff --git a/nixos/hosts/tente/default.nix b/nixos/hosts/tente/default.nix
index e87b74b..23e94bc 100644
--- a/nixos/hosts/tente/default.nix
+++ b/nixos/hosts/tente/default.nix
@@ -1,4 +1,3 @@
-# channel="nixos-small"
 # Edit this configuration file to define what should be installed on
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
@@ -8,7 +7,7 @@
 let
   baseDomain = "push-f.com";
   acmeEmail = "martin@push-f.com";
-  sources = import ../../npins;
+  sources = import <top/npins>;
   helpers = import <top/helpers.nix> { inherit config; };
 in
 {
@@ -23,6 +22,7 @@ in
     ./headscale.nix
     ./matrix.nix
     ./monitoring.nix
+    "${sources.my-lex-surf}/service.nix"
     "${sources.my-osm-proposals}/service.nix"
     "${sources.my-geopos-link}/service.nix"
     "${sources.my-rust-features}/service.nix"
@@ -42,6 +42,21 @@ in
   };
   users.groups.www-generator = {};
 
+  services.lex-surf =
+    let
+      domain = "lex.surf";
+    in
+    {
+      enable = true;
+      domain = domain;
+      enableACME = true;
+      fetchUser = "www-generator";
+      nginx = {
+        forceSSL = true;
+        extraConfig = helpers.mkNginxConfig domain;
+      };
+    };
+
   services.osm_proposals =
     let
       domain = "osm-proposals.${baseDomain}";
diff --git a/nixos/hosts/tente/metadata.toml b/nixos/hosts/tente/metadata.toml
new file mode 100644
index 0000000..58f0301
--- /dev/null
+++ b/nixos/hosts/tente/metadata.toml
@@ -0,0 +1 @@
+channel = "nixos-small"
diff --git a/nixos/hosts/tente/monitoring.nix b/nixos/hosts/tente/monitoring.nix
index eaddacb..545ae24 100644
--- a/nixos/hosts/tente/monitoring.nix
+++ b/nixos/hosts/tente/monitoring.nix
@@ -57,6 +57,8 @@ in
     services.prometheus = {
       enable = true;
 
+      retentionTime = "1y";
+
       scrapeConfigs = [
         {
           job_name = "node";