diff options
| author | Vaxry <vaxry@vaxry.net> | 2026-05-07 11:44:13 +0100 |
|---|---|---|
| committer | Vaxry <vaxry@vaxry.net> | 2026-05-07 11:44:13 +0100 |
| commit | 1dc8a0db8154a6fa57890673e8d7dfc60570e91c (patch) | |
| tree | ba697e439f26d1f6a05de7b0b66ab42e9d206cd7 | |
| parent | 4fab2afced44e745d5af85184fd9c3997af2374a (diff) | |
cmake: remove dependence on hyprland.conf
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/ISSUE_GUIDELINES.md | 2 | ||||
| -rw-r--r-- | hyprctl/src/Strings.hpp | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b0c4fa6..0f1d9574 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -630,10 +630,6 @@ file(GLOB_RECURSE INSTALLABLE_ASSETS "assets/install/*") install(FILES ${INSTALLABLE_ASSETS} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hypr) -# default config -install(FILES ${CMAKE_SOURCE_DIR}/example/hyprland.conf - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hypr) - # default lua config install(FILES ${CMAKE_SOURCE_DIR}/example/hyprland.lua DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hypr) @@ -92,7 +92,7 @@ asan: cmake --build ./build --config Debug --target all @echo "Hyprland done" - ASAN_OPTIONS="detect_odr_violation=0,log_path=asan.log" HYPRLAND_NO_CRASHREPORTER=1 ./build/Hyprland -c ~/.config/hypr/hyprland.conf + ASAN_OPTIONS="detect_odr_violation=0,log_path=asan.log" HYPRLAND_NO_CRASHREPORTER=1 ./build/Hyprland -c ~/.config/hypr/hyprland.lua format-check: @find src hyprctl hyprpm start tests -type f \( -name "*.cpp" -o -name "*.hpp" -o -name "*.h" \) \ diff --git a/docs/ISSUE_GUIDELINES.md b/docs/ISSUE_GUIDELINES.md index 060b27a0..4aabc149 100644 --- a/docs/ISSUE_GUIDELINES.md +++ b/docs/ISSUE_GUIDELINES.md @@ -71,7 +71,7 @@ A debug coredump provides more information for debugging and may speed up the pr Make sure you're on latest git. Run `git pull --recurse-submodules` to sync everything. 1. [Compile Hyprland with debug mode](http://wiki.hypr.land/Contributing-and-Debugging/#build-in-debug-mode) -> Note: The config file used will be `hyprlandd.conf` instead of `hyprland.conf` +> Note: The config file used will be `hyprlandd.lua` instead of `hyprland.lua` 2. `cd ~` 3. For your own convenience, launch Hyprland from a tty with the envvar `ASAN_OPTIONS="log_path=asan.log" ~/path/to/Hyprland` diff --git a/hyprctl/src/Strings.hpp b/hyprctl/src/Strings.hpp index 779a2ee3..421c4c18 100644 --- a/hyprctl/src/Strings.hpp +++ b/hyprctl/src/Strings.hpp @@ -107,7 +107,7 @@ time_ms: Time to display notification in milliseconds color: - Notification color. Format is the same as for colors in hyprland.conf. Use + Notification color. Format is the same as for colors in hyprland.lua. Use 0 for default color for icon message: |