diff --git a/hosts/desktop/i3/default.nix b/hosts/desktop/i3/default.nix
index feea8f7..550dbb4 100644
--- a/hosts/desktop/i3/default.nix
+++ b/hosts/desktop/i3/default.nix
@@ -1,10 +1,14 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   xsession.windowManager.i3.config = {
     startup = [
       {
-        command = ''i3-msg workspace 1 && (firefox &) && i3-msg "workspace 2; append_layout ${./tree.json}; open" && (for i in {1..4}; do i3-msg move left; done) && (discord &) && firefox --new-window https://youtube.com && i3-msg workspace 1'';
+        command = let layout = pkgs.substituteAll {
+          src = ./layout.sh;
+          tree = ./tree.json;
+          isExecutable = true;
+        }; in "${layout}";
         always = true;
         notification = false;
       }
diff --git a/hosts/desktop/i3/layout.sh b/hosts/desktop/i3/layout.sh
new file mode 100644
index 0000000..31173fc
--- /dev/null
+++ b/hosts/desktop/i3/layout.sh
@@ -0,0 +1,10 @@
+i3-msg workspace 1
+firefox &
+
+i3-msg "workspace 2; append_layout @tree@; open"
+for i in {1..4}; do
+    i3-msg move left
+done
+discord
+firefox --new-window https://youtube.com
+i3-msg workspace 1