diff --git a/machines/stel-xps/default.nix b/machines/stel-xps/default.nix
index 0a4162e..ecd7e28 100644
--- a/machines/stel-xps/default.nix
+++ b/machines/stel-xps/default.nix
@@ -1,17 +1,27 @@
 { config, pkgs, ...}:
 {
+  imports = [
+    ../../common/users.nix
+    ./printer.nix
+    ./hardware-configuration.nix
+    ./software.nix
+  ];
 
   elss = {
+    # base system
+    base.enable = true;
+    # setup locale and font settings
+    locale.enable = true;
+    # configure zsh
+    zsh.enable = true;
+    
+    # user setup
     users = {
       enable = true;
       admins = [ "ellmau" ];
       users = [ ];
     };
   };
-  imports = [
-    ../../common/users.nix
-    ./printer.nix
-  ];
 
   variables = {
     hostName = "stel-xps";
@@ -28,7 +38,7 @@
     brightnessctl
   ];
 
-    boot.extraModulePackages = [
+  boot.extraModulePackages = [
     config.boot.kernelPackages.v4l2loopback
   ];
 
diff --git a/machines/stel-xps/software.nix b/machines/stel-xps/software.nix
new file mode 100644
index 0000000..ac507db
--- /dev/null
+++ b/machines/stel-xps/software.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, ...}:
+{
+  environment.systempackages = with pkgs; [
+    brightnessctl
+  ];
+
+  programs = {
+    java.enable = true;
+  };
+
+  services = {
+    autorandr.enable = true;
+  };
+}