Merge remote-tracking branch 'prism/master' into master

14 files changed, 36 insertions, 86 deletions

diff --git a/lass/2configs/copyq.nix b/lass/2configs/copyq.nix
index 56c091a6e..ed78699b0 100644
--- a/lass/2configs/copyq.nix
+++ b/lass/2configs/copyq.nix
@@ -25,9 +25,6 @@ in {
     environment = {
       DISPLAY = ":${toString config.services.xserver.display}";
     };
-    path = with pkgs; [
-      qt5.full
-    ];
     serviceConfig = {
       SyslogIdentifier = "copyq";
       ExecStart = "${pkgs.copyq}/bin/copyq";
diff --git a/lass/2configs/dcso-vpn.nix b/lass/2configs/dcso-vpn.nix
deleted file mode 100644
index 0a5623bf0..000000000
--- a/lass/2configs/dcso-vpn.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-with import <stockholm/lib>;
-{ ... }:
-
-{
-
-  users.extraUsers = {
-    dcsovpn = rec {
-      name = "dcsovpn";
-      uid = genid "dcsovpn";
-      description = "user for running dcso openvpn";
-      home = "/home/${name}";
-    };
-  };
-
-  users.extraGroups.dcsovpn.gid = genid "dcsovpn";
-
-  services.openvpn.servers = {
-    dcso = {
-      config = ''
-        client
-        dev tun
-        tun-mtu 1356
-        mssfix
-        proto udp
-        float
-        remote 217.111.55.41 1194
-        nobind
-        user dcsovpn
-        group dcsovpn
-        persist-key
-        persist-tun
-        ca ${toString <secrets/dcsovpn/ca.pem>}
-        cert ${toString <secrets/dcsovpn/cert.pem>}
-        key ${toString <secrets/dcsovpn/cert.key>}
-        verb 3
-        mute 20
-        auth-user-pass ${toString <secrets/dcsovpn/login.txt>}
-        route-method exe
-        route-delay 2
-      '';
-      updateResolvConf = true;
-    };
-  };
-}
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index f59988b75..1cf421fed 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -2,7 +2,6 @@ with import <stockholm/lib>;
 { config, pkgs, ... }:
 {
   imports = [
-    <stockholm/krebs/2configs/nscd-fix.nix>
     ./binary-cache/client.nix
     ./backup.nix
     ./gc.nix
@@ -223,4 +222,5 @@ with import <stockholm/lib>;
 
   # use 24:00 time format, the default got sneakily changed around 20.03
   i18n.defaultLocale = mkDefault "C.UTF-8";
+  system.stateVersion = mkDefault "20.03";
 }
diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
index 66d430cd1..78379ba1c 100644
--- a/lass/2configs/hass/default.nix
+++ b/lass/2configs/hass/default.nix
@@ -26,7 +26,7 @@ with import ./lib.nix { inherit lib; };
     lovelaceConfigWritable = true;
   };
 
-  lass.hass.config = let
+  services.home-assistant.config = let
     tasmota_s20 = name: topic: {
       platform = "mqtt";
       inherit name;
diff --git a/lass/2configs/hass/rooms/bett.nix b/lass/2configs/hass/rooms/bett.nix
index 16227fcb6..48a1f72d7 100644
--- a/lass/2configs/hass/rooms/bett.nix
+++ b/lass/2configs/hass/rooms/bett.nix
@@ -2,38 +2,38 @@
 with import ../lib.nix { inherit lib; };
 
 {
-  lass.hass.config = lib.mkMerge [
+  services.home-assistant.config = lib.mkMerge [
     (lightswitch switches.dimmer.bett lights.bett)
   ];
 
-  lass.hass.love = {
-    resources = [{
-      url = "https://raw.githubusercontent.com/ljmerza/light-entity-card/master/dist/light-entity-card.js.map";
-      type = "js";
-    }];
-    views = [{
-      title = "bett";
-      cards = [
-        {
-          type = "markdown";
-          title = "hello world";
-          content = "This is just a test";
-        }
-        {
-          type = "light";
-          entity = "light.${lights.bett}";
-        }
-        {
-          type = "custom:light-entity-card";
-          entity = "light.${lights.bett}";
-        }
-        {
-          type = "history-graph";
-          entities = [
-            "light.${lights.bett}"
-          ];
-        }
-      ];
-    }];
-  };
+  # lass.hass.love = {
+  #   resources = [{
+  #     url = "https://raw.githubusercontent.com/ljmerza/light-entity-card/master/dist/light-entity-card.js.map";
+  #     type = "js";
+  #   }];
+  #   views = [{
+  #     title = "bett";
+  #     cards = [
+  #       {
+  #         type = "markdown";
+  #         title = "hello world";
+  #         content = "This is just a test";
+  #       }
+  #       {
+  #         type = "light";
+  #         entity = "light.${lights.bett}";
+  #       }
+  #       {
+  #         type = "custom:light-entity-card";
+  #         entity = "light.${lights.bett}";
+  #       }
+  #       {
+  #         type = "history-graph";
+  #         entities = [
+  #           "light.${lights.bett}"
+  #         ];
+  #       }
+  #     ];
+  #   }];
+  # };
 }
diff --git a/lass/2configs/hass/rooms/essen.nix b/lass/2configs/hass/rooms/essen.nix
index f74996154..eeb3d30d2 100644
--- a/lass/2configs/hass/rooms/essen.nix
+++ b/lass/2configs/hass/rooms/essen.nix
@@ -2,7 +2,7 @@
 with import ../lib.nix { inherit lib; };
 
 {
-  lass.hass.config = lib.mkMerge [
+  services.home-assistant.config = lib.mkMerge [
     (detect_movement sensors.movement.essen lights.essen 10)
     (lightswitch switches.dimmer.essen lights.essen)
   ];
diff --git a/lass/2configs/hass/rooms/nass.nix b/lass/2configs/hass/rooms/nass.nix
index 163f4fc48..7e6298738 100644
--- a/lass/2configs/hass/rooms/nass.nix
+++ b/lass/2configs/hass/rooms/nass.nix
@@ -2,7 +2,7 @@
 with import ../lib.nix { inherit lib; };
 
 {
-  lass.hass.config = lib.mkMerge [
+  services.home-assistant.config = lib.mkMerge [
     (detect_movement sensors.movement.nass lights.nass 100)
     (lightswitch switches.dimmer.nass lights.nass)
   ];
diff --git a/lass/2configs/hass/zigbee.nix b/lass/2configs/hass/zigbee.nix
index 6d091066e..b2a221e49 100644
--- a/lass/2configs/hass/zigbee.nix
+++ b/lass/2configs/hass/zigbee.nix
@@ -35,7 +35,7 @@ in {
     volumes = ["/var/lib/zigbee2mqtt:/app/data"];
   };
 
-  lass.hass.config = {
+  services.home-assistant.config = {
     sensor = [
       # Sensor for monitoring the bridge state
       {
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/ca.pem b/lass/2configs/tests/dummy-secrets/dcsovpn/ca.pem
deleted file mode 100644
index e69de29bb..000000000
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/ca.pem
+++ /dev/null
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.key b/lass/2configs/tests/dummy-secrets/dcsovpn/cert.key
deleted file mode 100644
index e69de29bb..000000000
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.key
+++ /dev/null
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.pem b/lass/2configs/tests/dummy-secrets/dcsovpn/cert.pem
deleted file mode 100644
index e69de29bb..000000000
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.pem
+++ /dev/null
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/login.txt b/lass/2configs/tests/dummy-secrets/dcsovpn/login.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/login.txt
+++ /dev/null
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 78cfb29cd..ac7db10f5 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -97,7 +97,6 @@ in {
       overwriteProtocol = "https";
     };
     https = true;
-    nginx.enable = true;
   };
   services.nginx.virtualHosts."o.xanf.org" = {
     enableACME = true;
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 74585a6f8..17df71310 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -16,7 +16,6 @@ in {
     email = "acme@lassul.us";
     acceptTerms = true;
     certs."lassul.us" = {
-      allowKeysForGroup = true;
       group = "lasscert";
     };
   };
@@ -78,7 +77,6 @@ in {
     email = "lassulus@lassul.us";
     webroot = "/var/lib/acme/acme-challenge";
     group = "nginx";
-    user = "nginx";
   };