diff --git a/hosts/modules/development.nix b/hosts/modules/development.nix
index b629bdb..6ce294f 100644
--- a/hosts/modules/development.nix
+++ b/hosts/modules/development.nix
@@ -44,6 +44,7 @@
     gtest
     lcov
     vcpkg
+    gnumake
     # vcpkg-tool
     valgrind
 
diff --git a/hosts/modules/xserver.nix b/hosts/modules/xserver.nix
index 56ef769..93e299b 100644
--- a/hosts/modules/xserver.nix
+++ b/hosts/modules/xserver.nix
@@ -6,6 +6,41 @@
   pkgs,
   ...
 }: {
+  environment.systemPackages = with pkgs; [
+    dmenu
+    st
+    xss-lock
+    xdg-desktop-portal-gtk
+    xorg.xrdb
+    xorg.xrandr
+    xorg.xset
+    xorg.xsetroot
+    xorg.setxkbmap
+    xorg.xbacklight
+    xorg.libX11
+    xorg.libX11.dev
+    xorg.libxcb
+    xorg.libXft
+    xorg.libXinerama
+    xorg.xinit
+    xorg.xinput
+    brightnessctl
+    xclip
+    arandr
+    w3m
+    fontconfig
+    freetype
+    gnumake
+    nfs-utils
+    ninja
+    openssl
+    polkit_gnome
+    stdenv
+    tldr
+    dconf
+  ];
+
+
   # X Server settings
   services.xserver = {
     enable = true;