6 files changed, 38 insertions, 35 deletions
diff --git a/default.nix b/default.nix
index 81b7ca9..10024e3 100644
--- a/default.nix
+++ b/default.nix
@@ -8,11 +8,7 @@
 
 { pkgs ? import <nixpkgs> {} }:
 
-let
-  wrapDS = pkgs.callPackage ./pkgs/larbs-scripts/displayselect/wrapper.nix { };
-  displayselect_unwrapped = pkgs.callPackage ./pkgs/larbs-scripts/displayselect/displayselect.nix { };
-in
-  {
+{
   # The `lib`, `modules`, and `overlay` names are special
   lib = import ./lib { inherit pkgs; }; # functions
   modules = import ./modules; # NixOS modules
@@ -32,10 +28,7 @@ in
   larbs-mail = pkgs.callPackage ./pkgs/larbs-mail { };
   larbs-news = pkgs.callPackage ./pkgs/larbs-news { };
   larbs-nvim = pkgs.callPackage ./pkgs/larbs-nvim { };
-
-  dmenuunicode = pkgs.callPackage ./pkgs/dmenuunicode { };
   larbs-scripts = pkgs.callPackage ./pkgs/larbs-scripts { };
-  displayselect = wrapDS displayselect_unwrapped { };
 
   #fx = (pkgs.callPackage ./pkgs/fx { }).package;
   # xcb-util = pkgs.callPackage ./pkgs/xcb-util { }; #unknown error
diff --git a/pkgs/larbs-scripts/default.nix b/pkgs/larbs-scripts/default.nix
index 6bff5cd..b4e2c8a 100644
--- a/pkgs/larbs-scripts/default.nix
+++ b/pkgs/larbs-scripts/default.nix
@@ -2,13 +2,13 @@
 with stdenv.lib;
 let
   setbg = callPackage ./setbg.nix { };
-  ds = callPackage ./displayselect { };
+  displayselect = callPackage ./displayselect.nix { };
 in
   buildEnv {
     name = "larbs-scripts";
     paths = [
       setbg
-      ds
+      displayselect
     ];
 
     meta = {
diff --git a/pkgs/larbs-scripts/displayselect.nix b/pkgs/larbs-scripts/displayselect.nix
new file mode 100644
index 0000000..54b6fe1
--- /dev/null
+++ b/pkgs/larbs-scripts/displayselect.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildEnv, callPackage, xrandr, libnotify, arandr }:
+with stdenv.lib;
+
+let
+  voidrice = callPackage ../voidrice.nix { };
+  dmenu = callPackage ../dmenu { };
+in
+  buildEnv {
+    name = "displayselect";
+
+    paths = [
+      xrandr
+      arandr
+      libnotify
+      dmenu
+    ];
+
+    postBuild = ''
+      mkdir -p $out/bin
+      cp ${voidrice}/.local/bin/displayselect $out/bin
+    '';
+
+
+    meta = {
+      description = "A fancy monitor configuration menu.";
+      homepage = "https://github.com/LukeSmithXYZ/voidrice";
+    };
+  }
diff --git a/pkgs/larbs-scripts/displayselect/default.nix b/pkgs/larbs-scripts/displayselect/default.nix
deleted file mode 100644
index f7e0c7f..0000000
--- a/pkgs/larbs-scripts/displayselect/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage }:
-let
-  wrapDS = callPackage ./wrapper.nix { };
-  ds = callPackage ./displayselect.nix { };
-in
-  wrapDS ds { }
diff --git a/pkgs/larbs-scripts/displayselect/displayselect.nix b/pkgs/larbs-scripts/displayselect/displayselect.nix
deleted file mode 100644
index e643924..0000000
--- a/pkgs/larbs-scripts/displayselect/displayselect.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, callPackage }:
-let
-  voidrice = callPackage ../../voidrice.nix { };
-in
-  stdenv.mkDerivation {
-    name = "displayselect";
-    src = voidrice;
-
-    installPhase = ''
-      mkdir -p $out/bin
-      cp ${voidrice}/.local/bin/displayselect $out/bin/displayselect
-    '';
-  }
diff --git a/pkgs/dmenuunicode/default.nix b/pkgs/larbs-scripts/dmenuunicode.nix
index 2cb6b70..29070cf 100644
--- a/pkgs/dmenuunicode/default.nix
+++ b/pkgs/larbs-scripts/dmenuunicode.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit }:
+{ stdenv, callPackage }:
+let
+  voidrice = callPackage ../voidrice.nix { };
+  dmenu = callPackage ../dmenu { };
+in
 stdenv.mkDerivation {
   name = "dmenuunicode";
 
-  src = fetchgit {
-    url = "https://github.com/LukeSmithxyz/voidrice";
-    rev = "d92bd73428f7c13ec3c3860ab8ee518c336ec458";
-    sha256 = "1gjls1x3r7i0y6f3fkzhfqfv9zc6l6b2q13zygzcggqcwc3xmanm";
-  };
+  src = voidrice;
 
   installPhase = ''
     mkdir -p $out/bin
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
     cp .local/share/larbs/emoji $out/share
 
     sed -i "s:~/.local/share/larbs/emoji:$out/share/emoji:" .local/bin/dmenuunicode
+    sed -i "s:dmenu:${dmenu}/bin/dmenu:g" .local/bin/dmenuunicode
     cp .local/bin/dmenuunicode $out/bin
   '';
 }