Emitter: Make necessary changes for 24.05

base/defaults.nix

@@ -3,7 +3,7 @@
     config = lib.mkDefault {
         i18n.defaultLocale = "en_GB.UTF-8";
         console.keyMap = "us";
-        services.xserver.layout = "us-fruchti";
+        services.xserver.xkb.layout = "us-fruchti";
         services.openssh = {
             enable = true;
             settings = {

base/neovim.nix

@@ -19,7 +19,7 @@
                     changeColorScheme-vim
                     vim-dispatch
                     vimtex
-                    suda-vim
+                    vim-suda
                 ]; 
                 opt = [];
             };

base/xkb/default.nix

@@ -1,6 +1,6 @@
 { ... }:
 {
-    services.xserver.extraLayouts = {
+    services.xserver.xkb.extraLayouts = {
         de-x270 = {
             description = "DE layout with some small changes for Thinkpad X270";
             languages   = [ "deu" ];