diff --git a/flake.nix b/flake.nix
index 0551bc8..3f5efed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,11 +60,12 @@
 
           devShells = {
             aby = import ./nix/aby.nix { pkgs = pkgs; };
+            basic-cmake = import ./nix/basic-cmake.nix { pkgs = pkgs; };
+            basic-rust = import ./nix/basic-rust.nix { pkgs = pkgs; };
             empty = import ./nix/empty.nix { pkgs = pkgs; };
             spfe = import ./nix/spfe.nix { pkgs = pkgs; };
-            zig = import ./nix/zig.nix { pkgs = pkgs; };
             zig-bootstrap = import ./nix/zig-bootstrap.nix { pkgs = pkgs; };
-            rusty = import ./nix/rusty.nix { pkgs = pkgs; };
+            zig = import ./nix/zig.nix { pkgs = pkgs; };
           };
         }) // {
 
diff --git a/nix/basic-cmake.nix b/nix/basic-cmake.nix
new file mode 100644
index 0000000..742878b
--- /dev/null
+++ b/nix/basic-cmake.nix
@@ -0,0 +1,7 @@
+{ pkgs }:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    cmake
+  ];
+}
diff --git a/nix/rusty.nix b/nix/basic-rust.nix
similarity index 100%
rename from nix/rusty.nix
rename to nix/basic-rust.nix
diff --git a/nix/laplace.nix b/nix/laplace.nix
deleted file mode 100644
index f4e7352..0000000
--- a/nix/laplace.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-with pkgs;
-
-buildGoModule rec {
-  pname = "laplace";
-  version = "0.0.1";
-
-  src = fetchFromGitHub {
-    owner = "adamyordan";
-    repo = pname;
-    rev = "6d877051e28fd25f9ab85ed2cfbe31d76d857be3";
-    sha256 = "0l7w7my64yi2pig8sdxgk8049ah3n1mb2wfw858ys3gk42xqa5xh";
-  };
-
-  vendorSha256 = "022bil46fyjsd18diw0rnab987sp1ialb48rj18ksj75ghjqkr62";
-}
diff --git a/nix/river.nix b/nix/river.nix
deleted file mode 100644
index 1980b2f..0000000
--- a/nix/river.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-
-pkgs.stdenv.mkDerivation rec {
-  pname = "river";
-  version = "master";
-
-  src = ./.;
-  # src = builtins.fetchGit {
-  #   url = "https://github.com/ifreund/river";
-  #   ref = "master";
-  # };
-
-  nativeBuildInputs = with pkgs; [
-    pkg-config
-  ];
-
-  buildInputs = with pkgs; [
-    zig
-    wayland
-    wayland-protocols
-    wlroots
-    libxkbcommon
-    pixman
-    libudev
-    xorg.libX11
-    libGL
-    libevdev
-    scdoc
-  ];
-
-  buildPhase = ''
-    export HOME=$TMPDIR
-    zig build -Drelease-safe -Dxwayland -Dman-pages
-  '';
-
-  installPhase = ''
-    zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
-  '';
-}