hypr fix setup issues

hypr/.config/caelestia/monitors/DP-2/shell.json

@@ -0,0 +1,2 @@
+{
+}

hypr/.config/caelestia/monitors/DP-3/shell.json

@@ -0,0 +1,2 @@
+{
+}

hypr/.config/caelestia/shell.json

@@ -1,23 +1,36 @@
 {
-  "appearance": {
-    "transparency": {
-      "enabled": true
-    }
-  },
-  "general": {
-    "apps": {
-      "explorer": ["dolphin"],
-      "terminal": ["kitty"]
-    }
-  },
-  "launcher": {
-    "showOnHover": true,
-    "useFuzzy": {
-      "apps": true
+    "appearance": {
+        "transparency": {
+            "enabled": true
+        }
     },
-    "vimKeybinds": true
-  },
-  "paths": {
-    "wallpaperDir": "~/nextcloud/Photos/Wallpapers"
-  }
+    "background": {
+        "wallpaperEnabled": true
+    },
+    "general": {
+        "apps": {
+            "audio": [
+                "supersonic-desktop"
+            ],
+            "explorer": [
+                "dolphin"
+            ],
+            "playback": [
+                "celluloid"
+            ],
+            "terminal": [
+                "kitty"
+            ]
+        }
+    },
+    "launcher": {
+        "showOnHover": true,
+        "useFuzzy": {
+            "apps": true
+        },
+        "vimKeybinds": true
+    },
+    "paths": {
+        "wallpaperDir": "~/nextcloud/Photos/Wallpapers"
+    }
 }

hypr/.config/hypr/env.example.lua

@@ -1,4 +1,4 @@
 return {
+    -- Supported values: "noctalia" or "caelestia".
     shell = "noctalia",
-    -- shell = "cealestia"
 }

hypr/.config/hypr/hyprland-gui.lua

@@ -0,0 +1,34 @@
+-- Generated by HyprMod
+
+-- Monitors
+hl.monitor({
+    output = "desc:AOC U27G4R XZ1R7HA004323",
+    disabled = false,
+    mode = "3840x2160@160.00Hz",
+    position = "-2560x0",
+    scale = 1.5,
+    bitdepth = 10,
+    cm = "hdredid",
+    sdrbrightness = 0.29,
+    sdrsaturation = 1.19,
+    sdr_min_luminance = 0,
+    sdr_max_luminance = 773,
+    min_luminance = 0,
+    max_luminance = 773,
+    max_avg_luminance = 456,
+})
+hl.monitor({
+    output = "desc:Acer Technologies XB253Q TH5EE0058521",
+    disabled = false,
+    mode = "1920x1080@60.00Hz",
+    position = "0x0",
+    scale = 1,
+    bitdepth = 10,
+    cm = "hdredid",
+    sdrbrightness = 0.5,
+    sdr_min_luminance = 0,
+    sdr_max_luminance = 763,
+    min_luminance = 0.02,
+    max_luminance = 763,
+    max_avg_luminance = 400,
+})

hypr/.config/hypr/hyprland.lua

@@ -1,5 +1,9 @@
 
-require("env")
+local env = require("env")
+if env.shell ~= "noctalia" and env.shell ~= "caelestia" then
+    error("Unsupported shell '" .. tostring(env.shell) .. "' in ~/.config/hypr/env.lua; choose 'noctalia' or 'caelestia'")
+end
+
 hl.exec_cmd("bash ~/.config/hypr/env.sh")
 
 -- ###############
@@ -28,13 +32,11 @@ hl.config({
 -- ## MY PROGRAMS ###
 -- ##################
 
-local env = require("env")
-
 hl.on("hyprland.start", function()
-    if env.shell == "noctalia" then
-        hl.exec_cmd("noctalia &")
-    elseif env.shell == "caelestia" then
+    if env.shell == "caelestia" then
         hl.exec_cmd("caelestia shell -d")
+    else -- env.shell == "noctalia"
+        hl.exec_cmd("noctalia &")
     end
 	hl.exec_cmd("hypridle &")
 	hl.exec_cmd("sh ~/.config/hypr/scripts/portal-host-override.sh")
@@ -49,3 +51,6 @@ require("modules.windows_and_workspaces")
 
 -- HyprMod managed settings
 require("hyprland-gui")
+
+-- For Noctalia Color templates
+require("noctalia").apply_theme()

hypr/.config/hypr/modules/keybinds.lua

@@ -1,5 +1,6 @@
 local var = require("modules.variables")
 local command = require("modules.shell_commands")
+local env = require("env")
 -- See https://wiki.hypr.land/Configuring/Keywords/
 
 -- Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
@@ -232,7 +233,9 @@ hl.bind(var.mainMod .. " + K", hl.dsp.exec_cmd(command.keybinds_show), { descrip
 hl.bind(var.mainMod .. " + W", hl.dsp.exec_cmd(command.wallpaper_select), { description = "Wallpaper select" })
 
 -- Caelestia extras
-hl.bind(var.mainMod .. " + SHIFT + V", hl.dsp.exec_cmd(command.clipboard), { description = "Clipboard history" })
-hl.bind(var.mainMod .. " + period", hl.dsp.exec_cmd(command.emoji), { description = "Emoji picker" })
-hl.bind(var.mainMod .. " + SHIFT + K", hl.dsp.exec_cmd(command.show_all), { description = "Toggle utilities" })
-hl.bind("CTRL + ALT + C", hl.dsp.exec_cmd(command.clear_notifications), { description = "Clear notifications" })
+if env.shell == "caelestia" then
+    hl.bind(var.mainMod .. " + SHIFT + V", hl.dsp.exec_cmd(command.clipboard), { description = "Clipboard history" })
+    hl.bind(var.mainMod .. " + period", hl.dsp.exec_cmd(command.emoji), { description = "Emoji picker" })
+    hl.bind(var.mainMod .. " + SHIFT + K", hl.dsp.exec_cmd(command.show_all), { description = "Toggle utilities" })
+    hl.bind("CTRL + ALT + C", hl.dsp.exec_cmd(command.clear_notifications), { description = "Clear notifications" })
+end