diff options
| author | Adrian Kummerlaender | 2020-04-22 14:22:39 +0200 |
|---|---|---|
| committer | Adrian Kummerlaender | 2020-04-22 14:22:39 +0200 |
| commit | e9da2bdac9dd61d29e85bb30bd7c953cc2a85474 (patch) | |
| tree | 6855fb38abe1eef42742c2ecf9501d919e7ecab7 /host | |
| parent | 3d1c366d72593ca171445e3da337f4c5dfa7f47d (diff) | |
| download | nixos_system-e9da2bdac9dd61d29e85bb30bd7c953cc2a85474.tar nixos_system-e9da2bdac9dd61d29e85bb30bd7c953cc2a85474.tar.gz nixos_system-e9da2bdac9dd61d29e85bb30bd7c953cc2a85474.tar.bz2 nixos_system-e9da2bdac9dd61d29e85bb30bd7c953cc2a85474.tar.lz nixos_system-e9da2bdac9dd61d29e85bb30bd7c953cc2a85474.tar.xz nixos_system-e9da2bdac9dd61d29e85bb30bd7c953cc2a85474.tar.zst nixos_system-e9da2bdac9dd61d29e85bb30bd7c953cc2a85474.zip | |
Adapt to 20.03 update
Diffstat (limited to 'host')
| -rw-r--r-- | host/obelix.nix | 15 | ||||
| -rw-r--r-- | host/software/desktop/default.nix | 10 |
2 files changed, 13 insertions, 12 deletions
diff --git a/host/obelix.nix b/host/obelix.nix index c922cea..583fbde 100644 --- a/host/obelix.nix +++ b/host/obelix.nix @@ -10,18 +10,19 @@ loader.grub = { enable = true; version = 2; - device = "/dev/sdb"; + device = "/dev/sda"; extraConfig = '' set gfxpayload=1920x1200x32 ''; }; - initrd.luks.devices = [ { - name = "root"; - device = "/dev/disk/by-uuid/6205da24-b1b2-402c-b175-4036e678dea9"; - preLVM = true; - allowDiscards = true; - } ]; + initrd.luks.devices = { + root = { + device = "/dev/disk/by-uuid/6205da24-b1b2-402c-b175-4036e678dea9"; + preLVM = true; + allowDiscards = true; + }; + }; }; networking = { diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix index 030e1b1..f18d3fa 100644 --- a/host/software/desktop/default.nix +++ b/host/software/desktop/default.nix @@ -30,13 +30,13 @@ layout = "de"; xkbOptions = "caps:escape"; - displayManager.slim = { + displayManager.lightdm = { enable = true; - autoLogin = true; - defaultUser = "common"; + autoLogin = { + enable = true; + user = "common"; + }; }; - - desktopManager.default = "none"; }; }; |