diff --git a/nixpkgs/home-manager/modules/common.nix b/nixpkgs/home-manager/modules/common.nix
index b2824b27..41b734d5 100644
--- a/nixpkgs/home-manager/modules/common.nix
+++ b/nixpkgs/home-manager/modules/common.nix
@@ -5,10 +5,33 @@
   ];
 
   home.packages = with pkgs; [
+    bottom
+    ctop
+    delta
+    file
+    fzf
+    gcc
+    gh
+    git
+    git-crypt
     just
+    tree-sitter
+    htop
+    jq
+    lua
+    neofetch
+    platformsh
+    pv
+    ripgrep
+    tldr
+    tmuxinator
+    tree
+    unzip
+    wget
 
     # LSP
     # TODO: nodePackages."@ansible/ansible-language-server"
+    html-tidy
     nodePackages."@tailwindcss/language-server"
     nodePackages.bash-language-server
     nodePackages.dockerfile-language-server-nodejs
diff --git a/nixpkgs/nixos/apollo/configuration.nix b/nixpkgs/nixos/apollo/configuration.nix
index 99b53ab0..c9c72b4f 100644
--- a/nixpkgs/nixos/apollo/configuration.nix
+++ b/nixpkgs/nixos/apollo/configuration.nix
@@ -85,51 +85,18 @@ in
     extraGroups = [ "docker" "networkmanager" "wheel" ];
     packages = with pkgs; [
       alacritty
-      ansible
-      antibody
-      bat
-      bottom
-      cargo
       chromium
       copyq
-      ctop
-      delta
       discord
-      docker
       firefox
       flameshot
-      fzf
-      gh
       gimp
-      git
-      git-crypt
       github-desktop
-      html-tidy
-      htop
-      jq
-      just
       kdenlive
-      lua
-      neofetch
-      neovim
-      platformsh
-      pv
-      ripgrep
-      shellcheck
       slack
-      stylua
-      sumneko-lua-language-server
       teams
-      tldr
-      tmux
-      tmuxinator
-      tree
-      unzip
       vlc
-      wget
-      yt-dlp
       zoom-us
-      zsh
     ];
   };