diff --git a/home-manager/vim.nix b/home-manager/vim.nix
index c6c4be93..11c271aa 100644
--- a/home-manager/vim.nix
+++ b/home-manager/vim.nix
@@ -1,6 +1,14 @@
-{ pkgs, homemade-pkgs, ... }:
+{
+  pkgs,
+  config,
+  homemade-pkgs,
+  ...
+}:
 
 {
+  # TODO: Prefer xdg.stateFile since home-manager release-24.11. See https://github.com/nix-community/home-manager/pull/5779
+  home.file."${config.xdg.stateHome}/vim/.keep".text = "Keep this directory because of home-manager and vim does not create the file if directory is missing";
+
   # https://github.com/nix-community/home-manager/blob/release-24.05/modules/programs/vim.nix
   # https://nixos.wiki/wiki/Vim
   programs.vim = {
@@ -20,6 +28,7 @@
     extraConfig = ''
       colorscheme iceberg
       set termguicolors
+      set viminfofile=${config.xdg.stateHome}/vim/viminfo
     '';
   };
 }