diff --git a/cli/pkgs.nix b/cli/pkgs.nix
deleted file mode 100644
index 7c3a73c..0000000
--- a/cli/pkgs.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs }:
-with pkgs;
-[
-  # Base
-  tmux
-  git
-  git-lfs
-  git-crypt
-  gnutar
-  gnupg
-  htop
-  btop
-  rclone
-  rename
-  tmux
-  tree
-  wget
-  rsync
-  yq
-
-  # Rust utils
-  bat
-  eza
-  fd
-  ripgrep
-  ripgrep-all
-  zoxide
-  uutils-coreutils-noprefix
-  dust
-  yazi
-  starship
-  difftastic
-
-  # Dev
-  lazydocker
-  k9s
-  kubectl
-
-  # Editor
-  neovim
-  fzf
-  lazygit
-
-  # Fonts
-  nerd-fonts.jetbrains-mono
-]
diff --git a/common/home.nix b/common/home.nix
index 3958e3d..5bf6697 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -21,7 +21,7 @@
     tree
     wget
     rsync
-    yq
+    yq-go
     kubectl
     croc
     asciinema_3
diff --git a/home/pkgs.nix b/home/pkgs.nix
index 4525f95..75c48af 100644
--- a/home/pkgs.nix
+++ b/home/pkgs.nix
@@ -21,6 +21,8 @@ with pkgs;
 
   # Language specific
   nixfmt-rfc-style
+  nil
+  nixd
   fnm
   bun
   deno