diff --git a/modules/xmonad/animated.nix b/modules/xmonad/animated.nix
new file mode 100644
index 0000000..b7b7bc1
--- /dev/null
+++ b/modules/xmonad/animated.nix
@@ -0,0 +1,25 @@
+{ fetchurl }:
+{
+  "athens.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmXesxcKtbj5xSUeCtk5AHnD9twNf9HQGqTRxV8rocvKTy"; sha256 = "1jymqsyfbvj837bwhjxrarxgdq92vlvfzq7xmw1b58m2mmri460s"; };
+  "bar.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmTj8S21yqK16UHdSA7fnaABnKCi4rscMzoER1urFFBKuF"; sha256 = "0s8n0cjqipzajfrm0xa4kcrw55bjxdj7zfxn65pb7y68cdh3q4x7"; };
+  "bathroom.gif" = fetchurl { url = "https://ipfs.io/ipfs/Qmas3C1horv5jRcuAUXSATEiLZGZ2PJ1cH55ZFRRcgUmGS"; sha256 = "0qaf47s2b8p8cx0qd938hvjg1c299bnvg1k5y8rjvj0ihi6h3yjm"; };
+  "bots.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmcysizTkPkjes5JMjYnKCYzXMVVboGqJAwttoWEjiprmq"; sha256 = "1fizkl9rn1lqp9jd5vjkhpmc4zxc3hrb2g1k55ljiz5cpmrj3ihy"; };
+  "cherrytree.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmaCTfdmTmzrmtNaJhtogfFbLErc9xKaLUS5kVecSaETrV"; sha256 = "11y571lvl7pgsm244slywn5qiwl1g4kb3z8qsjh9803xs61fm7ir"; };
+  "city.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmaqXWPbyBHaixEk2f6ga5oHyuMeJ4bdRWsXuiB6LX94PX"; sha256 = "0w4hnj05igk5b8bvc2f71hlh6bsn1d20cii1xkh79j3gd94bzyfx"; };
+  "facade.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmZkEia9NZsVWKajGcSF3rJRP5pq5VJktYUV5X2x3dcEvE"; sha256 = "0vyi3c4mwd4i59h3pk1zyxx0nfv3z4751pv5vhrj8dk3aalgq0hg"; };
+  "ff9.mp4" = fetchurl { url = "https://ipfs.io/ipfs/Qmf4G9vuzjstKEqnaJnz5KaZSBQtVbkVuLPfTj2R5Vn59K"; sha256 = "0qp38bn3gq74jk637v7fc286l393mfn9brjy4s0wdfw2wgq1kna8"; };
+  "fish.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmW9gjJEJV9K4cSZ2XvsCtpyiPS6AR6qRTMLNE6piLrdpk"; sha256 = "080qq78ci2v6nfhz1902z1fj285acvidwakj3amxmm4fnn7ngkld"; };
+  "forest.webm" = fetchurl { url = "https://ipfs.io/ipfs/QmaFampuqkSkYxuaSeFkFUDdHgkic48FG5KY1d6149cqNV"; sha256 = "0bf8sv2f3j65vqkjsnlbb975960bmrfdhm5aqpr28zy9rspdjac5"; };
+  "highway.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmUmsEVrnH7QtvD4kckTypsMnN3UkKn1TABCC2cjzeVsVG"; sha256 = "0rdzk8kqxlxx747dpdwlwwf3nkxp45vzhxj4svc9xbc6j982kf65"; };
+  "kitchen.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmWJgaNqzBZS71wS19Y12X8etRbkThX8aLp9P5GMnv7dHm"; sha256 = "05dwjm1s4k3fni39sjcz10k1m0rn9iz8ax7wcxs943ykicn5mz5x"; };
+  "moonshentwitt.mp4" = fetchurl { url = "https://ipfs.io/ipfs/QmS6k6vPnA5Xiowt9C5KnTmeJyacZphU5ZdFfvm7XEvveH"; sha256 = "1wgnz4f7kiqj3jm8k0ilaw5hj03ywdp5q2959vxg3qibza1m5mph"; };
+  "otaku.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmUFTtNV7vj6Btkd9jrdfUyJPHJWSZ5Z98C2upWkj78Qhm"; sha256 = "174vqjqvba00idmbwzwcmwhgb87ryvy09n1yvnjmrs81n4nsgv08"; };
+  "rain.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmQFSNU7DpPGdmB5qpzskTHXLBHbMQr4HHc1psKmePtgbn"; sha256 = "1ib5r2xk6w79cd31929jhcvvb1wmqcj282v1mpbk17z47cnj8gx8"; };
+  "ramen.gif" = fetchurl { url = "https://ipfs.io/ipfs/Qmd8VYkEjDfTj42cq9C3hCQFWRm6cXbX1VFk6Ep1R55svx"; sha256 = "1cr0i28ivq6krfzlryb508h6754751nrqi54rrk87xsbbh9nax62"; };
+  "river.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmRXN4PTk3uSjUs5bngeMyE5QSjVo17KqofzA2dpsZtChd"; sha256 = "054777dnji9grcw3bmf9kd9l0cqdsi5ldwb2pvjn3y301ss9jvpk"; };
+  "sentinel.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmSRAASqkqGw44o1cwkB5o3KyPrHVaxipeE2LP6M3TciXo"; sha256 = "18dfx2rk47jg1w180rb7f5dr21chw8wx5zm1pjq6k486k01msz6d"; };
+  "store.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmQgBnwMpEGAWbQu12qjJaQy833eY3EKCFJkSXCySDMSpq"; sha256 = "1xpm01mnprn9amjlywgnqzhssxqqgc14cdpl616hbr2waa4g0fgq"; };
+  "street.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmbMRm9K2griy6fS6TJh8AikzjdWnhKbyZ8qswiJm8ZGYY"; sha256 = "1r67vwwqbyy9fp7hn2mrsb6v6aya7r4sbj7wwalnhl4mp0gl81zc"; };
+  "work.gif" = fetchurl { url = "https://ipfs.io/ipfs/QmTx6shEVorsmh7UoLZ5TUYanMciKHyDoYTz9kVdU2rkUK"; sha256 = "10v77gv2vk3y5r2iyn2q3vc5p3npf3whzvz2iigpng9x62f67zdj"; };
+}
+
diff --git a/modules/xmonad/default.nix b/modules/xmonad/default.nix
index 6f3f2e6..d6143e3 100644
--- a/modules/xmonad/default.nix
+++ b/modules/xmonad/default.nix
@@ -6,18 +6,7 @@ let
   cfg = config.programs.xmonad;
 
   xmonadConfig = with pkgs; callPackage ./buildXmonad.nix {inherit (pkgs.haskellPackages) xmonad-masser; } cfg.dhallConfigPath cfg.packages;
