3 files changed, 28 insertions, 23 deletions
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index 2b7d9317..db74a1e1 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -1,28 +1,6 @@
 { pkgs, lib, ... }:
 
 let
-  greybird = pkgs.stdenv.mkDerivation {
-    name = "greybird-xfce-theme";
-
-    src = pkgs.fetchFromGitHub {
-      repo = "Greybird";
-      owner = "shimmerproject";
-      rev = "61ec18d22780aa87998381599c941e0cf4f7bfb5";
-      sha256 = "03h8hba4lfp337a4drylcplrbggry9gz8dq1f3gjy25fhqkgvq05";
-    };
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
-      mkdir -p "$out/share/themes/Greybird" \
-               "$out/share/themes/Greybird-compact/xfwm4"
-      cp -vrt "$out/share/themes/Greybird" \
-        gtk-* metacity-1 unity xfce-notify-4.0 xfwm4
-      cp -vrt "$out/share/themes/Greybird-compact/xfwm4" \
-        xfwm4_compact/*
-    '';
-  };
-
   modulesPath = "${import ../../nixpkgs-path.nix}/nixos/modules";
 
 in {
@@ -60,7 +38,7 @@ in {
     gimp
     git
     gmpc
-    greybird
+    vuizvui.greybird-xfce-theme
     inkscape
     ino
     (libreoffice.overrideDerivation (lib.const { doCheck = false; }))
diff --git a/pkgs/default.nix b/pkgs/default.nix
index a39871fb..9e1b0d6e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -11,6 +11,7 @@ let
     beehive = callPackage ./beehive { };
     blop = callPackage ./blop { };
     grandpa = callPackage ./grandpa { };
+    greybird-xfce-theme = callPackage ./greybird-xfce-theme { };
     nixops = callPackage ./nixops { };
     libCMT = callPackage ./libcmt { };
     librxtx_java = callPackage ./librxtx-java { };
diff --git a/pkgs/greybird-xfce-theme/default.nix b/pkgs/greybird-xfce-theme/default.nix
new file mode 100644
index 00000000..80b26e85
--- /dev/null
+++ b/pkgs/greybird-xfce-theme/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "greybird-xfce-theme";
+
+  src = fetchFromGitHub {
+    repo = "Greybird";
+    owner = "shimmerproject";
+    rev = "d0a50a8ea75f11d668229287e83189ef038a56f0";
+    sha256 = "08lf39qbx85ldxfh4qyj9fd42mbsg3vs2r0bg1csl6qx13lffiay";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p "$out/share/themes/Greybird"
+    cp -vrt "$out/share/themes/Greybird" \
+      gtk-* metacity-1 unity xfce-notify-4.0 xfwm4
+
+    for i in a11y compact; do
+      outdir="$out/share/themes/Greybird-$i/xfwm4"
+      mkdir -p "$outdir"
+      cp -vrt "$outdir" xfwm4-$i/*
+    done
+  '';
+}