diff options
author | lassulus <lassulus@lassul.us> | 2020-06-07 13:10:52 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2020-06-07 13:10:52 +0200 |
commit | 15f39ef2e925858eb787c6a52ccb896928b28b47 (patch) | |
tree | 2ac18efb3fe36040c71753f578529470cdb884c5 /tv/1systems | |
parent | fe119203ea4d2dc3e618d113c7f70629fd750aa3 (diff) | |
parent | 8ae780cf2689a0e62718fe0dcc8b80e584f68d23 (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r-- | tv/1systems/alnus/config.nix | 6 | ||||
-rw-r--r-- | tv/1systems/nomic/config.nix | 6 | ||||
-rw-r--r-- | tv/1systems/querel/config.nix | 8 | ||||
-rw-r--r-- | tv/1systems/wu/config.nix | 4 | ||||
-rw-r--r-- | tv/1systems/xu/config.nix | 4 | ||||
-rw-r--r-- | tv/1systems/zu/config.nix | 4 |
6 files changed, 12 insertions, 20 deletions
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index d54d5fc2..21583f74 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -11,10 +11,8 @@ with import <stockholm/lib>; boot = { initrd = { availableKernelModules = [ "ahci" ]; - luks = { - cryptoModules = [ "aes" "sha512" "xts" ]; - devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; - }; + luks.cryptoModules = [ "aes" "sha512" "xts" ]; + luks.devices.luksroot.devices = "/dev/sda2"; }; }; diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix index 86f9b7ec..38cc6236 100644 --- a/tv/1systems/nomic/config.nix +++ b/tv/1systems/nomic/config.nix @@ -17,9 +17,7 @@ with import <stockholm/lib>; boot.initrd.luks = { cryptoModules = [ "aes" "sha512" "xts" ]; - devices = [ - { name = "luks1"; device = "/dev/sda2"; } - ]; + devices.luks1.device = "/dev/sda2"; }; # Don't use UEFI because current disk was partitioned/formatted for AO753. @@ -47,6 +45,8 @@ with import <stockholm/lib>; fsType = "btrfs"; }; + environment.homeBinInPath = true; + environment.systemPackages = with pkgs; [ (writeDashBin "play" '' set -euf diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index ac51f54e..e58a9b21 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -75,10 +75,10 @@ with import <stockholm/lib>; }; services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.auto = { - enable = true; - user = "itak"; - }; + + services.xserver.displayManager.lightdm.autoLogin.enable = true; + services.xserver.displayManager.lightdm.autoLogin.user = "itak"; + services.xserver.displayManager.lightdm.enable = true; users.users.itak = { inherit (config.krebs.users.itak) home uid; diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index 4c491d65..d4114f00 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -18,9 +18,7 @@ with import <stockholm/lib>; boot.initrd.luks = { cryptoModules = [ "aes" "sha512" "xts" ]; - devices = [ - { name = "wuca"; device = "/dev/sda2"; } - ]; + devices.wuca.device = "/dev/sda2"; }; fileSystems = { diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 33f9539c..503142b9 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -113,9 +113,7 @@ with import <stockholm/lib>; boot.initrd.luks = { cryptoModules = [ "aes" "sha512" "xts" ]; - devices = [ - { name = "xuca"; device = "/dev/sda2"; } - ]; + devices.xuca.device = "/dev/sda2"; }; fileSystems = { diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index bbfcfafc..5a69601e 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -18,9 +18,7 @@ with import <stockholm/lib>; boot.initrd.luks = { cryptoModules = [ "aes" "sha512" "xts" ]; - devices = [ - { name = "zuca"; device = "/dev/sda2"; } - ]; + devices.zuca.device = "/dev/sda2"; }; fileSystems = { |