From 5ef3eb11571d6586a5ac8e0c20fe70d959bd3b76 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sun, 20 Jun 2021 03:11:02 +0100
Subject: [PATCH] pkgs: Reformat, pkgs/kat-website: Increment rev

---
 pkgs/default.nix             | 49 +++++++++++++++++++-----------------
 pkgs/kat-website/default.nix |  4 +--
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3fe4642a..07836cb0 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -3,12 +3,12 @@
 let
   pkgs = import sources.nixpkgs { inherit config; };
   overlay = self: super:
-    rec {
+  rec {
 
-      dino =
-        super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
-          inherit (super) dino;
-        };
+    dino =
+      super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
+        inherit (super) dino;
+      };
 
       discord = super.discord.override { nss = self.nss; };
 
@@ -49,37 +49,40 @@ let
           '';
         };
 
-      linuxPackagesFor = kernel: (super.linuxPackagesFor kernel).extend (_: ksuper: {
-        zfsUnstable = ksuper.zfsUnstable.overrideAttrs (old: { meta = old.meta // { broken = false; }; });
-      });
+        linuxPackagesFor = kernel: (super.linuxPackagesFor kernel).extend (_: ksuper: {
+          zfsUnstable = ksuper.zfsUnstable.overrideAttrs (old: { meta = old.meta // { broken = false; }; });
+        });
 
-      obs-studio = super.obs-studio.override { pipewireSupport = true; };
+        obs-studio = super.obs-studio.override { pipewireSupport = true; };
 
-      libreelec-dvb-firmware = self.callPackage ./libreelec-dvb-firmware { };
+        libreelec-dvb-firmware = self.callPackage ./libreelec-dvb-firmware { };
 
-      nerdfonts = super.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; };
+        nerdfonts = super.nerdfonts.override { fonts = [ "Iosevka" ]; };
 
-      hextorgba =
-        (import ../lib/colorhelpers.nix { inherit (super) lib; }).hextorgba;
+        hextorgba = (import ../lib/colorhelpers.nix { inherit (super) lib; }).hextorgba;
 
-      konawall = super.konawall.overide { swaySupport = true; };
+        konawall = super.konawall.overide { swaySupport = true; };
 
-      kat-glauca-dns = self.callPackage ./kat-glauca-dns { };
+        imv = super.imv.override {
+          withBackends = [ "freeimage" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" "libtiff" ];
+        };
 
-      wezterm-terminfo = self.callPackage ./wezterm-terminfo { inherit (self) ncurses; };
+        kat-glauca-dns = self.callPackage ./kat-glauca-dns { };
 
-      kat-website = self.callPackage ./kat-website { };
+        wezterm-terminfo = self.callPackage ./wezterm-terminfo { inherit (self) ncurses; };
 
-      kat-weather = self.callPackage ./kat-weather { };
+        kat-website = self.callPackage ./kat-website { };
 
-      kat-gpg-status = self.callPackage ./kat-gpg-status { };
+        kat-weather = self.callPackage ./kat-weather { };
 
-      kat-tw-export = self.callPackage ./kat-tw-export { };
+        kat-gpg-status = self.callPackage ./kat-gpg-status { };
 
-      kat-scrot = self.callPackage ./kat-scrot { };
+        kat-tw-export = self.callPackage ./kat-tw-export { };
 
-    } // super.lib.optionalAttrs (builtins.pathExists ../trusted/pkgs)
+        kat-scrot = self.callPackage ./kat-scrot { };
+
+      } // super.lib.optionalAttrs (builtins.pathExists ../trusted/pkgs)
       (import ../trusted/pkgs { inherit super self; });
 
 in
-(pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend overlay
+  (pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend overlay
diff --git a/pkgs/kat-website/default.nix b/pkgs/kat-website/default.nix
index 8f6e9153..735eb46e 100644
--- a/pkgs/kat-website/default.nix
+++ b/pkgs/kat-website/default.nix
@@ -5,9 +5,9 @@ stdenv.mkDerivation rec {
   version = "0.1";
 
   src = fetchgit {
-    rev = "63dd63d6630a3cd6367ab526d2caa1029b6f2101";
+    rev = "f29a25848ef9cae2b92815816f231c84a973f83a";
     url = "https://github.com/kittywitch/website";
-    sha256 = "0igiljsfxlmmpz63naydnmbyq5kx9jvw39lk5rqdg9091ysjg01l";
+    sha256 = "1ysq5jzwrz20wghdwpsqjy5yyi879q8hkp1cv2yz6151h08w6kqy";
   };
 
   jekyll_env = bundlerEnv rec {