-  gifs = with pkgs; stdenv.mkDerivation {
-    name = "gifs";
-    src = fetchurl {
-      url = "https://ipfs.io/ipfs/QmQRb5Zt9QRbd6VuUuQ44wfkBaN4BYWfeH9JALpM2DU9dJ/animated.tar.gz";
-      sha256 = "14qb9y9zkmz13yl87713ib0wjcri727kgd3dwn0d6jrh94z948sq";
-    };
-    installPhase = ''
-      mkdir $out
-      ls $out
-      cp -rv *.{gif,mp4} $out/
-    '';
-  };
+  gifs = pkgs.callPackage ./gifs.nix {};
   saver_mpv = pkgs.writeScript "saver_mpv" ''
     #!${pkgs.bash}/bin/bash
     PATH=${makeBinPath [pkgs.mpv pkgs.coreutils pkgs.findutils]}:$PATH
diff --git a/modules/xmonad/gifs.nix b/modules/xmonad/gifs.nix
new file mode 100644
index 0000000..c84d7c9
--- /dev/null
+++ b/modules/xmonad/gifs.nix
@@ -0,0 +1,12 @@
+{ runCommand, fetchurl, lib }:
+
+let
+  resources = import ./animated.nix { inherit fetchurl; };
+  copy = key: value: "cp ${value} $out/${key}";
+  copyResources = with lib; concatStringsSep "\n" (mapAttrsToList copy resources);
+in
+runCommand "gifs" {} ''
+mkdir $out
+
+${copyResources}
+''