diff --git a/common/fish.nix b/common/fish.nix
index fc9c0ae..a758062 100644
--- a/common/fish.nix
+++ b/common/fish.nix
@@ -3,13 +3,13 @@
 
   users.defaultUserShell = pkgs.fish;
 
-  nixpkgs.overlays = [
-    (final: prev: {
-      fish = prev.fish.overrideAttrs (_: {
-        postInstall = ''
-          rm $out/share/applications/fish.desktop
-        '';
-      });
-    })
-  ];
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     fish = prev.fish.overrideAttrs (_: {
+  #       postInstall = ''
+  #         rm $out/share/applications/fish.desktop
+  #       '';
+  #     });
+  #   })
+  # ];
 }
diff --git a/hosts/desktop/flamingo/hardware.nix b/hosts/desktop/flamingo/hardware.nix
index 3e77692..bd39347 100644
--- a/hosts/desktop/flamingo/hardware.nix
+++ b/hosts/desktop/flamingo/hardware.nix
@@ -19,5 +19,5 @@
   powerManagement.cpuFreqGovernor = "powersave";
 
   console.keyMap = "de";
-  services.xserver.layout = "de";
+  services.xserver.xkb.layout = "de";
 }