diff --git a/configuration.nix b/configuration.nix
index ee383d0..5fa5c81 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,7 +32,7 @@ in {
   services.printing.enable = true;
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
     openFirewall = true;
   };
   services.printing.drivers = with pkgs; [
@@ -61,12 +61,6 @@ in {
     LC_TIME = "sv_SE.UTF-8";
   };
 
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "se";
-    xkbVariant = "";
-  };
-
   programs.hyprland.enable = true;
 
   # Configure console keymap
@@ -135,7 +129,6 @@ in {
     git
     gnupg
     dmenu
-    pinentry-gnome
     gnome.adwaita-icon-theme
     wtype
     cifs-utils
@@ -229,7 +222,7 @@ in {
   programs.nix-ld.enable = true;
   programs.gnupg.agent = {
     enable = true;
-    pinentryFlavor = "gnome3";
+    pinentryPackage = pkgs.pinentry-gnome3;
   };
 
   virtualisation.virtualbox.host.enable = true;
@@ -239,9 +232,11 @@ in {
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   services.xserver.xkb.layout = "se";
+  services.xserver.xkb.variant = "";
 
   fonts.packages = with pkgs; [
     (nerdfonts.override { fonts = [ "FiraCode" "RobotoMono" "JetBrainsMono" ]; })
+    comic-mono
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
diff --git a/dotfiles/hypr/hyprland.conf b/dotfiles/hypr/hyprland.conf
index 1a193d6..8f74d19 100644
--- a/dotfiles/hypr/hyprland.conf
+++ b/dotfiles/hypr/hyprland.conf
@@ -94,9 +94,9 @@ misc {
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-device:epic-mouse-v1 {
-    sensitivity = -0.5
-}
+# device:epic-mouse-v1 {
+#     sensitivity = -0.5
+# }
 
 # Example windowrule v1
 # windowrule = float, ^(kitty)$