From 6cd9427b40a4589726ee107f8daf499a3455afa9 Mon Sep 17 00:00:00 2001 From: Mathias Scheider Date: Fri, 25 Sep 2026 11:47:31 +0200 Subject: [PATCH] noctalia depend on env variable --- hypr/.config/hypr/env.lua | 4 ++ hypr/.config/hypr/hyprland.lua | 10 ++-- hypr/.config/hypr/modules/shell_commands.lua | 57 ++++++++++++++++---- 3 files changed, 54 insertions(+), 17 deletions(-) diff --git a/hypr/.config/hypr/env.lua b/hypr/.config/hypr/env.lua index e69de29..8526955 100644 --- a/hypr/.config/hypr/env.lua +++ b/hypr/.config/hypr/env.lua @@ -0,0 +1,4 @@ +return { + shell = "noctalia", + -- shell = "cealestia" +} diff --git a/hypr/.config/hypr/hyprland.lua b/hypr/.config/hypr/hyprland.lua index f721f55..abd6326 100644 --- a/hypr/.config/hypr/hyprland.lua +++ b/hypr/.config/hypr/hyprland.lua @@ -28,15 +28,13 @@ hl.config({ -- ## MY PROGRAMS ### -- ################## -hl.on("hyprland.start", function() - hl.exec_cmd("noctalia &") -end) +local env = require("env") hl.on("hyprland.start", function() + if env.shell == "noctalia" then + hl.exec_cmd("noctalia &") + end hl.exec_cmd("hypridle &") -end) - -hl.on("hyprland.start", function() hl.exec_cmd("sh ~/.config/hypr/scripts/portal-host-override.sh") hl.exec_cmd("sh ~/.config/hypr/scripts/ensure-mime-defaults.sh") end) diff --git a/hypr/.config/hypr/modules/shell_commands.lua b/hypr/.config/hypr/modules/shell_commands.lua index bc54b95..1a0ddfa 100644 --- a/hypr/.config/hypr/modules/shell_commands.lua +++ b/hypr/.config/hypr/modules/shell_commands.lua @@ -1,13 +1,48 @@ -return { - session = "noctalia msg panel-toggle session", - logout = "command -v noctalia >/dev/null 2>&1 && noctalia msg session logout || hyprctl dispatch exit", - shutdown = "noctalia msg session shutdown", - reboot = "noctalia msg session reboot", - menu = "noctalia msg panel-toggle launcher", - settings = "noctalia msg settings-toggle", - control_center = "noctalia msg panel-toggle control-center", - lock = "noctalia msg session lock", + +local env = require("env") + +local commands = { + session = "", + logout = "", + shutdown = "", + reboot = "", + menu = "", + settings = "", + control_center = "", + lock = "", screensaver = "sh ~/.config/hypr/scripts/screensaver-start.sh force", - wallpaper_select = "noctalia msg panel-toggle wallpaper", - keybinds_show = "sh ~/.config/hypr/scripts/show-keybinds.sh", + wallpaper_select = "", + keybinds_show = "", } + +if env.shell == "noctalia" then + commands.session = "noctalia msg panel-toggle session" + commands.logout = "command -v noctalia >/dev/null 2>&1 && noctalia msg session logout || hyprctl dispatch exit" + commands.shutdown = "noctalia msg session shutdown" + commands.reboot = "noctalia msg session reboot" + commands.menu = "noctalia msg panel-toggle launcher" + commands.settings = "noctalia msg settings-toggle" + commands.control_center = "noctalia msg panel-toggle control-center" + commands.lock = "noctalia msg session lock" + commands.wallpaper_select = "noctalia msg panel-toggle wallpaper" + commands.keybinds_show = "sh ~/.config/hypr/scripts/show-keybinds.sh" +end + + +return commands + + + +-- return { +-- session = "noctalia msg panel-toggle session", +-- logout = "command -v noctalia >/dev/null 2>&1 && noctalia msg session logout || hyprctl dispatch exit", +-- shutdown = "noctalia msg session shutdown", +-- reboot = "noctalia msg session reboot", +-- menu = "noctalia msg panel-toggle launcher", +-- settings = "noctalia msg settings-toggle", +-- control_center = "noctalia msg panel-toggle control-center", +-- lock = "noctalia msg session lock", +-- screensaver = "sh ~/.config/hypr/scripts/screensaver-start.sh force", +-- wallpaper_select = "noctalia msg panel-toggle wallpaper", +-- keybinds_show = "sh ~/.config/hypr/scripts/show-keybinds.sh", +-- }