diff --git a/home/gui/editor/zed.nix b/home/gui/editor/zed.nix
new file mode 100644
index 0000000..c76044a
--- /dev/null
+++ b/home/gui/editor/zed.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    zed-editor
+  ];
+}
diff --git a/home/gui/communication/legcord.nix b/home/tui/neovim.nix
similarity index 81%
rename from home/gui/communication/legcord.nix
rename to home/tui/neovim.nix
index 4ba3e18..a6cd6c7 100644
--- a/home/gui/communication/legcord.nix
+++ b/home/tui/neovim.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    legcord
+    neovim
   ];
 }
diff --git a/modules/system/environment.nix b/modules/system/environment.nix
index 077bc2f..831c2d3 100644
--- a/modules/system/environment.nix
+++ b/modules/system/environment.nix
@@ -48,7 +48,6 @@ in {
 
       # Editor
       nano
-      neovim
 
       # Networking tool
       iperf3
@@ -57,12 +56,6 @@ in {
       aria2
       yt-dlp
 
-      #Blog
-      go
-      pnpm
-      nodejs_20
-      tree
-
       #Android
       xxd
       file
@@ -71,15 +64,16 @@ in {
       payload-dumper-go
 
       # Misc
+      tree
       libnotify
       libvirt
       lm_sensors
 
       # Dev
+      go
       gcc
       clang
       zig
-      zed-editor
     ];
   };