From af61d6420955ad2c4e8a03df0afbcfb9b8ed908d Mon Sep 17 00:00:00 2001 From: Aspen Smith Date: Sat, 3 Aug 2024 14:52:28 -0400 Subject: chore(aspen/system): Update NixOS config for renamed options Change-Id: If25502452070492a698326e9f101f9ae421e2426 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12125 Reviewed-by: aspen Autosubmit: aspen Tested-by: BuildkiteCI --- users/aspen/system/system/machines/lusca.nix | 2 +- users/aspen/system/system/machines/ogopogo.nix | 2 +- users/aspen/system/system/machines/yeren.nix | 2 +- users/aspen/system/system/modules/xserver.nix | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) (limited to 'users/aspen/system') diff --git a/users/aspen/system/system/machines/lusca.nix b/users/aspen/system/system/machines/lusca.nix index 782d504aa90b..16dabbd2ef7d 100644 --- a/users/aspen/system/system/machines/lusca.nix +++ b/users/aspen/system/system/machines/lusca.nix @@ -130,7 +130,7 @@ hardware.sensor.iio.enable = true; - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable32Bit = true; # TPM security.tpm2 = { diff --git a/users/aspen/system/system/machines/ogopogo.nix b/users/aspen/system/system/machines/ogopogo.nix index e80a0906dbf8..4196ab695db6 100644 --- a/users/aspen/system/system/machines/ogopogo.nix +++ b/users/aspen/system/system/machines/ogopogo.nix @@ -82,7 +82,7 @@ enable = true; vSync = true; }; - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable32Bit = true; services.postgresql = { enable = true; diff --git a/users/aspen/system/system/machines/yeren.nix b/users/aspen/system/system/machines/yeren.nix index 653f0cd44cd5..acab0127376d 100644 --- a/users/aspen/system/system/machines/yeren.nix +++ b/users/aspen/system/system/machines/yeren.nix @@ -118,7 +118,7 @@ lightdm-greeter.fprintAuth = true; }; - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable32Bit = true; hardware.pulseaudio.extraConfig = '' load-module module-remap-source source_name=KompleteAudio6_1 source_properties=device.description=KompleteAudio6Input1 master=alsa_input.usb-Native_Instruments_Komplete_Audio_6_458E0FFD-00.multichannel-input remix=no channels=1 master_channel_map=front-left channel_map=mono diff --git a/users/aspen/system/system/modules/xserver.nix b/users/aspen/system/system/modules/xserver.nix index f78edb207e9d..fca49ab9cca0 100644 --- a/users/aspen/system/system/modules/xserver.nix +++ b/users/aspen/system/system/modules/xserver.nix @@ -5,12 +5,11 @@ enable = true; xkb.layout = "us"; - libinput.enable = true; - - displayManager = { - defaultSession = "none+i3"; - }; windowManager.i3.enable = true; }; + + services.displayManager.defaultSession = "none+i3"; + + services.libinput.enable = true; } -- cgit 1.4.1