diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix
index 7858bea..11b7a40 100644
--- a/nixos/hosts/Tibo-NixDesk/default.nix
+++ b/nixos/hosts/Tibo-NixDesk/default.nix
@@ -75,9 +75,9 @@
 
   networking.hostName = "Tibo-NixDesk";
 
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbVariant = "altgr-intl";
+    variant = "altgr-intl";
   };
 
   system.stateVersion = "24.05";
diff --git a/nixos/modules/services/pipewire/default.nix b/nixos/modules/services/pipewire/default.nix
index 09393f0..b83eedc 100644
--- a/nixos/modules/services/pipewire/default.nix
+++ b/nixos/modules/services/pipewire/default.nix
@@ -6,8 +6,6 @@ in {
   options.sisyphus.services.pipewire.enable = lib.mkEnableOption "Pipewire";
 
   config = lib.mkIf cfg.enable {
-    sound.enable = true;
-    hardware.pulseaudio.enable = false;
     security.rtkit.enable = true;
     services.pipewire = {
       enable = true;
@@ -20,6 +18,26 @@ in {
       # use the example session manager (no others are packaged yet so this is enabled by default,
       # no need to redefine it in your config for now)
       #media-session.enable = true;
+
+      wireplumber = {
+        enable = true;
+        # Fix pops after silence
+        extraConfig."99-disable-suspend" = {
+          "monitor.alsa.rules" = [
+            {
+              matches = [
+                # Headphone jack on laptop
+                { "node.name" = "alsa_output.pci-0000_00_1f.3.analog-stereo"; }
+              ];
+              actions = {
+                update-props = {
+                  "session.suspend-timeout-seconds" = 0;
+                };
+              };
+            }
+          ];
+        };
+      };
     };
   };
 }
diff --git a/nixos/modules/services/printing/default.nix b/nixos/modules/services/printing/default.nix
index b7352b3..9b8738a 100644
--- a/nixos/modules/services/printing/default.nix
+++ b/nixos/modules/services/printing/default.nix
@@ -10,7 +10,7 @@ in {
       printing.enable = true;
       avahi = {
         enable = true;
-        nssmdns = true;
+        nssmdns4 = true;
         openFirewall = true;
       };
     };
diff --git a/nixos/modules/virtualisation/docker/default.nix b/nixos/modules/virtualisation/docker/default.nix
index 2218ff3..51b9319 100644
--- a/nixos/modules/virtualisation/docker/default.nix
+++ b/nixos/modules/virtualisation/docker/default.nix
@@ -12,6 +12,11 @@ in {
       enableOnBoot = false;
     };
 
+    # Updated version of deprecated enableNvidia.
     hardware.nvidia-container-toolkit.enable = true;
+
+    sisyphus.users.wantedGroups = [
+      "docker"
+    ];
   };
 }
diff --git a/nixos/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix
index f97415b..035bccf 100644
--- a/nixos/users/tdpeuter/default.nix
+++ b/nixos/users/tdpeuter/default.nix
@@ -36,12 +36,13 @@ in {
     };
 
     fonts.packages = with pkgs; [
-      corefonts             # Calibri for Uni
-      font-awesome          # Dependency of Vifm & zsh config
-      letter                # Personal font
-      noto-fonts-cjk        # Dependency of Zellij config
-      noto-fonts            # Dependency of Zellij config
-      vistafonts            # Microsoft fonts
+      corefonts              # Calibri for Uni
+      font-awesome           # Dependency of Vifm & zsh config
+      letter                 # Personal font
+      noto-fonts-cjk         # Dependency of Zellij config
+      noto-fonts             # Dependency of Zellij config
+      noto-fonts-color-emoji # Emoji's!
+      vistafonts             # Microsoft fonts
     ];
 
     sisyphus = {
@@ -60,20 +61,21 @@ in {
         packages = (with pkgs; [
           cmdtime               # Zsh plugin
           icosystem             # Personal icon theme
+          nextcloud-client
           spotify-adblock
         ]) ++ (with pkgs-unstable; [
           brave
           chafa                 # Terminal image viewer
           duf                   # Df alternative
+          feishin               # Jellyfin music client
           foot
           fzf
           glow                  # Terminal Markdown renderer
           jellyfin-media-player
-          kitty
-          libreoffice-fresh
-          logseq
-          mpv
-          nextcloud-client
+          libreoffice-fresh     # Office tools
+          # FIXME Waiting for electron version to update, now insecure.
+          # logseq                # Note taking
+          mpv                   # Media player
           nsxiv                 # Lightweight image viewer
           qalculate-gtk         # Calculator
           spotify
@@ -86,11 +88,13 @@ in {
           zsh-syntax-highlighting
 
           # SMB
-          cifs-utils psmisc
+          cifs-utils
+          psmisc
 
           # Linters and LSPs
           statix      # Nix
-          ruff pylint # Python
+          # TODO Move to devshells
+          # ruff pylint # Python
         ]);
 
         pointerCursor = {
diff --git a/scripts/notify.sh b/scripts/notify.sh
index a9453d5..698993e 100755
--- a/scripts/notify.sh
+++ b/scripts/notify.sh
@@ -22,15 +22,15 @@ while getopts ":bvt:p:" options; do
 			;;
 		v)
             # Get volume (don't use pamixer because that is way slower)
-            value=$( amixer sget 'Master' \
-                | grep -o '\[[0-9]*%\]' \
-                | tr -d '][%' \
-	        | head -n1 )
+            value=$( pactl get-sink-volume @DEFAULT_SINK@ \
+                | grep -o '[0-9]*%' \
+                | tr -d '%' \
+                | head -n1 )
             title="Volume: ${value}%"
             category='sysinfo'
 
             # If audio disabled, set value to zero.
-	    if [ "$( amixer sget 'Master' | grep -o '\[\(on\|off\)\]' | head -n1 )" == "[off]" ] ; then 
+            if [ "$( pactl get-sink-mute @DEFAULT_SINK@ | grep -o '\(yes\|no\)' | head -n1 )" == 'yes' ] ; then 
                 title="Volume: ${value}% (Disabled)"
                 value=0
             fi
diff --git a/stow/vim/.vimrc b/stow/vim/.vimrc
index 5995924..379ddb4 100644
--- a/stow/vim/.vimrc
+++ b/stow/vim/.vimrc
@@ -82,6 +82,9 @@ Plug 'prabirshrestha/vim-lsp'
 Plug 'sheerun/vim-polyglot'
 Plug 'vifm/vifm.vim'
 
+" Coq
+Plug 'whonore/Coqtail'
+
 call plug#end() 
 
 " }}}