diff --git a/flake.nix b/flake.nix
index d0ceddf2..e084fcf7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,11 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-gl = {
+      url = "github:nix-community/nixgl";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # Neovim Nightly
     neovim-nightly-overlay = {
       url = "github:nix-community/neovim-nightly-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/cnix/default.nix b/hosts/cnix/default.nix
index e3d4fa49..abcbfd2a 100644
--- a/hosts/cnix/default.nix
+++ b/hosts/cnix/default.nix
@@ -30,13 +30,7 @@ in {
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ../core
-    ../extra/steam
-    ../extra/lutris
-    ../extra/nix-ld
-    ../extra/workstation
-    ../extra/gamemode
-    ../extra/gamescope
-    ../extra/bottles
+    ../extra/cnix.nix
     ../services/cnix.nix
     ../services/pipewire.nix
     ../hardware/cnix.nix
diff --git a/hosts/core/adampad-pkgs.nix b/hosts/core/adampad-pkgs.nix
deleted file mode 100644
index cd40e61b..00000000
--- a/hosts/core/adampad-pkgs.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-{
-  environment = {
-    systemPackages = [
-      # Dev
-      pkgs.pyright
-      pkgs.python3
-      pkgs.gcc
-      pkgs.go
-      pkgs.nodePackages_latest.npm
-      pkgs.nodePackages_latest.nodejs
-      pkgs.nodePackages.prettier
-      pkgs.nodePackages.prettier-plugin-toml
-      pkgs.lua-language-server
-      pkgs.stylua
-      pkgs.prettierd
-      pkgs.cargo
-      pkgs.hyprlang
-      pkgs.nixd
-      pkgs.nil
-      pkgs.black
-      pkgs.python312Packages.jedi-language-server
-      pkgs.isort
-      pkgs.bacon
-      pkgs.clang
-      pkgs.clang-tools
-      pkgs.alejandra
-      pkgs.nixpkgs-fmt
-
-      # Util
-      pkgs.python312Packages.pip
-      pkgs.tmux
-      pkgs.tmuxifier
-    ];
-  };
-}
diff --git a/hosts/core/default.nix b/hosts/core/default.nix
index 7ab26d06..aa8ab152 100644
--- a/hosts/core/default.nix
+++ b/hosts/core/default.nix
@@ -9,7 +9,6 @@
     inputs.home-manager.nixosModules.home-manager
     ./adb.nix
     ./zsh.nix
-    ./cnix-pkgs.nix
     ./fonts.nix
     ./hyprland.nix
   ];
diff --git a/hosts/core/cnix-pkgs.nix b/hosts/extra/cnix.nix
similarity index 85%
rename from hosts/core/cnix-pkgs.nix
rename to hosts/extra/cnix.nix
index f7a3d468..dad769f0 100644
--- a/hosts/core/cnix-pkgs.nix
+++ b/hosts/extra/cnix.nix
@@ -1,4 +1,12 @@
 {pkgs, ...}: {
+  imports = [
+    ./steam
+    ./lutris
+    ./bottles
+    ./gamemode
+    ./gamescope
+    ./workstation
+  ];
   environment = {
     systemPackages = with pkgs; [
       # Dev
@@ -6,10 +14,6 @@
       python3
       hyprlang
 
-      # Util
-      tmux
-      tmuxifier
-
       # Misc
       protonup