summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-06-26 13:12:45 +0200
committermakefu <github@syntax-fehler.de>2020-06-26 13:12:45 +0200
commit237a56464d13ff36b5872387d9dbdc43eeefa146 (patch)
treeb3751d87c6e9a935a2fa19babc1633b252468249 /tv
parent5cd6756ceda7da9bfc467a7e2275d2a6a8bd1a80 (diff)
parent74a050db4e556524b361a73395964272bd1bae18 (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/alnus/config.nix10
-rw-r--r--tv/1systems/mu/config.nix12
2 files changed, 10 insertions, 12 deletions
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 21583f741..66bd52ab2 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -12,7 +12,7 @@ with import <stockholm/lib>;
initrd = {
availableKernelModules = [ "ahci" ];
luks.cryptoModules = [ "aes" "sha512" "xts" ];
- luks.devices.luksroot.devices = "/dev/sda2";
+ luks.devices.luksroot.device = "/dev/sda2";
};
};
@@ -71,10 +71,10 @@ with import <stockholm/lib>;
};
desktopManager.xfce.enable = true;
- displayManager.auto = {
- enable = true;
- user = "dv";
- };
+
+ displayManager.lightdm.autoLogin.enable = true;
+ displayManager.lightdm.autoLogin.user = "dv";
+ displayManager.lightdm.enable = true;
};
users.users.dv = {
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 145c73c06..b6a25a2b8 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -108,13 +108,11 @@ with import <stockholm/lib>;
twoFingerScroll = true;
};
- services.xserver.desktopManager.plasma5 = {
- enable = true;
- };
- services.xserver.displayManager.auto = {
- enable = true;
- user = "vv";
- };
+ services.xserver.desktopManager.plasma5.enable = true;
+
+ services.xserver.displayManager.lightdm.autoLogin.enable = true;
+ services.xserver.displayManager.lightdm.autoLogin.user = "vv";
+ services.xserver.displayManager.lightdm.enable = true;
users.users.vv = {
inherit (config.krebs.users.vv) home uid;