Compare commits

..
Author SHA1 Message Date
mathias2784 e499e63a49 screensaver text 2026-09-23 23:41:59 +02:00
mathias2784 df5abce062 merge main incl conflict resolution 2026-09-23 23:36:48 +02:00
mathias2784 545485f3c5 Merge branch 'main' into hypr-caelestia 2026-09-23 21:52:27 +02:00
mathias2784 519432d630 hypr: caelestia 2026-09-23 21:21:20 +02:00
12 changed files with 75 additions and 82 deletions
+3
View File
@@ -3,7 +3,10 @@ hypr/.config/hypr/env.conf
hypr/.config/hypr/env.sh
hypr/.config/hypr/monitor_setup.lua
# Noctalia template output (shell-owned, regenerated on palette change)
hypr/.config/hypr/noctalia.lua
hypr/.config/kitty/themes/noctalia.conf
# Caelestia runtime output (shell-owned, regenerated on scheme change)
hypr/.config/hypr/scheme/
*~lock.*#
lazy-lock.json
fish_variables
@@ -0,0 +1,2 @@
{
}
+23
View File
@@ -0,0 +1,23 @@
{
"appearance": {
"transparency": {
"enabled": true
}
},
"general": {
"apps": {
"explorer": ["dolphin"],
"terminal": ["kitty"]
}
},
"launcher": {
"showOnHover": true,
"useFuzzy": {
"apps": true
},
"vimKeybinds": true
},
"paths": {
"wallpaperDir": "~/nextcloud/Photos/Wallpapers"
}
}
+1 -4
View File
@@ -29,7 +29,7 @@ hl.config({
-- ##################
hl.on("hyprland.start", function()
hl.exec_cmd("noctalia &")
hl.exec_cmd("caelestia shell -d")
end)
hl.on("hyprland.start", function()
@@ -49,6 +49,3 @@ require("modules.windows_and_workspaces")
-- HyprMod managed settings
require("hyprland-gui")
-- For Noctalia Color templates
require("noctalia").apply_theme()
+6 -1
View File
@@ -4,7 +4,6 @@ local command = require("modules.shell_commands")
-- Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
hl.bind(var.mainMod .. " + RETURN", hl.dsp.exec_cmd(var.terminal), { description = "Open terminal (kitty)" })
hl.bind(var.mainMod .. " + ALT + RETURN", hl.dsp.exec_cmd(var.terminal_tmux), { description = "Open terminal (kitty)" })
hl.bind(var.mainMod .. " + Q", hl.dsp.window.close(), { description = "Close focused window" })
hl.bind(
var.mainMod .. " + ESCAPE",
@@ -230,3 +229,9 @@ hl.bind(var.mainMod .. " + L", hl.dsp.exec_cmd(command.lock), { locked = true, d
hl.bind(var.mainMod .. " + SHIFT + L", hl.dsp.exec_cmd(command.screensaver), { description = "Start screensaver (any key quits)" })
hl.bind(var.mainMod .. " + K", hl.dsp.exec_cmd(command.keybinds_show), { description = "Show keybind overview" })
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" })
+21 -10
View File
@@ -1,13 +1,24 @@
-- Caelestia shell commands. This branch is caelestia-only;
-- revert to Noctalia by switching branches.
-- Caelestia drawers (see ScreenState.qml): bar, osd, session, launcher,
-- dashboard, utilities, sidebar. Wallpaper goes through the launcher
-- (type `>wallpaper`) or `caelestia wallpaper`.
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",
session = "caelestia shell drawers toggle session",
logout = "hyprctl dispatch exit",
shutdown = "systemctl poweroff",
reboot = "systemctl reboot",
menu = "caelestia shell drawers toggle launcher",
settings = "caelestia shell drawers toggle dashboard",
control_center = "caelestia shell drawers toggle sidebar",
lock = "caelestia shell lock lock",
wallpaper_select = "caelestia shell drawers toggle launcher && sleep 0.1 && wtype \">wallpaper \"",
clipboard = "caelestia clipboard",
clipboard_delete = "caelestia clipboard -d",
emoji = "caelestia emoji -p",
show_all = "caelestia shell drawers toggle utilities",
clear_notifications = "caelestia shell notifs clear",
keybinds_show = "sh ~/.config/hypr/scripts/show-keybinds.sh",
screensaver = "sh ~/.config/hypr/scripts/screensaver-start.sh force",
}
+1 -4
View File
@@ -9,15 +9,12 @@ local theme = dofile(os.getenv("HOME") .. "/.config/themes/current/theme.lua")
-- local var_menu = "noctalia msg panel-toggle launcher"
-- local var_screenshot_folder = "~/Bilder/Screenshots/"
local terminal = "kitty"
return {
color_active_border = theme.border_active,
color_inactive_border = theme.border_inactive,
color_decoration_shadow = theme.shadow,
mainMod = "SUPER",
terminal = terminal,
terminal_tmux = terminal .. " -e tmux",
terminal = "kitty",
fileManager = "dolphin",
screenshot_folder = "~/Bilder/Screenshots/",
}
@@ -76,6 +76,16 @@ hl.layer_rule({
blur = true,
blur_popups = true,
})
hl.layer_rule({
name = "caelestia",
match = {
namespace = "^caelestia-.*$",
},
no_anim = true,
ignore_alpha = 0.5,
blur = true,
blur_popups = true,
})
hl.window_rule({
name = "noctalia-settings",
match = {
-54
View File
@@ -1,54 +0,0 @@
-- Generated by Noctalia
local primary = "rgb(cba6f7)"
local surface = "rgb(1e1e2e)"
local on_surface = "rgb(cdd6f4)"
local secondary = "rgb(fab387)"
local on_secondary = "rgb(11111b)"
local error = "rgb(f38ba8)"
local on_error = "rgb(11111b)"
local function apply_theme()
hl.config({
general = {
col = {
active_border = primary,
inactive_border = surface,
},
},
group = {
col = {
border_active = secondary,
border_inactive = surface,
border_locked_active = error,
border_locked_inactive = surface,
},
groupbar = {
col = {
active = secondary,
inactive = surface,
locked_active = error,
locked_inactive = surface,
},
text_color = on_secondary,
text_color_inactive = on_surface,
text_color_locked_active = on_error,
text_color_locked_inactive = on_surface,
},
},
})
end
return {
colors = {
primary = primary,
surface = surface,
on_surface = on_surface,
secondary = secondary,
on_secondary = on_secondary,
error = error,
on_error = on_error,
},
apply_theme = apply_theme
}
+2
View File
@@ -1,2 +1,4 @@
hyprland
// idle looks good on you
ArchTop is relaxing 🧘
+6 -2
View File
@@ -3,7 +3,8 @@
#
# Wayland compositor, screenshot tool and supporting utilities. The desktop
# shell (bar, launcher, notifications, lock screen, wallpaper, idle, session
# menu) is Noctalia, not a set of standalone ecosystem tools.
# menu) on this branch is Caelestia (see hypr/.config/hypr/hyprland.lua:
# `caelestia shell -d`). Noctalia lives on main.
#
# - Lines starting with '#' and blank lines are ignored.
# - Use "@pacman", "@aur" or "@npm" markers to switch section.
@@ -20,9 +21,12 @@ wev
wl-clipboard
hyprshot
brightnessctl
noctalia
wtype
@aur
hyprmod
caelestia-shell
caelestia-cli
quickshell-git
hyprsaver
python-terminaltexteffects
-7
View File
@@ -141,10 +141,3 @@ export HSA_OVERRIDE_GFX_VERSION=11.0.0
export HIP_VISIBLE_DEVICES=0
fish_add_path -m $HOME/.local/bin
# My shortcuts
alias fdh="fd -H"
alias fdhi="fd -HI"
alias rgh="rg --hidden"
alias rghi="rg --hidden --no-ignore"