3 files changed, 22 insertions, 15 deletions
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;
diff --git a/common/desktop.nix b/common/desktop.nix
index 158ce0b..e570579 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -5,10 +5,6 @@
     ./common.nix
   ];
 
-  # nix.extraOptions = ''
-  #   plugin-files = ${pkgs.nix-doc}/lib/libnix_doc_plugin.so
-  # '';
-
   # Enable CUPS to print documents.
   services.printing = {
     enable = true;
@@ -50,7 +46,7 @@
   programs.slock.enable = true;
 
   environment.systemPackages = with pkgs; [
-    hikari fuzzel
+    hikari fuzzel apply-config
   ];
 
   security.pam.services.hikari-unlocker.text = ''
@@ -76,7 +72,7 @@
 
   #boot.kernelParams = [ "console=tty1" ];
 
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   programs.xwayland.enable = false;
   programs.wireshark.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
@@ -87,12 +83,23 @@
   fonts.enableDefaultPackages = true;
   fonts.packages = with pkgs; [
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     noto-fonts-cjk-serif
     noto-fonts-emoji
-  ];
+  ] ++ (with lib.attrsets;
+    builtins.filter isDerivation (attrValues pkgs.nerd-fonts));
+
+  xdg.portal.wlr.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    audio.enable = true;
+    pulse.enable = true;
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
+    # jack.enable = true;
+  };
 
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
 }
diff --git a/common/monitoring.nix b/common/monitoring.nix
index e5f111c..0ae744d 100644
--- a/common/monitoring.nix
+++ b/common/monitoring.nix
@@ -12,8 +12,8 @@
 
       set daemon 120 with start delay 60
       set mailserver
-          ping.stuebinm.eu
-          port 2525
+          mail.stuebinm.eu
+          port 25
 
       set httpd port 2812 address localhost
           allow localhost