summaryrefslogtreecommitdiff
path: root/host
diff options
context:
space:
mode:
authorAdrian Kummerlaender2024-06-28 17:03:53 +0200
committerAdrian Kummerlaender2024-06-28 17:03:53 +0200
commitbf23a0b97f0f7729605cf995b5389cff3fb9d892 (patch)
treeb4fb1ab3b5c2129aa96cb73db47cb04e2d26b917 /host
parent40beda52aa4368ab8007b0b7dfe4fc4e5a2fc46c (diff)
downloadnixos_system-bf23a0b97f0f7729605cf995b5389cff3fb9d892.tar
nixos_system-bf23a0b97f0f7729605cf995b5389cff3fb9d892.tar.gz
nixos_system-bf23a0b97f0f7729605cf995b5389cff3fb9d892.tar.bz2
nixos_system-bf23a0b97f0f7729605cf995b5389cff3fb9d892.tar.lz
nixos_system-bf23a0b97f0f7729605cf995b5389cff3fb9d892.tar.xz
nixos_system-bf23a0b97f0f7729605cf995b5389cff3fb9d892.tar.zst
nixos_system-bf23a0b97f0f7729605cf995b5389cff3fb9d892.zip
Adapt to 24.05HEADmaster
Diffstat (limited to 'host')
-rw-r--r--host/athena.nix12
-rw-r--r--host/software/desktop/default.nix18
2 files changed, 16 insertions, 14 deletions
diff --git a/host/athena.nix b/host/athena.nix
index 2c58a51..7124ebc 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -54,12 +54,12 @@
xserver = {
videoDrivers = [ "nvidia" ];
+ };
- libinput = {
- enable = true;
- touchpad = {
- accelSpeed = "2.0";
- };
+ libinput = {
+ enable = true;
+ touchpad = {
+ accelSpeed = "2.0";
};
};
@@ -70,7 +70,7 @@
avahi = {
enable = true;
- nssmdns = true;
+ nssmdns4 = true;
};
};
diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix
index da15c8f..d557f5a 100644
--- a/host/software/desktop/default.nix
+++ b/host/software/desktop/default.nix
@@ -29,14 +29,16 @@
xserver = {
enable = true;
- layout = "de";
- xkbOptions = "caps:escape";
-
- displayManager = {
- autoLogin = {
- enable = true;
- user = "common";
- };
+ xkb = {
+ options = "caps:escape";
+ layout = "de";
+ };
+ };
+
+ displayManager = {
+ autoLogin = {
+ enable = true;
+ user = "common";
};
};