From d27e67743931d352e5857b605d44657668fa9013 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Tue, 4 Jun 2024 21:14:49 +0200
Subject: all: jump to nixpkgs 24.05

this does a lot of things, most of which are maintenance:
 - sources update
 - adjust newly-renamed options
 - swap some packages that were removed / renamed
 - update nomsring to newer default ghc
 - remove the deprecated lib.mdDoc from modules/*.nix
 - disable the nixpkgs mollysocket module so my own keeps evaluating
 - bundle the package definition of hikari & wlroots 0.15, which nixpkgs
   has removed as unmaintained (in fairness, they are unmaintained)
---
 common/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/common.nix')

diff --git a/common/common.nix b/common/common.nix
index 51eb334..02fec64 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -32,8 +32,8 @@
 
   # we don't actually use the x server, but the console / tty keyboard
   # settings will be derived from this
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "caps:escape";
+  services.xserver.xkb.layout = "de";
+  services.xserver.xkb.options = "caps:escape";
 
   documentation = {
     dev.enable = true;
-- 
cgit v1.2.3