diff --git a/eggs/hyprlock/.config/hypr/hyprlock.conf b/eggs/hyprlock/.config/hypr/hyprlock.conf
new file mode 100644
index 0000000..cf5afa5
--- /dev/null
+++ b/eggs/hyprlock/.config/hypr/hyprlock.conf
@@ -0,0 +1,90 @@
+# BACKGROUND
+background {
+    monitor =
+    path = ~/wallpapers/green_leaves.jpg
+    blur_passes = 3
+    blur_size = 5
+    #contrast = 0.8916
+    #brightness = 0.8172
+    #vibrancy = 0.1696
+    #vibrancy_darkness = 0.0
+}
+
+# GENERAL
+general {
+    # no_fade_in = true
+    hide_cursor = true
+    grace = 20
+    enable_fingerprint = true
+
+}
+
+# Time
+label {
+    monitor =
+    text = $TIME
+    #text = cmd[update:1000] echo "<span>$(date +"%H:%M")</span>"
+    color = rgba(255, 255, 255, 1)
+    font_size = 200
+    font_family = Alfa Slab One
+    #position = -80, 230
+    position = -00, 50
+    halign = center
+    valign = center
+    text_align = center
+}
+# Time-Hour
+#label {
+    #monitor =
+    #text = cmd[update:1000] echo "<span>$(date +"%H")</span>"
+    #color = rgba(255, 255, 255, 1)
+    #font_size = 200
+    #font_family = Alfa Slab One
+    #position = -80, 230
+    #halign = center
+    #valign = center
+#}
+
+## Time-Minute
+#label {
+    #monitor =
+    #text = cmd[update:1000] echo "<span>$(date +"%M")</span>"
+    #color = rgba(142, 192, 124, 1)
+    #font_size = 200
+    #font_family = Alfa Slab One
+    #position = 10, 70
+    #halign = center
+    #valign = center
+#}
+
+# Day-Month-Date
+label {
+    monitor =
+    text = cmd[update:1000] echo -e "$(date +"%A, %d %B")"
+    color = rgba(255, 255, 255, 1)
+    font_size = 22
+    font_family = Cascadia Code NF Bold
+    position = 0, -110
+    halign = center
+    valign = center
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 250, 60
+    outline_thickness = 0
+    outer_color = rgba(21, 21, 21, 0.95)
+    dots_size = 0.1 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 1 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    inner_color = rgba(21, 21, 21, 0.95)
+    font_color = rgba(200, 200, 200, 1)
+    fade_on_empty = false
+    placeholder_text = <span face="Cascadia Code NF" foreground="##8da3b9"> $USER</span>
+    hide_input = false
+    position = 0, -200
+    halign = center
+    valign = center
+    zindex = 10
+}
diff --git a/eggs/niri/.config/niri/config.kdl b/eggs/niri/.config/niri/config.kdl
index 53351cb..5d649c4 100644
--- a/eggs/niri/.config/niri/config.kdl
+++ b/eggs/niri/.config/niri/config.kdl
@@ -32,7 +32,7 @@ input {
 }
 
 cursor {
-    xcursor-size 32
+    xcursor-size 32 // {< rnum(if device.laptop() then 12 else 32) >}
     xcursor-theme "phinger-cursors-light"
 }
 
@@ -41,19 +41,29 @@ environment {
     // GDK_BACKEND "x11"
 }
 
-//output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
-    //mode "3440x1440@60"
-    //scale 1
-    //transform "normal"
-    //position x=0 y=0
-//}
+// {% if device.thinkix() %}
+//<yolk> output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
+    //<yolk> mode "3440x1440@60"
+    //<yolk> scale 1
+    //<yolk> transform "normal"
+    //<yolk> position x=0 y=0
+//<yolk> }
 
-output "HDMI-A-1" {
-    mode "1920x1080"
-    scale 1
-    position x=0 y=0
-    //off
-}
+//<yolk> output "HDMI-A-1" {
+    //<yolk> mode "1920x1080"
+    //<yolk> scale 1
+    //<yolk> position x=0 y=0
+    //<yolk> //off
+//<yolk> }
+
+//<yolk> output "eDP-1" {
+    //<yolk> mode "1920x1080@60"
+    //<yolk> scale 1.0
+    //<yolk> transform "normal"
+    //<yolk> position x=0 y=1440
+//<yolk> }
+
+// {% end %}
 
 //output "DP-4" {
     //mode "2560x1440"
@@ -62,12 +72,6 @@ output "HDMI-A-1" {
     //off
 //}
 
-output "eDP-1" {
-    mode "1920x1080@60"
-    scale 1.0
-    transform "normal"
-    position x=0 y=1440
-}
 
 
 layout {
@@ -83,14 +87,16 @@ layout {
 
     default-column-width { proportion 0.33333; }
     focus-ring {
-        width 2
+        width 2 // {< rnum(if device.laptop() then 1 else 2)>}
         active-color "#8ec07c"
         inactive-color "#1d2021"
     }
 
 }
 
-spawn-at-startup "bash" "-c" "swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'swaylock -f' before-sleep 'swaylock -f' timeout 3600 'systemctl suspend' timeout 60000 'systemctl hibernate'"
+
+// {# if device.laptop() #}
+//<yolk> spawn-at-startup "bash" "-c" "swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'swaylock -f' before-sleep 'swaylock -f' timeout 3600 'systemctl suspend' timeout 60000 'systemctl hibernate'"
 spawn-at-startup "bash" "-c" "eww -c ~/.config/eww-bar open-many bar_1 niri_scroller"
 spawn-at-startup "xwayland-satellite"
 spawn-at-startup "bash" "-c" "1password --silent"
diff --git a/eggs/niri/yolk_templates b/eggs/niri/yolk_templates
new file mode 100644
index 0000000..0604548
--- /dev/null
+++ b/eggs/niri/yolk_templates
@@ -0,0 +1 @@
+.config/niri/config.kdl
\ No newline at end of file
diff --git a/yolk.lua b/yolk.lua
index e64b3a5..e7f9e20 100644
--- a/yolk.lua
+++ b/yolk.lua
@@ -1,6 +1,11 @@
-function canonical_data()
-    return {}
-end
-function local_data(system)
-    return canonical_data()
-end
+data = {
+}
+
+device = {
+    thinkix = function()
+        return SYSTEM.hostname == "thinkix"
+    end,
+    laptop = function()
+        return SYSTEM.hostname == "thinkix" or SYSTEM.hostname == "frissnix"
+    end,
+}