diff --git a/nixos/layers/desktop.nix b/nixos/layers/desktop.nix
index eecb0c48f09f6619eb04fc7ecd4166d83003400c..25d38a72031e82da6ea036549d33ef5ab494ce5c 100644
--- a/nixos/layers/desktop.nix
+++ b/nixos/layers/desktop.nix
@@ -1,3 +1,4 @@
+# Basic desktop functionality (window manager, terminal emulator, browser and a few utilities)
 { pkgs, ... }:
 
 let
@@ -25,7 +26,7 @@ in
   ];
 
   environment.systemPackages = with pkgs; [
-    # desktop programs
+    # desktop environment programs
     glxinfo
     gnome3.gnome-disk-utility
     vscode
@@ -60,8 +61,6 @@ in
     users.jens = {
       packages = with pkgs; [
         chromium
-        tdesktop
-        spotify
         pavucontrol
         playerctl
         xdg_utils
diff --git a/nixos/layers/workstation.nix b/nixos/layers/workstation.nix
new file mode 100644
index 0000000000000000000000000000000000000000..38ac2148f0d3b0cfed1df6e85010b9c08f99a8b1
--- /dev/null
+++ b/nixos/layers/workstation.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./desktop.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    virtmanager
+
+    tdesktop
+    spotify
+  ];
+}
\ No newline at end of file