diff --git a/nixd/include/nixd/Syntax/Nodes.h b/nixd/include/nixd/Syntax/Nodes.h
index 3aa3537ca..9c754e8f4 100644
--- a/nixd/include/nixd/Syntax/Nodes.h
+++ b/nixd/include/nixd/Syntax/Nodes.h
@@ -59,8 +59,6 @@ struct ExprOp : Node {};
 
 struct Apply : Node {};
 
-struct Select : Node {};
-
 struct Simple : Node {};
 
 struct Variable : Node {
@@ -76,7 +74,7 @@ struct StringParts : Node {};
 struct StringPartsInterpolated : Node {};
 
 struct List : Node {
-  std::vector<Select> Elems;
+  std::vector<Node *> Elems;
 };
 
 struct StringAttr : Node {};
@@ -88,6 +86,16 @@ struct Call : Node {
 
 struct AttrPath : Node {};
 
+struct Select : Node {
+  Node *Body;
+
+  AttrPath *AttrPath;
+
+  /// expr1 '.' attrpath 'or' expr2
+  /// expr2 is the default value if we cannot select
+  Node *Default;
+};
+
 struct OpHasAttr : Node {
   Node *Operand;
   AttrPath *Path;
diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
index 0df1445e1..af671545d 100644
--- a/nixd/lib/Syntax/Parser/Parser.y
+++ b/nixd/lib/Syntax/Parser/Parser.y
@@ -36,7 +36,7 @@
 }
 
 
-%type <Node> start expr expr_function expr_if expr_op expr_select
+%type <Node> start expr expr_function expr_if expr_op expr_select expr_simple
 %type <Identifier> identifier
 %type <Formals> formals
 %type <Binds> binds
@@ -176,9 +176,23 @@ expr_app
 
 
 expr_select
-  : expr_simple '.' attrpath
-  | expr_simple '.' attrpath OR_KW expr_select
-  | expr_simple OR_KW
+  : expr_simple '.' attrpath {
+    $$ = decorateNode(new Select{
+      .Body = $1,
+      .AttrPath = $3,
+      .Default = nullptr
+    }, yylloc, *Data);
+  }
+  | expr_simple '.' attrpath OR_KW expr_select {
+    $$ = decorateNode(new Select{
+      .Body = $1,
+      .AttrPath = $3,
+      .Default = $5
+    }, yylloc, *Data);
+  }
+  | expr_simple OR_KW {
+    // TODO
+  }
   | expr_simple