diff --git a/home/gpg.nix b/home/gpg.nix
index a2b6db70..e0c4b58f 100644
--- a/home/gpg.nix
+++ b/home/gpg.nix
@@ -6,7 +6,7 @@
 
   services.gpg-agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry;
+    pinentryPackage = pkgs.pinentry-gtk2;
     enableSshSupport = true;
     sshKeys = [];
     enableExtraSocket = true;
diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix
index 48f657ce..e064da7a 100644
--- a/home/hyprland/hyprpaper.nix
+++ b/home/hyprland/hyprpaper.nix
@@ -1,20 +1,22 @@
 { conf, ... }:
 {
-  home.file.wallpaper = {
-    target = ".config/hypr/${conf.wallpaper}";
-    source = ../wallpapers/${conf.wallpaper};
+  home.file.".config/hypr/wallpaper.png" = {
+    source = ../../wallpapers/default.png;
   };
 
-  home.file.hyprpaper = let
-    file = home.file.wallpaper.target;
-  in {
-    target = ".config/hypr/hyprpaper.conf";
-    text = ''
-      preload = ${file}
+  services.hyprpaper = let
+    default = "/home/${conf.user}/.config/hypr/default.png";
+    in {
+    enable = true;
 
-      wallpaper = ,${file}
+    settings = {
+      splash = false;
 
-      splash = false
-    '';
+      preload = [ default ];
+
+      wallpaper = [
+        ",${default}"
+      ];
+    };
   };
 }
diff --git a/home/persist.nix b/home/persist.nix
index f3b18dfa..09476d41 100644
--- a/home/persist.nix
+++ b/home/persist.nix
@@ -3,13 +3,22 @@
     directories = [
       ".config/syncthing"
       ".config/sops"
+      ".config/keepassxc"
+      ".config/obsidian"
       ".gnupg"
-      ".local/share/PrismLauncher/instances"
       ".ssh"
 
+      ".thunderbird"
+
       "nixos"
       "sync"
+      "obsidian"
       "code"
+      ".keepass"
+    ] ++ lib.optionals config.gaming.enable [
+      ".local/share/PrismLauncher/instances"
+      ".local/share/PrismLauncher"
+      ".local/share/Steam"
     ];
     files = [];
   };
@@ -19,15 +28,9 @@
       ".cache/nix"
       ".cache/spotify"
       ".cargo"
-      ".config/obsidian"
-      ".config/spotify"
       ".local/state/wireplumber"
-      ".thunderbird"
       "tmp"
     ] ++ lib.optionals config.gaming.enable [
-       ".local/share/PrismLauncher"
-       ".local/share/Steam"
-       ".steam"
     ];
     files = [];
   };
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 71726846..f92316f5 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -10,7 +10,7 @@
 in {
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
     defaultKeymap = "viins";
     autocd = false;
diff --git a/wallpapers/default.png b/wallpapers/default.png
index b223bfa2..b2e9ad01 100644
Binary files a/wallpapers/default.png and b/wallpapers/default.png differ