diff --git a/home/path.nix b/home/path.nix
index 94cc0a9..496de18 100644
--- a/home/path.nix
+++ b/home/path.nix
@@ -9,8 +9,6 @@ pkgs: with pkgs; [
   file
   firefox
   gcc
-  gdb
-  gnumake
   gruvbox-dark-icons-gtk
   helix
   htop
diff --git a/shenvs/armasm.nix b/shenvs/c.nix
similarity index 64%
rename from shenvs/armasm.nix
rename to shenvs/c.nix
index 195f6e6..49b7942 100644
--- a/shenvs/armasm.nix
+++ b/shenvs/c.nix
@@ -1,8 +1,13 @@
 pkgs: {
   paths = with pkgs; [
+    binutils
+    gdb
+    gcc
     gcc-arm-embedded
     gnumake
+    lldb
     openocd
     qemu
+    valgrind
   ];
 }
diff --git a/shenvs/config.nix b/shenvs/config.nix
index 442dc80..0862208 100644
--- a/shenvs/config.nix
+++ b/shenvs/config.nix
@@ -1,9 +1,9 @@
 shenvs: {
   gcKeep = with shenvs; [
-    armasm
     anpi
-    jupyter
+    c
     mad
+    octave
     tcrb
   ];
 }
diff --git a/shenvs/anpi.nix b/shenvs/octave.nix
similarity index 96%
rename from shenvs/anpi.nix
rename to shenvs/octave.nix
index c3c2a6e..e442b2b 100644
--- a/shenvs/anpi.nix
+++ b/shenvs/octave.nix
@@ -10,6 +10,5 @@ pkgs: {
 	sympy
 	matplotlib
     ]))
-    ghc
   ];
 }