Skip to content

Commit 6aeef1e

Browse files
authored
Merge branch 'dev' into remove-ad-and-allow-window-swallowing
2 parents 52868d9 + 3627b2b commit 6aeef1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+7615
-1382
lines changed

β€Ž.gitignoreβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ Scripts/pkg_black.lst
88
Scripts/pkg_user.lst
99
.zsh_history*
1010
.zcompdump*
11+
Configs/.config/uwsm/*

β€ŽCHANGELOG.mdβ€Ž

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,45 @@ All notable changes to `HyDE` will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to _Modified_ [CalVer](https://calver.org/). See [Versioning](https://github.com/HyDE-Project/HyDE/blob/master/RELEASE_POLICY.md#versioning-yymq) For more info
66

7+
## v25.8.1 (Unreleased)
8+
9+
Big CHANGE in HyDE! We are now using `uwsm` for session management and app2unit for application management.
10+
11+
**PLEASE run install.sh again to upgrade and install missing dependencies!!!**
12+
13+
### Changed
14+
15+
- Hyprlock: Sourcing hyprlock/HyDE.conf as default theme
16+
- Core: Improved theming script stack
17+
- Removed `xdg-config/hypr/hyde.conf` as it is too brittle. Use hyprland.conf instead!
18+
- Moved all core hypr stuff to `~/.local/share/hypr`
19+
20+
### Added
21+
22+
- Core: Added 'app2unit.sh' as core script. This is a wrapper for the 'app' e.g. 'hyde-shell app mediaplayer.py' this runs the script as systemd scope. Using app2unit.sh as 'uwsm app' is slower.
23+
- Core: Added 'xdg-terminal-exec' as core script. Added this in here because the upstream xdg-terminal-exec is not yet available officially.
24+
- Development: Added 'Scripts/hydevm' for development. See its README.md for more info.
25+
- Package: UWSM as dependency for HyDE.
26+
- Core: app2unit.sh and xdg-terminal-exec as as static dependencies. These tools are not widely available and are not part of the core dependencies.
27+
- The ~/.config/xdg-terminals.list file is now used to determine which terminal to use.
28+
29+
### Fixed
30+
31+
- Waybar: Some fixes for modules
32+
- Waybar: gpuinfo throws errors eg broken pipe
33+
- LibL Clean up variables that are using HYDE*, we will try to use the XDG\_* variables instead.
34+
735
## v25.7.3
836

9-
We use a dedicated Python environment to keep HyDE clean and dependency-free. Just run your scripts with `hyde-shell`β€”it handles the environment for you.
37+
We use a dedicated Python environment to keep HyDE clean and dependency-free. Just run your scripts with `hyde-shell`β€” this handles the environment for you.
1038

1139
Examples:
1240
`hyde-shell mediaplayer.py`
1341
`hyde-shell waybar`
1442

1543
### Added
1644

17-
- CHANGELOG.md to track notable changes
45+
- CHANGELOG.md to track notable changes.
1846
- Features and fixes for mediaplayer. #865
1947
- HyDE's python environment rebuild on installation
2048
- PyGObject for the python environment
@@ -25,6 +53,7 @@ Examples:
2553
- Waybar: Made mpris comparable to custom/mediaplayer. Should be noted mpris is not very customizable.
2654
- Waybar: Added generic gamemode module which detects if games are running in feral mode
2755
- Waybar: 'hyde-shell waybar --select' now will ask for **layout and style** options.
56+
- Core:Solid theming fallback
2857

2958
### Removed
3059

@@ -33,9 +62,13 @@ Examples:
3362
### Changed
3463

3564
- Launch Scripts using 'hyde-shell' instead of '$scrPath/'
65+
- Hyprland: Remove dconf setting in Hyprland config and add a separate dconf stack on color setup. This removes some hiccups on hyprctl reload.
66+
- Updated `hyq` hyprquery v0.6.3r2
67+
- Updated `hydectl`
3668

3769
### Fixed
3870

3971
- Waybar: Avoid multi user process conflict
4072
- Mediaplayer: crash when player is not playing.
4173
- Waybar: QOL fixes.
74+
- Rofi: Fallback scaling for some script to not rely with hyprland

β€ŽCONTRIBUTING.mdβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Thank you for your interest in contributing to Community Standards! We welcome a
4141
- The existing entries should be used as a style guideline.
4242
- The change log should be used to document changes from a user-perspective, instead of explaining the technical background (like commit messages) More information about HyDE's change log format can be found [here](https://keepachangelog.com/).
4343
44+
5.1. **Optional But Recommended: Test with HydeVM** - You can test your changes in a VM using [HydeVM](Scripts/hydevm/README.md) before submitting.
45+
4446
6. Push your changes to your forked repository.
4547
4648
- For example, to push your changes to your forked repository, use the following command.

β€ŽConfigs/.config/fish/conf.d/hyde.fishβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,7 @@ end
7272
if test -z "$PARALLEL_HOME"
7373
set -gx PARALLEL_HOME "$XDG_CONFIG_HOME/parallel"
7474
end
75+
76+
if test -z "$HYPRLAND_CONFIG"
77+
set -gx HYPRLAND_CONFIG "$XDG_DATA_HOME/hypr/hyprland.conf"
78+
end

β€ŽConfigs/.config/hypr/hyde.confβ€Ž

Lines changed: 0 additions & 134 deletions
This file was deleted.

β€ŽConfigs/.config/hypr/hyprland.confβ€Ž

100644100755
Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
$HYDE_HYPRLAND=set #! Do not remove - HyDE marker to prevent file overwrite
2+
3+
#* You can freely edit this file, but make sure to not remove the above line!
4+
#* All Files Below are yours to modify!
5+
16
#! Β  β–‘β–’β–’β–’β–‘β–‘β–‘β–“β–“ Β  Β  Β  Β  Β ___________
27
#! β–‘β–‘β–’β–’β–’β–‘β–‘β–‘β–‘β–‘β–“β–“ Β  Β  Β  Β //___________/
38
#! β–‘β–‘β–’β–’β–’β–‘β–‘β–‘β–‘β–‘β–“β–“ Β  Β  _ Β  _ _ Β  Β _ _____
@@ -8,17 +13,8 @@
813

914
#? Read https://hydeproject.pages.dev/en/configuring/hyprland/ for the full documentation.
1015

11-
source = $HOME/.local/share/hyde/hyprland.conf # HyDE's core configuration // DO NOT TOUCH!!! ( q β€’Μ€ α΄– ‒́ q)
16+
1217
source = ./keybindings.conf # Keyboard shortcuts
1318
source = ./windowrules.conf # Window rules
1419
source = ./monitors.conf # Monitor configuration
1520
source = ./userprefs.conf # Your hyprland configuration // Edit this file to change your Hyprland configuration
16-
source = ./workflows.conf # workflows configuration overrides everything
17-
18-
# // β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–‘β–‘β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–‘β€ƒβ€ƒβ–ˆβ–ˆβ–ˆβ•—β–‘β–‘β–ˆβ–ˆβ•—β–‘β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–‘β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β€ƒβ€ƒβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–‘β–ˆβ–ˆβ•—β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—
19-
# // β–ˆβ–ˆβ•”β•β•β–ˆβ–ˆβ•—β–ˆβ–ˆβ•”β•β•β–ˆβ–ˆβ•—β€ƒβ€ƒβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–‘β–ˆβ–ˆβ•‘β–ˆβ–ˆβ•”β•β•β–ˆβ–ˆβ•—β•šβ•β•β–ˆβ–ˆβ•”β•β•β•β€ƒβ€ƒβ–ˆβ–ˆβ•”β•β•β•β•β•β–ˆβ–ˆβ•”β•β•β–ˆβ–ˆβ•—β–ˆβ–ˆβ•‘β•šβ•β•β–ˆβ–ˆβ•”β•β•β•
20-
# // β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β€ƒβ€ƒβ–ˆβ–ˆβ•”β–ˆβ–ˆβ•—β–ˆβ–ˆβ•‘β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘β€ƒβ€ƒβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘
21-
# // β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β€ƒβ€ƒβ–ˆβ–ˆβ•‘β•šβ–ˆβ–ˆβ–ˆβ–ˆβ•‘β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘β€ƒβ€ƒβ–ˆβ–ˆβ•”β•β•β•β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–ˆβ–ˆβ•‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘
22-
# // β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•”β•β•šβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•”β•β€ƒβ€ƒβ–ˆβ–ˆβ•‘β–‘β•šβ–ˆβ–ˆβ–ˆβ•‘β•šβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•”β•β–‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘β€ƒβ€ƒβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•—β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ•”β•β–ˆβ–ˆβ•‘β–‘β–‘β–‘β–ˆβ–ˆβ•‘β–‘β–‘β–‘
23-
# // β•šβ•β•β•β•β•β•β–‘β–‘β•šβ•β•β•β•β•β–‘β€ƒβ€ƒβ•šβ•β•β–‘β–‘β•šβ•β•β•β–‘β•šβ•β•β•β•β•β–‘β–‘β–‘β–‘β•šβ•β•β–‘β–‘β–‘β€ƒβ€ƒβ•šβ•β•β•β•β•β•β•β•šβ•β•β•β•β•β•β–‘β•šβ•β•β–‘β–‘β–‘β•šβ•β•β–‘β–‘β–‘
24-

0 commit comments

Comments
Β (0)