13 files changed, 42 insertions, 22 deletions
diff --git a/laptop/home/mosder/.config/hypr/conf/autostart.conf b/laptop/home/mosder/.config/hypr/conf/autostart.conf
deleted file mode 100644
index 16ab2a3..0000000
--- a/laptop/home/mosder/.config/hypr/conf/autostart.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Scripts
-exec-once = $SCRIPTS_DIR/randomize-wallpaper.sh
-exec-once = $SCRIPTS_DIR/battery-notifier.sh
diff --git a/laptop/home/mosder/.config/hypr/conf/autostart.lua b/laptop/home/mosder/.config/hypr/conf/autostart.lua
new file mode 100644
index 0000000..f19a3b5
--- /dev/null
+++ b/laptop/home/mosder/.config/hypr/conf/autostart.lua
@@ -0,0 +1,7 @@
+local vars = require("conf.vars")
+
+hl.on("hyprland.start", function()
+    -- Scripts
+    hl.exec_cmd(vars.scripts_dir .. "/randomize-wallpaper.sh")
+    hl.exec_cmd(vars.scripts_dir .. "/battery-notifier.sh")
+end)
diff --git a/laptop/home/mosder/.config/hypr/conf/binds.conf b/laptop/home/mosder/.config/hypr/conf/binds.conf
deleted file mode 100644
index 29f5958..0000000
--- a/laptop/home/mosder/.config/hypr/conf/binds.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Brightness controls
-bindel = , XF86MonBrightnessUp, exec, brightnessctl set 5%+; $SCRIPTS_DIR/current-brightness.sh | xargs $OSD-client --brightness
-bindel = , XF86MonBrightnessDown, exec, brightnessctl set 5%-; $SCRIPTS_DIR/current-brightness.sh | xargs $OSD-client --brightness
diff --git a/laptop/home/mosder/.config/hypr/conf/binds.lua b/laptop/home/mosder/.config/hypr/conf/binds.lua
new file mode 100644
index 0000000..3ccdf16
--- /dev/null
+++ b/laptop/home/mosder/.config/hypr/conf/binds.lua
@@ -0,0 +1,5 @@
+local vars = require("conf.vars")
+
+-- Brightness controls
+hl.bind("XF86MonBrightnessUp",   hl.dsp.exec_cmd("brightnessctl set 5%+; " .. vars.scripts_dir .. "/current-brightness.sh | xargs " .. vars.osd .. "-client --brightness"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl set 5%-; " .. vars.scripts_dir .. "/current-brightness.sh | xargs " .. vars.osd .. "-client --brightness"), { locked = true, repeating = true })
diff --git a/laptop/home/mosder/.config/hypr/conf/categories.conf b/laptop/home/mosder/.config/hypr/conf/categories.conf
deleted file mode 100644
index 0640eb7..0000000
--- a/laptop/home/mosder/.config/hypr/conf/categories.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-decoration {
-    dim_inactive = true
-    dim_strength = .1
-}
-
-cursor:hide_on_key_press = true
-
-input:touchpad:natural_scroll = true
diff --git a/laptop/home/mosder/.config/hypr/conf/categories.lua b/laptop/home/mosder/.config/hypr/conf/categories.lua
new file mode 100644
index 0000000..0a97a9c
--- /dev/null
+++ b/laptop/home/mosder/.config/hypr/conf/categories.lua
@@ -0,0 +1,16 @@
+hl.config({
+    decoration = {
+        dim_inactive = true,
+        dim_strength = .1,
+    },
+
+    cursor = {
+        hide_on_key_press = true,
+    },
+
+    input = {
+        touchpad = {
+            natural_scroll = true,
+        },
+    },
+})
diff --git a/laptop/home/mosder/.config/hypr/conf/env.conf b/laptop/home/mosder/.config/hypr/conf/env.conf
deleted file mode 100644
index bbdb09b..0000000
--- a/laptop/home/mosder/.config/hypr/conf/env.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nvidia
-env = LIBVA_DRIVER_NAME, nvidia
-env = __GLX_VENDOR_LIBRARY_NAME, nvidia
diff --git a/laptop/home/mosder/.config/hypr/conf/env.lua b/laptop/home/mosder/.config/hypr/conf/env.lua
new file mode 100644
index 0000000..a423d5e
--- /dev/null
+++ b/laptop/home/mosder/.config/hypr/conf/env.lua
@@ -0,0 +1,3 @@
+-- Nvidia
+hl.env("LIBVA_DRIVER_NAME", "nvidia")
+hl.env("__GLX_VENDOR_LIBRARY_NAME", "nvidia")
diff --git a/laptop/home/mosder/.config/hypr/conf/monitors.conf b/laptop/home/mosder/.config/hypr/conf/monitors.conf
deleted file mode 100644
index 38d42be..0000000
--- a/laptop/home/mosder/.config/hypr/conf/monitors.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-$MAIN_MONITOR = eDP-1
-
-monitor = $MAIN_MONITOR, highres, auto, 1
-monitor = , highres, auto, 1, mirror, $MAIN_MONITOR
diff --git a/laptop/home/mosder/.config/hypr/conf/monitors.lua b/laptop/home/mosder/.config/hypr/conf/monitors.lua
new file mode 100644
index 0000000..c22d955
--- /dev/null
+++ b/laptop/home/mosder/.config/hypr/conf/monitors.lua
@@ -0,0 +1,9 @@
+local monitors = {
+    main = "eDP-1",
+}
+
+hl.monitor({ output = monitors.main, mode = "highres", position = "auto", scale = 1 })
+hl.monitor({ output = "",            mode = "highres", position = "auto", scale = 1, mirror = monitors.main })
+
+-- Returned so that conf/rules.lua can bind workspaces to these monitors
+return monitors
diff --git a/laptop/home/mosder/.config/hypr/conf/rules.conf b/laptop/home/mosder/.config/hypr/conf/rules.conf
deleted file mode 100644
index e69de29..0000000
--- a/laptop/home/mosder/.config/hypr/conf/rules.conf
+++ /dev/null
diff --git a/laptop/home/mosder/.config/hypr/conf/rules.lua b/laptop/home/mosder/.config/hypr/conf/rules.lua
new file mode 100644
index 0000000..91ee2a3
--- /dev/null
+++ b/laptop/home/mosder/.config/hypr/conf/rules.lua
@@ -0,0 +1 @@
+-- Laptop specific window/workspace rules
diff --git a/laptop/home/mosder/.config/hypr/hypridle.conf b/laptop/home/mosder/.config/hypr/hypridle.conf
index e7f36ea..2ab81f0 100644
--- a/laptop/home/mosder/.config/hypr/hypridle.conf
+++ b/laptop/home/mosder/.config/hypr/hypridle.conf
@@ -1,7 +1,7 @@
 general {
     lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
     before_sleep_cmd = loginctl lock-session    # lock before suspend.
-    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
+    after_sleep_cmd = hyprctl dispatch 'hl.dsp.dpms({ action = "on" })'  # to avoid having to press a key twice to turn on the display.
 }
 
 # after 10 min, lock