From 2a268978a773b3d9053ec28b9176c58b6d10ce30 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Wed, 14 May 2025 15:39:28 -0400 Subject: [PATCH] Moved hyprland config to its own folder and created a session file specifically for hydro-os config hyprland. --- files/system/etc/xdg/waybar/config.jsonc | 6 ----- .../{hypr => hypr-hydro-os}/hyprland.conf | 24 +++++++++---------- .../hyprland.conf.d/autostart.conf | 0 .../hyprland.conf.d/browser.conf | 0 .../hyprland.conf.d/discord_workspace.conf | 0 .../hyprland.conf.d/env_vars.conf | 0 .../hyprland.conf.d/game_workspace.conf | 0 .../hyprland.conf.d/keybinds.conf | 8 +++---- .../keybinds.conf.d/arrow_move_window.conf | 0 .../keybinds.conf.d/media_binds.conf | 0 .../keybinds.conf.d/workspace_binds.conf | 0 .../hyprland.conf.d/terminal.conf | 0 .../scripts/hypr_power/hypr_close_clients | 0 .../scripts/hypr_power/hypr_logout | 5 ++++ .../scripts/hypr_power/hypr_reboot | 5 ++++ .../scripts/hypr_power/hypr_shutdown | 5 ++++ .../scripts/load-kwallet-apps.sh | 0 .../scripts/load-kwallet.sh | 0 .../{hypr => hypr-hydro-os}/scripts/local-lua | 0 .../{hypr => hypr-hydro-os}/scripts/menu.lua | 0 .../scripts/powermenu.lua | 6 ++--- .../share/hypr/scripts/hypr_power/hypr_logout | 5 ---- .../share/hypr/scripts/hypr_power/hypr_reboot | 5 ---- .../hypr/scripts/hypr_power/hypr_shutdown | 5 ---- .../hyprland-hydro-os-uwsm.desktop | 7 ++++++ .../hyprland-hydro-os.desktop | 7 ++++++ 26 files changed, 48 insertions(+), 40 deletions(-) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf (79%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/autostart.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/browser.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/discord_workspace.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/env_vars.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/game_workspace.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/keybinds.conf (76%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/keybinds.conf.d/media_binds.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/hyprland.conf.d/terminal.conf (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/scripts/hypr_power/hypr_close_clients (100%) create mode 100755 files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_logout create mode 100755 files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_reboot create mode 100755 files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_shutdown rename files/system/usr/share/{hypr => hypr-hydro-os}/scripts/load-kwallet-apps.sh (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/scripts/load-kwallet.sh (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/scripts/local-lua (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/scripts/menu.lua (100%) rename files/system/usr/share/{hypr => hypr-hydro-os}/scripts/powermenu.lua (50%) delete mode 100755 files/system/usr/share/hypr/scripts/hypr_power/hypr_logout delete mode 100755 files/system/usr/share/hypr/scripts/hypr_power/hypr_reboot delete mode 100755 files/system/usr/share/hypr/scripts/hypr_power/hypr_shutdown create mode 100644 files/system/usr/share/wayland-sessions/hyprland-hydro-os-uwsm.desktop create mode 100644 files/system/usr/share/wayland-sessions/hyprland-hydro-os.desktop diff --git a/files/system/etc/xdg/waybar/config.jsonc b/files/system/etc/xdg/waybar/config.jsonc index 3b2b5f5..11c477e 100644 --- a/files/system/etc/xdg/waybar/config.jsonc +++ b/files/system/etc/xdg/waybar/config.jsonc @@ -9,7 +9,6 @@ "modules-left": [ "cpu", "memory", - "custom/edit-config", "hyprland/workspaces", "hyprland/window" ], @@ -87,11 +86,6 @@ "on-click-right": "swaync-client -d -sw", "escape": true }, - "custom/edit-config": { - "format": "Edit", - "on-click": "$HOME/bin/local-lua $HOME/bin/launch-edit-configs.lua", - "on-click-right": "$HOME/bin/reload-waybar" - }, "mpris": { "format": "{player_icon} {title} - {artist}", "format-paused": "{status_icon} {title} - {artist}", diff --git a/files/system/usr/share/hypr/hyprland.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf similarity index 79% rename from files/system/usr/share/hypr/hyprland.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf index 87ff80f..cc5602d 100644 --- a/files/system/usr/share/hypr/hyprland.conf +++ b/files/system/usr/share/hypr-hydro-os/hyprland.conf @@ -4,18 +4,18 @@ monitor=,preferred,auto,auto # Sources -source = /usr/share/hyprland/hyprland.conf.d/env_vars.conf -source = /usr/share/hyprland/hyprland.conf.d/game_workspace.conf -source = /usr/share/hyprland/hyprland.conf.d/discord_workspace.conf -source = /usr/share/hyprland/hyprland.conf.d/autostart.conf -source = /usr/share/hyprland/hyprland.conf.d/terminal.conf -source = /usr/share/hyprland/hyprland.conf.d/keybinds.conf -source = /usr/share/hyprland/hyprland.conf.d/browser.conf -source = /usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf -source = /usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf -source = /usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/media_binds.conf -source = /usr/share/hyprland/hyprland.conf.d/misc_apps.conf -source = /usr/share/hyprland/hyprland.conf.d/devices.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/env_vars.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/autostart.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/media_binds.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/misc_apps.conf +source = /usr/share/hypr-hydro-os/hyprland.conf.d/devices.conf # See https://wiki.hyprland.org/Configuring/Keywords/ for more diff --git a/files/system/usr/share/hypr/hyprland.conf.d/autostart.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/autostart.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/autostart.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/autostart.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/browser.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/browser.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/discord_workspace.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/discord_workspace.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/env_vars.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/env_vars.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/env_vars.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/env_vars.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/game_workspace.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/game_workspace.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf similarity index 76% rename from files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf index d610a2c..d5e1fd2 100644 --- a/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf +++ b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf @@ -1,11 +1,11 @@ # key_binds.conf # Set programs that you use -$fileManager = dolphin -$menu = rofi -show drun +$fileManager = uwsm app -- ${dolphin} +$menu = rofi -show drun -run-command "uwsm app -- {cmd}" #$menu = ags request -i launcher show -$screenshot = grim -g "$(slurp -d)" - | wl-copy -$powermenu = /usr/share/hypr/scripts/local-lua /usr/share/hypr/scripts/powermenu.lua +$screenshot = uwsm app -- ${grim -g "$(slurp -d)" - | wl-copy} +$powermenu = /usr/share/hypr-hydro-os/scripts/local-lua /usr/share/hypr-hydro-os/scripts/powermenu.lua # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER diff --git a/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/media_binds.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/media_binds.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/media_binds.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/media_binds.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf diff --git a/files/system/usr/share/hypr/hyprland.conf.d/terminal.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf similarity index 100% rename from files/system/usr/share/hypr/hyprland.conf.d/terminal.conf rename to files/system/usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf diff --git a/files/system/usr/share/hypr/scripts/hypr_power/hypr_close_clients b/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients similarity index 100% rename from files/system/usr/share/hypr/scripts/hypr_power/hypr_close_clients rename to files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients diff --git a/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_logout b/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_logout new file mode 100755 index 0000000..3c5fac5 --- /dev/null +++ b/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_logout @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients + +hyprctl dispatch exit diff --git a/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_reboot b/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_reboot new file mode 100755 index 0000000..e3add18 --- /dev/null +++ b/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_reboot @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients + +systemctl reboot diff --git a/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_shutdown b/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_shutdown new file mode 100755 index 0000000..398d517 --- /dev/null +++ b/files/system/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_shutdown @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_close_clients + +systemctl poweroff diff --git a/files/system/usr/share/hypr/scripts/load-kwallet-apps.sh b/files/system/usr/share/hypr-hydro-os/scripts/load-kwallet-apps.sh similarity index 100% rename from files/system/usr/share/hypr/scripts/load-kwallet-apps.sh rename to files/system/usr/share/hypr-hydro-os/scripts/load-kwallet-apps.sh diff --git a/files/system/usr/share/hypr/scripts/load-kwallet.sh b/files/system/usr/share/hypr-hydro-os/scripts/load-kwallet.sh similarity index 100% rename from files/system/usr/share/hypr/scripts/load-kwallet.sh rename to files/system/usr/share/hypr-hydro-os/scripts/load-kwallet.sh diff --git a/files/system/usr/share/hypr/scripts/local-lua b/files/system/usr/share/hypr-hydro-os/scripts/local-lua similarity index 100% rename from files/system/usr/share/hypr/scripts/local-lua rename to files/system/usr/share/hypr-hydro-os/scripts/local-lua diff --git a/files/system/usr/share/hypr/scripts/menu.lua b/files/system/usr/share/hypr-hydro-os/scripts/menu.lua similarity index 100% rename from files/system/usr/share/hypr/scripts/menu.lua rename to files/system/usr/share/hypr-hydro-os/scripts/menu.lua diff --git a/files/system/usr/share/hypr/scripts/powermenu.lua b/files/system/usr/share/hypr-hydro-os/scripts/powermenu.lua similarity index 50% rename from files/system/usr/share/hypr/scripts/powermenu.lua rename to files/system/usr/share/hypr-hydro-os/scripts/powermenu.lua index 3ed3e58..c5ac902 100644 --- a/files/system/usr/share/hypr/scripts/powermenu.lua +++ b/files/system/usr/share/hypr-hydro-os/scripts/powermenu.lua @@ -1,9 +1,9 @@ #!/usr/bin/env lua local menu = require("menu") local executable = { - ["Shutdown"] = "/usr/share/hyprland/scripts/hypr_power/hypr_shutdown", - ["Reboot"] = "/usr/share/hyprland/scripts/hypr_power/hypr_reboot", - ["Log out"] = "/usr/share/hyprland/scripts/hypr_power/hypr_logout", + ["Shutdown"] = "/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_shutdown", + ["Reboot"] = "/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_reboot", + ["Log out"] = "/usr/share/hypr-hydro-os/scripts/hypr_power/hypr_logout", ["Cancel"] = "", } diff --git a/files/system/usr/share/hypr/scripts/hypr_power/hypr_logout b/files/system/usr/share/hypr/scripts/hypr_power/hypr_logout deleted file mode 100755 index 7f43629..0000000 --- a/files/system/usr/share/hypr/scripts/hypr_power/hypr_logout +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -/usr/share/hypr/scripts/hypr_power/hypr_close_clients - -hyprctl dispatch exit diff --git a/files/system/usr/share/hypr/scripts/hypr_power/hypr_reboot b/files/system/usr/share/hypr/scripts/hypr_power/hypr_reboot deleted file mode 100755 index dd1cf54..0000000 --- a/files/system/usr/share/hypr/scripts/hypr_power/hypr_reboot +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -/usr/share/hypr/scripts/hypr_power/hypr_close_clients - -systemctl reboot diff --git a/files/system/usr/share/hypr/scripts/hypr_power/hypr_shutdown b/files/system/usr/share/hypr/scripts/hypr_power/hypr_shutdown deleted file mode 100755 index 8d29831..0000000 --- a/files/system/usr/share/hypr/scripts/hypr_power/hypr_shutdown +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -/usr/share/hypr/scripts/hypr_power/hypr_close_clients - -systemctl poweroff diff --git a/files/system/usr/share/wayland-sessions/hyprland-hydro-os-uwsm.desktop b/files/system/usr/share/wayland-sessions/hyprland-hydro-os-uwsm.desktop new file mode 100644 index 0000000..0894738 --- /dev/null +++ b/files/system/usr/share/wayland-sessions/hyprland-hydro-os-uwsm.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Hyprland Hydro-os +Comment=An intelligent dynamic tiling Wayland compositor, with Hydro-os configuration. +Exec=uwsm start -- hyprland-hydro-os.desktop +Type=Application +DesktopNames=Hyprland +Keywords=tiling;wayland;compositor; \ No newline at end of file diff --git a/files/system/usr/share/wayland-sessions/hyprland-hydro-os.desktop b/files/system/usr/share/wayland-sessions/hyprland-hydro-os.desktop new file mode 100644 index 0000000..c89827d --- /dev/null +++ b/files/system/usr/share/wayland-sessions/hyprland-hydro-os.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Hyprland Hydro-os +Comment=An intelligent dynamic tiling Wayland compositor, with Hydro-os configuration. +Exec=Hyprland --config /usr/share/hypr-hydro-os/hyprland.conf +Type=Application +DesktopNames=Hyprland +Keywords=tiling;wayland;compositor; \ No newline at end of file