diff options
| author | Don Williams <don.e.williams@gmail.com> | 2025-11-25 23:30:17 -0500 |
|---|---|---|
| committer | Don Williams <don.e.williams@gmail.com> | 2025-11-25 23:30:17 -0500 |
| commit | 7829491f93424b237f74ed0ba3cbfcbe56294c1e (patch) | |
| tree | 65d92b593dcc82989619b20026a63ddb8a3c7f01 /config/hypr/hyprland.conf | |
| parent | e0141281bee6d15904e9d21cc1c665db1e3f34a0 (diff) | |
| parent | c575e0672a6a3f7f7e841c9b2ba6b2a97fb4c53f (diff) | |
Merge br-userconfigs: Resolve conflict - remove WindowRules-v3.conf
Diffstat (limited to 'config/hypr/hyprland.conf')
| -rw-r--r-- | config/hypr/hyprland.conf | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index f509a76d..8f07885a 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -1,5 +1,5 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # -# always refer to Hyprland wiki +# Always refer to Hyprland wiki # https://wiki.hyprland.org/ # Initial boot script enable to apply initial wallpapers, theming, new settings etc. @@ -7,25 +7,28 @@ # as long as the referrence file is present, this initial-boot.sh will not execute exec-once = $HOME/.config/hypr/initial-boot.sh -# Sourcing external config files +### Sourcing external config files ### $configs = $HOME/.config/hypr/configs # Default Configs directory path -# ## This is where you want to start tinkering $UserConfigs = $HOME/.config/hypr/UserConfigs # User Configs directory path source=$configs/Keybinds.conf # Pre-configured keybinds -# Load vendor defaults, then user additions/overrides -source= $configs/Startup_Apps.conf +# Load defaults, then user additions/overrides +source= $configs/Startup_Apps.conf source= $UserConfigs/Startup_Apps.conf -source= $UserConfigs/ENVariables.conf # Environment variables to load +source= $configs/ENVariables.conf # Environment variables (defaults) +source= $UserConfigs/ENVariables.conf # Environment variables (user) -source= $UserConfigs/Laptops.conf # For laptop related -source= $UserConfigs/LaptopDisplay.conf # Laptop display related. You need to read the comment on this file +# For laptop related +source= $UserConfigs/Laptops.conf +source= $UserConfigs/LaptopDisplay.conf -# Load vendor defaults, then user additions -source= $configs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules (defaults) -source= $UserConfigs/WindowRules.conf # Window Rules and Layer Rules user configs +# Load defaults, then user additions +source= $configs/WindowRules.conf # Window Rules and Layer Rules (defaults) +source= $UserConfigs/WindowRules.conf # Window Rules and Layer Rules (user) + +source= $configs/SystemSettings.conf # Default config for hypr source= $UserConfigs/UserDecorations.conf # Decorations config file source= $UserConfigs/UserAnimations.conf # Animation config file |