Merge branch 'Changes_20.03'

config/locale.nix

@@ -1,8 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  console.keyMap = "de";
   i18n = {
-    consoleKeyMap = "de";
     defaultLocale = "en_US.UTF-8";
 
     inputMethod = {

fn.nix

@@ -5,6 +5,9 @@ with lib;
 
 rec {
   ifelse = a: b: c: if a then b else c;
+  fileContentsOr = a: b: (ifelse
+    (pathIsRegularFile a)
+    a b);
   cwd = toString ./.;
   lst = { p ? cwd, t ? "regular", b ? false }: (lists.forEach
     (attrNames

machines/Lilim/options.nix

@@ -60,7 +60,7 @@ with lib;
       allowedUDPPortRanges = [ { from = 1714; to = 1764; } ];
       allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
     };
-    desktop.wms = [ "i3" ];
+    desktop.wms = [ "none+i3" "i3" ];
   };
 
   config.system.copySysConf = {

services/acme.nix

@@ -0,0 +1,17 @@
+{ options, config, lib, pkgs, ... }:
+
+with builtins;
+with lib;
+
+let
+  fn = import (../. + (toPath "/fn.nix")) { inherit lib; };
+  cfg = config.machine;
+in mkIf (elem "acme" cfg.services) {
+  security.acme = {
+    # see https://letsencrypt.org/repository/
+    acceptTerms = true;
+    email = fn.fileContentsOr
+      (toPath "${cfg.secretPath}/acme.mailAddr")
+      "${(elemAt cfg.mailAccounts 0).name}@${cfg.domain}";
+  };
+}

services/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./acme.nix
     ./cups.nix
     ./docker.nix
     ./fail2ban.nix

services/desktop.nix

@@ -40,9 +40,9 @@ in mkIf (elem "desktop" cfg.services) {
     enable = !(elem "sway" cfg.desktop.wms);
     layout = "de";
     videoDrivers = [ "intel" ];
+    displayManager.defaultSession = ifelse (cfg.desktop.wms != []) (elemAt cfg.desktop.wms 0) null;
     windowManager = mkIf (cfg.desktop.wms != []) {
       i3 = mkIf (elem "i3" cfg.desktop.wms) (import ./desktop/i3.nix { inherit pkgs; });
-      default = elemAt cfg.desktop.wms 0;
     };
     libinput = {
       enable = true;