props: bump ver to 0.38.1

fixes #5333

.clang-format

@@ -0,0 +1,65 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: true
+AlignConsecutiveAssignments: true
+AlignEscapedNewlines: Right
+AlignOperands: false
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: AfterColon
+ColumnLimit: 180
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+IncludeBlocks: Preserve
+IndentCaseLabels: true
+IndentWidth: 4
+PointerAlignment: Left
+ReflowComments: false
+SortIncludes: false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Auto
+TabWidth: 4
+UseTab: Never
+
+AllowShortEnumsOnASingleLine: false
+
+BraceWrapping:
+  AfterEnum: false
+
+AlignConsecutiveDeclarations: AcrossEmptyLines
+
+NamespaceIndentation: All

.clang-format-ignore

@@ -0,0 +1 @@
+subprojects/**/*

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: vaxry

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,67 @@
+name: Bug Report
+description: Something is not working right
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before opening a new issue, take a moment to search through the current open ones.
+
+        ---
+
+  - type: textarea
+    id: ver
+    attributes:
+      label: Hyprland Version
+      description: "Paste the output of `hyprctl systeminfo` here."
+      value: "<details>
+        <summary>System/Version info</summary>
+
+
+        ```sh
+        
+        <Paste the output of the command here>
+
+        ```
+
+
+        </details>"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: type
+    attributes:
+      label: Bug or Regression?
+      description: Is this a bug or a regression?
+      options:
+        - Bug
+        - Regression
+    validations:
+      required: true
+
+  - type: textarea
+    id: desc
+    attributes:
+      label: Description
+      description: "What went wrong?"
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: How to reproduce
+      description: "How can someone else reproduce the issue?"
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Crash reports, logs, images, videos
+      description: |
+        Anything that can help. Please always ATTACH and not paste them.
+        Logs can be found in /tmp/hypr
+        Crash reports are stored in ~/.cache/hyprland or $XDG_CACHE_HOME/hyprland
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,15 +0,0 @@
----
-name: Bug report
-about: Found a bug? Report it here!
-title: ''
-labels: bug
-
----
-
-**Describe the bug**
-
-
-**Images/videos/anything that would help**
-
-
-Please attach a log (it's in /tmp/hypr/hyprland.log) and, if crashing, a crashdump (coredumpctl, then coredumpctl info <pid>)

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,19 @@
+name: Feature Request
+description: I'd like to request additional functionality
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before opening a new issue, take a moment to search through the current open ones.
+
+        ---
+
+  - type: textarea
+    id: desc
+    attributes:
+      label: Description
+      description: "Describe your idea"
+    validations:
+      required: true
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +0,0 @@
----
-name: Feature request
-about: Suggest a feature/change/idea
-title: ''
-labels: enhancement
-
----
-
-**Describe in detail your idea.**

.github/actions/setup_base/action.yml

@@ -0,0 +1,88 @@
+name: "Setup base"
+
+inputs:
+  INSTALL_XORG_PKGS:
+    description: 'Install xorg dependencies'
+    required: false
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get required pacman pkgs
+      shell: bash
+      run: |
+        sed -i -e "1i [extra-testing]\nInclude = /etc/pacman.d/mirrorlist" "/etc/pacman.conf"
+        sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
+        pacman --noconfirm --noprogressbar -Syyu
+        pacman --noconfirm --noprogressbar -Sy \
+          base-devel \
+          cairo \
+          clang \
+          cmake \
+          git \
+          glm \
+          glslang \
+          go \
+          hyprlang \
+          jq \
+          libc++ \
+          libdisplay-info \
+          libdrm \
+          libepoxy \
+          libfontenc \
+          libglvnd \
+          libinput \
+          libliftoff \
+          libxcvt \
+          libxfont2 \
+          libxkbcommon \
+          libxkbfile \
+          lld \
+          meson \
+          ninja \
+          pango \
+          pixman \
+          pkgconf \
+          scdoc \
+          seatd \
+          systemd \
+          tomlplusplus \
+          wayland \
+          wayland-protocols \
+          xcb-util-errors \
+          xcb-util-renderutil \
+          xcb-util-wm \
+          libzip \
+          librsvg
+
+    - name: Get hyprcursor-git
+      shell: bash
+      run: |
+        git clone https://github.com/hyprwm/hyprcursor --recursive
+        cd hyprcursor
+        cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+        cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+        cmake --install build
+
+    - name: Get Xorg pacman pkgs
+      shell: bash
+      if: inputs.INSTALL_XORG_PKGS == 'true'
+      run: |
+        pacman --noconfirm --noprogressbar -Sy \
+          xorg-fonts-encodings \
+          xorg-server-common \
+          xorg-setxkbmap \
+          xorg-xkbcomp \
+          xorg-xwayland
+
+    - name: Checkout Hyprland
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    # Fix an issue with actions/checkout where the checkout repo is not mark as safe
+    - name: Mark directory as safe for git
+      shell: bash
+      run: |
+        git config --global --add safe.directory /__w/Hyprland/Hyprland

.github/pull_request_template.md

@@ -1,9 +1,9 @@
-Describe your PR, what does it fix/add?
+#### Describe your PR, what does it fix/add?
 
 
-Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
+#### Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
 
 
-Is it ready for merging, or does it need work?
+#### Is it ready for merging, or does it need work?
 
 

.github/workflows/ci.yaml

@@ -8,34 +8,98 @@ jobs:
     container:
       image: archlinux
     steps:
-      - name: Get required pacman pkgs
-        run: |
-           sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
-           pacman --noconfirm --noprogressbar -Syyu
-           pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git cmake go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/actions
 
-      - name: Set up user
-        run: |
-          useradd -m githubuser
-          echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+        with:
+          INSTALL_XORG_PKGS: true
 
-      - name: Build wlroots
+      - name: Build Hyprland
         run: |
-          su githubuser -c "cd ~ && git clone https://gitlab.freedesktop.org/wlroots/wlroots" 
-          su githubuser -c "cd ~/wlroots && meson build/ --prefix=/usr && ninja -C build/ && sudo ninja -C build/ install && cd .."
-
-      - name: Fix permissions for git
-        run: |
-          git config --global --add safe.directory /__w/Hyprland/Hyprland
-
-      - name: Checkout Hyprland
-        uses: actions/checkout@v3
-
-      - name: Build Hyprland With default settings
-        run: |
-          git submodule sync --recursive && git submodule update --init --force --recursive
           make all
 
-      - name: Build Hyprland with LEGACY_RENDERER
+      - name: Compress and package artifacts
         run: |
-          make legacyrenderer
+          mkdir x86_64-pc-linux-gnu
+          mkdir hyprland
+          mkdir hyprland/example
+          mkdir hyprland/assets
+          cp ./LICENSE hyprland/
+          cp build/Hyprland hyprland/
+          cp build/hyprctl/hyprctl hyprland/
+          cp build/hyprpm/hyprpm hyprland/
+          cp subprojects/wlroots/build/libwlroots.so.13032 hyprland/
+          cp build/Hyprland hyprland/
+          cp -r example/ hyprland/
+          cp -r assets/ hyprland/
+          tar -cvf Hyprland.tar.xz hyprland
+
+      - name: Release
+        uses: actions/upload-artifact@v3
+        with:
+          name: Build archive
+          path: Hyprland.tar.xz
+
+  meson:
+    name: "Build Hyprland with Meson (Arch)"
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux
+    steps:
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/actions
+
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+
+      - name: Configure
+        run: meson setup build -Ddefault_library=static
+
+      - name: Compile
+        run: ninja -C build
+
+  noxwayland:
+    name: "Build Hyprland in pure Wayland (Arch)"
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux
+    steps:
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/actions
+
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+
+      - name: Configure
+        run: mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DNO_XWAYLAND:STRING=true -H./ -B./build -G Ninja
+
+      - name: Compile
+        run: make release
+
+  clang-format:
+    name: "Code Style (Arch)"
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux
+    steps:
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/actions
+
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+
+      - name: Configure
+        run: meson setup build -Ddefault_library=static
+
+      - name: clang-format check
+        run: ninja -C build clang-format-check

.github/workflows/man-update.yaml

@@ -0,0 +1,30 @@
+name: Build man pages
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - docs/**
+    branches:
+      - 'main'
+
+jobs:
+  main:
+    name: Build man pages
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install deps
+      run: sudo apt install pandoc
+
+    - name: Clone repository
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.PAT }}
+
+    - name: Build man pages
+      run: make man
+
+    - uses: stefanzweifel/git-auto-commit-action@v4
+      name: Commit
+      with:
+        commit_message: "[gha] build man pages"

.github/workflows/nix-build.yaml

@@ -1,19 +0,0 @@
-name: Build Hyprland (Nix)
-
-on: [push, pull_request, workflow_dispatch]
-jobs:
-  nix:
-    name: "Build Hyprland (Nix)"
-    runs-on: ubuntu-latest
-    steps:
-    - name: Clone repository
-      uses: actions/checkout@v3
-    - name: Install nix
-      uses: cachix/install-nix-action@v17
-      with:
-        install_url: https://releases.nixos.org/nix/nix-2.8.0/install
-        extra_nix_config: |
-          auto-optimise-store = true
-          experimental-features = nix-command flakes
-    - name: Build HyprLand with default settings
-      run: nix build --print-build-logs

.github/workflows/nix-build.yml

@@ -0,0 +1,29 @@
+on:
+  workflow_call:
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: false
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        package:
+          - hyprland
+          - xdg-desktop-portal-hyprland
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: cachix/install-nix-action@v25
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: cachix/cachix-action@v12
+        with:
+          name: hyprland
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+
+      - run: nix build .#${{ matrix.package }} -L

.github/workflows/nix-ci.yml

@@ -0,0 +1,15 @@
+name: Nix
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  wlroots:
+    if: github.event_name != 'pull_request'
+    uses: ./.github/workflows/nix-update-wlroots.yml
+    secrets: inherit
+
+  build:
+    if: always() && !cancelled() && !contains(needs.*.result, 'failure')
+    needs: wlroots
+    uses: ./.github/workflows/nix-build.yml
+    secrets: inherit

.github/workflows/nix-update-inputs.yml

@@ -0,0 +1,29 @@
+name: Nix
+
+on:
+  schedule:
+    - cron: '0 0 * * *' # check daily
+
+jobs:
+  update:
+    name: inputs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.PAT }}
+
+      - uses: DeterminateSystems/nix-installer-action@main
+      - name: Update inputs
+        run: nix/update-inputs.sh
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "[gha] Nix: update inputs"
+
+  update-build:
+    needs: update
+    uses: ./.github/workflows/nix-build.yml
+    secrets: inherit

.github/workflows/nix-update-wlroots.yml

@@ -0,0 +1,26 @@
+name: Nix
+
+on:
+  workflow_call:
+    secrets:
+      PAT:
+        required: true
+
+jobs:
+  update:
+    name: wlroots
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.PAT }}
+
+    - uses: DeterminateSystems/nix-installer-action@main
+    - name: Update lockfile
+      run: nix/update-wlroots.sh
+
+    - name: Commit
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: "[gha] Nix: update wlroots"

.github/workflows/nix-update.yaml

@@ -1,25 +0,0 @@
-name: "Nix: update lockfile"
-
-on:
-  schedule:
-    - cron: '0 0 */14 * *'
-  workflow_dispatch:
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Clone repository
-      uses: actions/checkout@v3
-    - name: Install nix
-      uses: cachix/install-nix-action@v17
-      with:
-        install_url: https://releases.nixos.org/nix/nix-2.8.0/install
-        extra_nix_config: |
-          auto-optimise-store = true
-          experimental-features = nix-command flakes
-    - name: Update lockfile
-      run: nix flake update
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        commit_message: "[gha] bump flake inputs"

.github/workflows/release.yaml

@@ -0,0 +1,45 @@
+name: Release artifacts
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  source-tarball:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Hyprland
+        id: checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Generate version
+        id: genversion
+        run: |
+          bash -c scripts/generateVersion.sh
+          mv scripts/generateVersion.sh scripts/generateVersion.sh.bak
+
+      - name: Create tarball with submodules
+        id: tar
+        run: |
+          mkdir hyprland-source; mv ./* ./hyprland-source || tar -czv --owner=0 --group=0 --no-same-owner --no-same-permissions -f source.tar.gz *
+
+      - id: whatrelease
+        name: Get latest release
+        uses: pozetroninc/github-action-get-latest-release@master
+        with:
+          owner: hyprwm
+          repo: Hyprland
+          excludes: prerelease, draft
+
+      - name: Upload to release
+        id: upload
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: source.tar.gz
+          asset_name: source-${{ steps.whatrelease.outputs.release }}.tar.gz
+          tag: ${{ steps.whatrelease.outputs.release }}
+          overwrite: true

.github/workflows/security-checks.yml

@@ -1,10 +1,6 @@
-name: Flawfinder
+name: Security Checks
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+on: [push, pull_request]
 
 jobs:
   flawfinder:

.github/workflows/stale.yml

@@ -0,0 +1,28 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '7 */4 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.STALEBOT_PAT }}
+        stale-issue-label: 'stale'
+        stale-pr-label: 'stale'
+        operations-per-run: 40
+        days-before-close: -1

.gitignore

@@ -10,16 +10,26 @@ CTestTestfile.cmake
 _deps
 
 build/
-result
+result*
 /.vscode/
+/.idea/
+.envrc
+.cache
 
 *.o
 *-protocol.c
 *-protocol.h
 .ccls-cache
+*.so
 
 hyprctl/hyprctl
 
 gmon.out
 *.out
 *.tar.gz
+
+PKGBUILD
+
+src/version.h
+
+.direnv

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "wlroots"]
+	path = subprojects/wlroots
+	url = https://gitlab.freedesktop.org/wlroots/wlroots.git
+[submodule "subprojects/hyprland-protocols"]
+	path = subprojects/hyprland-protocols
+	url = https://github.com/hyprwm/hyprland-protocols
+[submodule "subprojects/udis86"]
+	path = subprojects/udis86
+	url = https://github.com/canihavesomecoffee/udis86
+[submodule "subprojects/tracy"]
+	path = subprojects/tracy
+	url = https://github.com/wolfpld/tracy

CMakeLists.txt

@@ -1,94 +1,250 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.19)
+include(CheckIncludeFile)
+
+# Get version
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/props.json PROPS)
+string(JSON VER GET ${PROPS} version)
+
 project(Hyprland
     DESCRIPTION "A Modern C++ Wayland Compositor"
+    VERSION ${VER}
 )
 
+set(HYPRLAND_VERSION ${VER})
+set(PREFIX ${CMAKE_INSTALL_PREFIX})
+configure_file(hyprland.pc.in hyprland.pc @ONLY) 
+
 set(CMAKE_MESSAGE_LOG_LEVEL "STATUS")
 
-message(STATUS "Configuring Hyprland!")
+message(STATUS "Gathering git info")
 
 # Get git info
 # hash and branch
 execute_process(
-    COMMAND git rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
-    COMMAND git rev-parse HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_COMMIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
-    COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1"
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_COMMIT_MESSAGE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
-    COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\""
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_DIRTY
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    COMMAND ./scripts/generateVersion.sh
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 #
 #
 
-include_directories(.)
-add_compile_options(-std=c++20 -DWLR_USE_UNSTABLE )
-add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing)
+# udis
+add_subdirectory("subprojects/udis86")
+
+# wlroots
+message(STATUS "Setting up wlroots")
+
+include(ExternalProject)
+
+if(CMAKE_BUILD_TYPE)
+    string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
+    if(BUILDTYPE_LOWER STREQUAL "release")
+        # Pass.
+    elseif(BUILDTYPE_LOWER STREQUAL "debug")
+        # Pass.
+    elseif(BUILDTYPE_LOWER STREQUAL "relwithdebinfo")
+        set(BUILDTYPE_LOWER "debugoptimized")
+    elseif(BUILDTYPE_LOWER STREQUAL "minsizerel")
+        set(BUILDTYPE_LOWER "minsize")
+    elseif(BUILDTYPE_LOWER STREQUAL "none")
+        set(BUILDTYPE_LOWER "plain")
+    else()
+        set(BUILDTYPE_LOWER "release")
+    endif()
+else()
+    set(BUILDTYPE_LOWER "release")
+endif()
+
+ExternalProject_Add(
+    wlroots
+    PREFIX ${CMAKE_SOURCE_DIR}/subprojects/wlroots
+    SOURCE_DIR ${CMAKE_SOURCE_DIR}/subprojects/wlroots
+    PATCH_COMMAND sed -E -i -e "s/(soversion = .*$)/soversion = 13032/g" meson.build
+    CONFIGURE_COMMAND meson setup --reconfigure build --buildtype=${BUILDTYPE_LOWER} -Dwerror=false -Dxwayland=$<IF:$<BOOL:${NO_XWAYLAND}>,disabled,enabled> -Dexamples=false -Drenderers=gles2 $<IF:$<BOOL:${WITH_ASAN}>,-Db_sanitize=address,-Db_sanitize=none>
+    BUILD_COMMAND ninja -C build
+    BUILD_ALWAYS true
+    BUILD_IN_SOURCE true
+    BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.13032
+    INSTALL_COMMAND echo "wlroots: install not needed"
+)
+
+find_program(WaylandScanner NAMES wayland-scanner)
+message(STATUS "Found WaylandScanner at ${WaylandScanner}")
+execute_process(
+    COMMAND pkg-config --variable=pkgdatadir wayland-protocols
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE WAYLAND_PROTOCOLS_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
+
+if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+    message(STATUS "Configuring Hyprland in Debug with CMake")
+    add_compile_definitions(HYPRLAND_DEBUG)
+else()
+    add_compile_options(-O3)
+    message(STATUS "Configuring Hyprland in Release with CMake")
+endif()
+
+include_directories(
+  .
+  "src/"
+  "subprojects/wlroots/include/"
+  "subprojects/wlroots/build/include/"
+  "subprojects/udis86/"
+  "protocols/")
+set(CMAKE_CXX_STANDARD 23)
+add_compile_definitions(WLR_USE_UNSTABLE)
+add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing -Wno-pointer-arith)
+add_link_options(-rdynamic)
+set(CMAKE_ENABLE_EXPORTS TRUE)
+
+message(STATUS "Checking deps...")
+
 find_package(Threads REQUIRED)
-
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo pango pangocairo libdrm egl xkbcommon wlroots libinput xcb)
+find_package(OpenGL REQUIRED)
+pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2 hyprcursor) # we do not check for wlroots, as we provide it ourselves
 
-file(GLOB_RECURSE SRCFILES "src/*.cpp")
+file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
 
-add_executable(Hyprland ${SRCFILES})
+set(TRACY_CPP_FILES "")
+if(USE_TRACY)
+    set(TRACY_CPP_FILES "subprojects/tracy/public/TracyClient.cpp")
+    message(STATUS "Tracy enabled, TRACY_CPP_FILES: " ${TRACY_CPP_FILES})
+endif()
 
-IF(LEGACY_RENDERER MATCHES true)
+add_executable(Hyprland ${SRCFILES} ${TRACY_CPP_FILES})
+add_dependencies(Hyprland wlroots)
+
+if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+    message(STATUS "Setting debug flags")
+
+    if (WITH_ASAN)
+        message(STATUS "Enabling ASan")
+
+        target_link_libraries(Hyprland asan)
+        target_compile_options(Hyprland PUBLIC -fsanitize=address)
+    endif()
+
+    if(USE_TRACY)
+        message(STATUS "Tracy is turned on")
+
+        option( TRACY_ENABLE "" ON)
+        option( TRACY_ON_DEMAND "" ON)
+        add_subdirectory (subprojects/tracy)
+
+        target_link_libraries(Hyprland Tracy::TracyClient)
+
+        if(USE_TRACY_GPU)
+            message(STATUS "Tracy GPU Profiling is turned on")
+            add_compile_definitions(USE_TRACY_GPU)
+        endif()
+    endif()
+
+    add_compile_options(-pg -no-pie -fno-builtin)
+    add_link_options(-pg -no-pie -fno-builtin)
+endif()
+
+check_include_file("execinfo.h" EXECINFOH)
+if(EXECINFOH)
+    message(STATUS "Configuration supports execinfo")
+    add_compile_definitions(HAS_EXECINFO)
+endif()
+
+include(CheckLibraryExists)
+check_library_exists(execinfo backtrace "" HAVE_LIBEXECINFO)
+if(HAVE_LIBEXECINFO)
+    target_link_libraries(Hyprland execinfo)
+endif()
+
+if(LEGACY_RENDERER)
     message(STATUS "Using the legacy GLES2 renderer!")
-    add_definitions( -DLEGACY_RENDERER )
-ENDIF(LEGACY_RENDERER MATCHES true)
+    add_compile_definitions(LEGACY_RENDERER)
+endif()
 
-IF(NO_XWAYLAND MATCHES true)
+if(NO_XWAYLAND)
     message(STATUS "Using the NO_XWAYLAND flag, disabling XWayland!")
-    add_definitions( -DNO_XWAYLAND )
-ENDIF(NO_XWAYLAND MATCHES true)
+    add_compile_definitions(NO_XWAYLAND)
+else()
+    message(STATUS "XWAYLAND Enabled (NO_XWAYLAND not defined) checking deps...")
+    pkg_check_modules(xcbdep REQUIRED IMPORTED_TARGET xcb)
+    target_link_libraries(Hyprland PkgConfig::xcbdep)
+endif()
 
-IF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
-    message(STATUS "Configuring Hyprland in Debug with CMake!")
-ELSE()
-    # add_compile_options(-O3) # may crash for some
-    message(STATUS "Configuring Hyprland in Release with CMake!")
-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
-
-target_compile_definitions(Hyprland PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
-target_compile_definitions(Hyprland PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"")
-target_compile_definitions(Hyprland PRIVATE "-DGIT_COMMIT_MESSAGE=\"${GIT_COMMIT_MESSAGE}\"")
-target_compile_definitions(Hyprland PRIVATE "-DGIT_DIRTY=\"${GIT_DIRTY}\"")
-
-target_link_libraries(Hyprland rt)
+if(NO_SYSTEMD)
+    message(STATUS "SYSTEMD support is disabled...")
+else()
+    message(STATUS "SYSTEMD support is requested (NO_SYSTEMD not defined) checking deps...")
+    check_include_file("systemd/sd-daemon.h" SYSTEMDH)
+    if(SYSTEMDH)
+        pkg_check_modules(LIBSYSTEMD libsystemd)
+        if (LIBSYSTEMD_FOUND)
+            add_compile_definitions(USES_SYSTEMD)
+            target_link_libraries(Hyprland "${LIBSYSTEMD_LIBRARIES}")
+            message(STATUS "Systemd found")
+        else()
+            message(WARNING "Systemd support requested but systemd libraries were not found")
+        endif()
+    else()
+        message(WARNING "Systemd support requested but systemd headers were not found")
+    endif()
+endif()
 
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
 include(CPack)
 
-target_link_libraries(Hyprland PkgConfig::deps)
+message(STATUS "Setting precompiled headers")
+
+target_precompile_headers(Hyprland PRIVATE $<$<COMPILE_LANGUAGE:CXX>:src/pch/pch.hpp>)
+
+message(STATUS "Setting link libraries")
+
+target_link_libraries(Hyprland rt PkgConfig::deps)
+
+function(protocol protoPath protoName external)
+    if (external)
+        execute_process(
+            COMMAND ${WaylandScanner} server-header ${protoPath} protocols/${protoName}-protocol.h
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+        execute_process(
+            COMMAND ${WaylandScanner} private-code ${protoPath} protocols/${protoName}-protocol.c
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})  
+        target_sources(Hyprland PRIVATE protocols/${protoName}-protocol.c)
+    else()
+        execute_process(
+            COMMAND ${WaylandScanner} server-header ${WAYLAND_PROTOCOLS_DIR}/${protoPath} protocols/${protoName}-protocol.h
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+        execute_process(
+            COMMAND ${WaylandScanner} private-code ${WAYLAND_PROTOCOLS_DIR}/${protoPath} protocols/${protoName}-protocol.c
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})  
+        target_sources(Hyprland PRIVATE protocols/${protoName}-protocol.c)
+    endif()
+endfunction()
 
 target_link_libraries(Hyprland
-        wlroots
-        pixman-1
-        OpenGL
-        GLESv2
-        pthread
-        ${CMAKE_THREAD_LIBS_INIT}
-        ${CMAKE_SOURCE_DIR}/ext-workspace-unstable-v1-protocol.o
+        ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.13032 # wlroots is provided by us
+        OpenGL::EGL
+        OpenGL::GL
+        Threads::Threads
+        libudis86
 )
 
-IF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -no-pie -fno-builtin")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg -no-pie -fno-builtin")
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg -no-pie -fno-builtin")
-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+protocol("protocols/idle.xml" "idle" true)
+protocol("protocols/pointer-constraints-unstable-v1.xml" "pointer-constraints-unstable-v1" true)
+protocol("protocols/tablet-unstable-v2.xml" "tablet-unstable-v2" true)
+protocol("protocols/wlr-foreign-toplevel-management-unstable-v1.xml" "wlr-foreign-toplevel-management-unstable-v1" true)
+protocol("protocols/wlr-layer-shell-unstable-v1.xml" "wlr-layer-shell-unstable-v1" true)
+protocol("protocols/wlr-output-power-management-unstable-v1.xml" "wlr-output-power-management-unstable-v1" true)
+protocol("protocols/wlr-screencopy-unstable-v1.xml" "wlr-screencopy-unstable-v1" true)
+protocol("subprojects/hyprland-protocols/protocols/hyprland-global-shortcuts-v1.xml" "hyprland-global-shortcuts-v1" true)
+protocol("subprojects/hyprland-protocols/protocols/hyprland-toplevel-export-v1.xml" "hyprland-toplevel-export-v1" true)
+protocol("stable/xdg-shell/xdg-shell.xml" "xdg-shell" false)
+protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" "linux-dmabuf-unstable-v1" false)
+protocol("unstable/xdg-output/xdg-output-unstable-v1.xml" "xdg-output-unstable-v1" false)
+protocol("staging/fractional-scale/fractional-scale-v1.xml" "fractional-scale-v1" false)
+protocol("staging/tearing-control/tearing-control-v1.xml" "tearing-control-v1" false)
+protocol("unstable/text-input/text-input-unstable-v1.xml" "text-input-unstable-v1" false)
+protocol("staging/cursor-shape/cursor-shape-v1.xml" "cursor-shape-v1" false)
+
+# tools
+add_subdirectory(hyprctl)
+add_subdirectory(hyprpm)

CODE_OF_CONDUCT.md

@@ -0,0 +1,96 @@
+## Goal
+
+Our goal is to provide a space where it is safe for everyone to contribute to,
+and get support for, open-source software in a respectful and cooperative
+manner.
+
+We value all contributions and want to make this organization and its
+surrounding community a place for everyone.
+
+As members, contributors, and everyone else who may participate in the
+development, we strive to keep the entire experience civil.
+
+## Standards
+
+Our community standards exist in order to make sure everyone feels comfortable
+contributing to the project(s) together.
+
+Our standards are:
+ - Do not harass, attack, or in any other way discriminate against anyone, including
+for their protected traits, including, but not limited to, sex, religion, race,
+appearance, gender, identity, nationality, sexuality, etc.
+ - Do not go off-topic, do not post spam.
+ - Treat everyone with respect.
+
+Examples of breaking each rule respectively include:
+ - Harassment, bullying or inappropriate jokes about another person.
+ - Posting distasteful imagery, trolling, or posting things unrelated to the topic at hand.
+ - Treating someone as worse because of their lack of understanding of an issue.
+
+## Enforcement
+
+Enforcement of this CoC is done by the members of the hyprwm organization.
+
+We, as the organization, will strive our best to keep this community civil and
+following the standards outlined above.
+
+### Reporting incidents
+
+If you believe an incident of breaking our standards has occurred, but nobody has
+taken appropriate action, you can privately contact the people responsible for dealing
+with such incidents in multiple ways:
+
+***E-Mail***
+ - `vaxry[at]vaxry.net`
+ - `mihai[at]fufexan.net`
+
+***Discord***
+ - `@vaxry`
+ - `@fufexan`
+
+***Matrix***
+ - `@vaxry:matrix.vaxry.net`
+ - `@fufexan:matrix.org`
+ 
+We, as members, guarantee your privacy and will not share those reports with anyone.
+
+## Enforcement Strategy
+
+Depending on the severity of the infraction, any action from the list below may be applied.
+Please keep in mind cases are reviewed on a per-case basis and members are the ultimate
+deciding factor in the type of punishment.
+
+If the matter would benefit from an outside opinion, a member might reach for more opinions
+from people unrelated to the organization, however, the final decision regarding the action
+to be taken is still up to the member.
+
+For example, if the matter at hand regards a representative of a marginalized group or minority,
+the member might ask for a first-hand opinion from another representative of such group.
+
+### Correction/Edit
+
+If your message is found to be misleading or poorly worded, a member might
+edit your message.
+
+### Warning/Deletion
+
+If your message is found inappropriate, a member might give you a public or private warning,
+and/or delete your message.
+
+### Mute
+
+If your message is disruptive, or you have been repeatedly violating the standards,
+a member might mute (or temporarily ban) you.
+
+### Ban
+
+If your message is hateful, very disruptive, or other, less serious infractions are repeated
+ignoring previous punishments, a member might ban you permanently.
+
+## Scope
+
+This CoC shall apply to all projects ran under the `hyprwm` organization and all _official_ communities
+outside of GitHub.
+
+However, it is worth noting that official communities outside of GitHub might have their own,
+additional sets of rules.

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2022, vaxerski
+Copyright (c) 2022-2024, vaxerski
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,116 +1,130 @@
-include config.mk
-
-CFLAGS += -I. -DWLR_USE_UNSTABLE -std=c99
-
-WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols)
-WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner)
-
-PKGS = wlroots wayland-server xcb xkbcommon libinput
-CFLAGS += $(foreach p,$(PKGS),$(shell pkg-config --cflags $(p)))
-LDLIBS += $(foreach p,$(PKGS),$(shell pkg-config --libs $(p)))
-
-xdg-shell-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
-
-xdg-shell-protocol.c:
-	$(WAYLAND_SCANNER) private-code \
-		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
-
-xdg-shell-protocol.o: xdg-shell-protocol.h
-
-wlr-layer-shell-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/wlr-layer-shell-unstable-v1.xml $@
-
-wlr-layer-shell-unstable-v1-protocol.c:
-	$(WAYLAND_SCANNER) private-code \
-		protocols/wlr-layer-shell-unstable-v1.xml $@
-
-wlr-layer-shell-unstable-v1-protocol.o: wlr-layer-shell-unstable-v1-protocol.h
-
-wlr-screencopy-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/wlr-screencopy-unstable-v1.xml $@
-
-wlr-screencopy-unstable-v1-protocol.c:
-	$(WAYLAND_SCANNER) private-code \
-		protocols/wlr-screencopy-unstable-v1.xml $@
-
-wlr-screencopy-unstable-v1-protocol.o: wlr-screencopy-unstable-v1-protocol.h
-
-ext-workspace-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/ext-workspace-unstable-v1.xml $@
-
-ext-workspace-unstable-v1-protocol.c:
-	$(WAYLAND_SCANNER) private-code \
-		protocols/ext-workspace-unstable-v1.xml $@
-
-ext-workspace-unstable-v1-protocol.o: ext-workspace-unstable-v1-protocol.h
-
-pointer-constraints-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/pointer-constraints-unstable-v1.xml $@
-
-pointer-constraints-unstable-v1-protocol.c:
-	$(WAYLAND_SCANNER) private-code \
-		protocols/pointer-constraints-unstable-v1.xml $@
-
-pointer-constraints-unstable-v1-protocol.o: pointer-constraints-unstable-v1-protocol.h
-
-idle-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/idle.xml $@
-
-idle-protocol.c:
-	$(WAYLAND_SCANNER) private-code \
-		protocols/idle.xml $@
-
-idle-protocol.o: idle-protocol.h
+PREFIX = /usr/local
 
 legacyrenderer:
-	mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DLEGACY_RENDERER:STRING=true -H./ -B./build -G Ninja
-	cmake --build ./build --config Release --target all -j 10
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
+	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+	chmod -R 777 ./build
 
 legacyrendererdebug:
-	mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DLEGACY_RENDERER:STRING=true -H./ -B./build -G Ninja
-	cmake --build ./build --config Release --target all -j 10
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
+	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+	chmod -R 777 ./build
 
 release:
-	mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -H./ -B./build -G Ninja
-	cmake --build ./build --config Release --target all -j 10
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
+	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+	chmod -R 777 ./build
 
 debug:
-	mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -H./ -B./build -G Ninja
-	cmake --build ./build --config Debug --target all -j 10
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
+	cmake --build ./build --config Debug --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+	chmod -R 777 ./build
 
 clear:
 	rm -rf build
-	rm -f *.o *-protocol.h *-protocol.c
-	rm -f ./hyprctl/hyprctl
+	rm -f ./protocols/*-protocol.h ./protocols/*-protocol.c
+	rm -rf ./subprojects/wlroots/build
 
 all:
-	make config
-	make release
-	cd ./hyprctl && make all && cd ..
+	@if [[ "$EUID" = 0 ]]; then echo -en "Avoid running $(MAKE) all as sudo.\n"; fi
+	$(MAKE) clear
+	$(MAKE) release
 
 install:
-	make all
+	@if [ ! -f ./build/Hyprland ]; then echo -en "You need to run $(MAKE) all first.\n" && exit 1; fi
+	@echo -en "!NOTE: Please note make install does not compile Hyprland and only installs the already built files."
+
 	mkdir -p ${PREFIX}/share/wayland-sessions
-	cp ./example/hyprland.desktop ${PREFIX}/share/wayland-sessions/
 	mkdir -p ${PREFIX}/bin
-	cp ./build/Hyprland ${PREFIX}/bin
-	cp ./hyprctl/hyprctl ${PREFIX}/bin
+	cp -f ./build/Hyprland ${PREFIX}/bin
+	cp -f ./build/hyprctl/hyprctl ${PREFIX}/bin
+	cp -f ./build/hyprpm/hyprpm ${PREFIX}/bin
+	chmod 755 ${PREFIX}/bin/Hyprland
+	chmod 755 ${PREFIX}/bin/hyprctl
+	chmod 755 ${PREFIX}/bin/hyprpm
+	cd ${PREFIX}/bin && ln -sf Hyprland hyprland
+	if [ ! -f ${PREFIX}/share/wayland-sessions/hyprland.desktop ]; then cp ./example/hyprland.desktop ${PREFIX}/share/wayland-sessions; fi
 	mkdir -p ${PREFIX}/share/hyprland
-	cp ./assets/wall_2K.png ${PREFIX}/share/hyprland
-	cp ./assets/wall_4K.png ${PREFIX}/share/hyprland
-	cp ./assets/wall_8K.png ${PREFIX}/share/hyprland
+	cp ./assets/wall* ${PREFIX}/share/hyprland
+	mkdir -p ${PREFIX}/share/xdg-desktop-portal
+	cp ./assets/hyprland-portals.conf ${PREFIX}/share/xdg-desktop-portal
+
+	mkdir -p ${PREFIX}/share/man/man1
+	install -m644 ./docs/*.1 ${PREFIX}/share/man/man1
+
+	mkdir -p ${PREFIX}/lib/
+	cp ./subprojects/wlroots/build/libwlroots.so.13032 ${PREFIX}/lib/
+
+	$(MAKE) installheaders
 
 uninstall:
 	rm -f ${PREFIX}/share/wayland-sessions/hyprland.desktop
 	rm -f ${PREFIX}/bin/Hyprland
+	rm -f ${PREFIX}/bin/hyprland
 	rm -f ${PREFIX}/bin/hyprctl
+	rm -f ${PREFIX}/bin/hyprpm
+	rm -f ${PREFIX}/lib/libwlroots.so.13032
 	rm -rf ${PREFIX}/share/hyprland
+	rm -f ${PREFIX}/share/man/man1/Hyprland.1
+	rm -f ${PREFIX}/share/man/man1/hyprctl.1
+
+pluginenv:
+	@echo -en "$(MAKE) pluginenv has been deprecated.\nPlease run $(MAKE) all && sudo $(MAKE) installheaders\n"
+	@exit 1
+	
+installheaders:
+	@if [ ! -f ./src/version.h ]; then echo -en "You need to run $(MAKE) all first.\n" && exit 1; fi
+
+	rm -fr ${PREFIX}/include/hyprland
+	mkdir -p ${PREFIX}/include/hyprland
+	mkdir -p ${PREFIX}/include/hyprland/protocols
+	mkdir -p ${PREFIX}/include/hyprland/wlroots
+	mkdir -p ${PREFIX}/share/pkgconfig
+	
+	find src -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland
+	cd subprojects/wlroots/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots && cd ../../..
+	cd subprojects/wlroots/build/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots && cd ../../../..
+	cp ./protocols/*-protocol.h ${PREFIX}/include/hyprland/protocols
+	cp ./build/hyprland.pc ${PREFIX}/share/pkgconfig
+	if [ -d /usr/share/pkgconfig ]; then cp ./build/hyprland.pc /usr/share/pkgconfig 2>/dev/null || true; fi
+
+	chmod -R 755 ${PREFIX}/include/hyprland
+	chmod 755 ${PREFIX}/share/pkgconfig
+
+man:
+	pandoc ./docs/Hyprland.1.rst \
+		--standalone \
+		--variable=header:"Hyprland User Manual" \
+		--variable=date:"${DATE}" \
+		--variable=section:1 \
+		--from rst \
+		--to man > ./docs/Hyprland.1
+
+	pandoc ./docs/hyprctl.1.rst \
+		--standalone \
+		--variable=header:"hyprctl User Manual" \
+		--variable=date:"${DATE}" \
+		--variable=section:1 \
+		--from rst \
+		--to man > ./docs/hyprctl.1
+
+asan:
+	@echo -en "!!WARNING!!\nOnly run this in the TTY.\n"
+	@pidof Hyprland > /dev/null && echo -ne "Refusing to run with Hyprland running.\n" || echo ""
+	@pidof Hyprland > /dev/null && exit 1 || echo ""
+
+	rm -rf ./wayland
+	git reset --hard
+
+	git clone --recursive https://gitlab.freedesktop.org/wayland/wayland
+	cd wayland && patch -p1 < ../scripts/waylandStatic.diff && meson setup build --buildtype=debug -Db_sanitize=address -Ddocumentation=false && ninja -C build && cd ..
+	cp ./wayland/build/src/libwayland-server.a .
+	@echo "Wayland done"
+
+	patch -p1 < ./scripts/hyprlandStaticAsan.diff
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DWITH_ASAN:STRING=True -DUSE_TRACY:STRING=False -DUSE_TRACY_GPU:STRING=False -S . -B ./build -G Ninja
+	cmake --build ./build --config Debug --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+	@echo "Hyprland done"
+
+	ASAN_OPTIONS="detect_odr_violation=0,log_path=asan.log" HYPRLAND_NO_CRASHREPORTER=1 ./build/Hyprland -c ~/.config/hypr/hyprland.conf
 	
-config: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o wlr-screencopy-unstable-v1-protocol.o idle-protocol.o ext-workspace-unstable-v1-protocol.o pointer-constraints-unstable-v1-protocol.o

README.md

@@ -1,12 +1,11 @@
 <div align = center>
 
-![Banner]
+<img src="https://raw.githubusercontent.com/vaxerski/Hyprland/main/assets/header.svg" width="750" height="300" alt="banner">
 
 <br>
 
 ![Badge Workflow] 
 [![Badge License]][License] 
-![Badge Lines] 
 ![Badge Language] 
 [![Badge Pull Requests]][Pull Requests] 
 [![Badge Issues]][Issues] 
@@ -17,8 +16,8 @@
 
 Hyprland is a dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks.
 
-For Hyprland without the `land` part, see [Hypr], the Xorg window manager.
-
+It provides the latest Wayland features, is highly customizable, has all the eyecandy, the most powerful plugins,
+easy IPC, much more QoL stuff than other wlr-based compositors and more...
 <br>
 <br>
 
@@ -35,34 +34,30 @@ For Hyprland without the `land` part, see [Hypr], the Xorg window manager.
 
 </div>
 
-# Notice
-
-This project is still in its early development, expect bugs.
-
-Once you get it working though, it's pretty stable.<br/>
-
-
-### Help Wanted
-
-Hyprland needs testers! <br/>
-Try it out and report bugs / suggestions!
-
 # Features
 
+- All of the eyecandy: gradient borders, blur, animations, shadows and much more
+- A lot of customization
+- Much more QoL stuff than other wlr-based compositors
+- Custom bezier curves for the best animations
+- Powerful plugin support
+- Built-in plugin manager
+- Tearing support for better gaming performance
 - Easily expandable and readable codebase
+- Fast and active development
+- Not scared to provide bleeding-edge features
 - Config reloaded instantly upon saving
-- Bezier-curve window animations
-- Custom bezier curve based animations
-- Workspaces protocol support
-- Dual Kawase blur
-- Window fade in / out
-- Tiling / floating / fullscreen windows
-- Window / monitor rules
+- Fully dynamic workspaces
+- Two built-in layouts and more available as plugins
+- Closely follows `wlroots-git`
+- Global keybinds passed to your apps of choice
+- Tiling/pseudotiling/floating/fullscreen windows
+- Special workspaces (scratchpads)
+- Window groups (tabbed mode)
+- Powerful window/monitor/layer rules
 - Socket-based IPC
-- Rounded corners
-- Damage tracking ( *Experimental* )
-- Moving / resizing
-- Docks support
+- Native IME and Input Panels Support
+- and much more...
 
 <br>
 <br>
@@ -86,15 +81,6 @@ Try it out and report bugs / suggestions!
 <br>
 <br>
 
-# Stars Over Time
-
-<br>
-
-[![Stars Preview]][Stars]
-
-<br>
-<br>
-
 </div>
 
 # Special Thanks
@@ -116,18 +102,18 @@ Try it out and report bugs / suggestions!
 
 <!----------------------------------------------------------------------------->
 
-[Configure]: https://github.com/vaxerski/Hyprland/wiki/Configuring-Hyprland
+[Configure]: https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
 [Discord]: https://discord.gg/hQ9XvMUjjr
-[Stars]: https://starchart.cc/vaxerski/Hyprland
-[Hypr]: https://github.com/vaxerski/Hypr
+[Stars]: https://starchart.cc/hyprwm/Hyprland
+[Hypr]: https://github.com/hyprwm/Hypr
 
-[Pull Requests]: https://github.com/vaxerski/Hyprland/pulls
-[Issues]: https://github.com/vaxerski/Hyprland/issues
-[Todo]: https://github.com/vaxerski/Hyprland/projects?type=beta
+[Pull Requests]: https://github.com/hyprwm/Hyprland/pulls
+[Issues]: https://github.com/hyprwm/Hyprland/issues
+[Todo]: https://github.com/hyprwm/Hyprland/projects?type=beta
 
-[Contribute]: docs/Contribute.md
-[Install]: https://github.com/vaxerski/Hyprland/wiki/Installation
-[Quick Start]: https://github.com/vaxerski/Hyprland/wiki/Quick-start
+[Contribute]: https://wiki.hyprland.org/Contributing-and-Debugging/
+[Install]: https://wiki.hyprland.org/Getting-Started/Installation/
+[Quick Start]: https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
 [License]: LICENSE
 
 
@@ -138,25 +124,24 @@ Try it out and report bugs / suggestions!
 [Wayfire]: https://github.com/WayfireWM/wayfire
 [TinyWl]: https://gitlab.freedesktop.org/wlroots/wlroots/-/blob/master/tinywl/tinywl.c
 [Sway]: https://github.com/swaywm/sway
-[DWL]: https://github.com/djpohly/dwl
+[DWL]: https://codeberg.org/dwl/dwl
 
 <!----------------------------------{ Images }--------------------------------->
 
 [Stars Preview]: https://starchart.cc/vaxerski/Hyprland.svg
-[Preview A]: https://i.imgur.com/NbrTnZH.png
-[Preview B]: https://i.imgur.com/ZA4Fa8R.png
-[Preview C]: https://i.imgur.com/BpXxM8H.png
-[Banner]: https://raw.githubusercontent.com/vaxerski/Hyprland/main/assets/hyprland.png
+[Preview A]: https://i.ibb.co/C1yTb0r/falf.png
+[Preview B]: https://linfindel.github.io/cdn/hyprland-preview-b.png
+[Preview C]: https://i.ibb.co/B3GJg28/20221126-20h53m26s-grim.png
 
 
 <!----------------------------------{ Badges }--------------------------------->
 
-[Badge Workflow]: https://github.com/vaxerski/Hyprland/actions/workflows/ci.yaml/badge.svg
+[Badge Workflow]: https://github.com/hyprwm/Hyprland/actions/workflows/ci.yaml/badge.svg
 
 [Badge Discord]: https://img.shields.io/badge/Join%20the-Discord%20server-6666ff
-[Badge Issues]: https://img.shields.io/github/issues/vaxerski/Hyprland
-[Badge Pull Requests]: https://img.shields.io/github/issues-pr/vaxerski/Hyprland
-[Badge Language]: https://img.shields.io/github/languages/top/vaxerski/Hyprland
-[Badge License]: https://img.shields.io/github/license/vaxerski/Hyprland
-[Badge Lines]: https://img.shields.io/tokei/lines/github/vaxerski/Hyprland
+[Badge Issues]: https://img.shields.io/github/issues/hyprwm/Hyprland
+[Badge Pull Requests]: https://img.shields.io/github/issues-pr/hyprwm/Hyprland
+[Badge Language]: https://img.shields.io/github/languages/top/hyprwm/Hyprland
+[Badge License]: https://img.shields.io/github/license/hyprwm/Hyprland
+[Badge Lines]: https://img.shields.io/tokei/lines/github/hyprwm/Hyprland
 [Badge Hi Mom]: https://img.shields.io/badge/Hi-mom!-ff69b4

assets/hyprland-portals.conf

@@ -0,0 +1,2 @@
+[preferred]
+default=hyprland;gtk

assets/meson.build

@@ -0,0 +1,7 @@
+wallpapers = ['0', '1', '2']
+
+foreach type : wallpapers
+  install_data(f'wall@type@.png', install_dir: join_paths(get_option('datadir'), 'hyprland'), install_tag: 'runtime')
+endforeach
+
+install_data('hyprland-portals.conf', install_dir: join_paths(get_option('datadir'), 'xdg-desktop-portal'), install_tag: 'runtime')

aur/PKGBUILD

@@ -1,32 +0,0 @@
-# Maintainer: ThatOneCalculator <kainoa@t1c.dev>
-
-_pkgname="hyprland"
-pkgname="${_pkgname}"
-pkgver="0.1.1beta"
-pkgrel=2
-pkgdesc="Hyprland is a dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
-arch=(any)
-url="https://github.com/vaxerski/Hyprland"
-license=('BSD')
-depends=(libxcb xcb-proto xcb-util xcb-util-keysyms libxfixes libx11 libxcomposite xorg-xinput libxrender pixman wayland-protocols wlroots-git cairo pango)
-makedepends=(git cmake ninja gcc gdb)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vaxerski/hyprland/archive/v${pkgver}.tar.gz")
-sha256sums=('SKIP')
-options=(!makeflags !buildflags)
-
-build() {
-	cd "$srcdir/Hyprland-$pkgver"
-	make all
-}
-
-package() {
-	cd "$srcdir/Hyprland-$pkgver"
-	mkdir -p "${pkgdir}/usr/share/wayland-sessions"
-	mkdir -p "${pkgdir}/usr/share/hyprland"
-	install -Dm755 build/Hyprland -t "${pkgdir}/usr/bin"
-	install -Dm755 hyprctl/hyprctl -t "${pkgdir}/usr/bin"
-	install -Dm644 assets/*.png -t "${pkgdir}/usr/share/hyprland"
-	install -Dm644 example/hyprland.desktop -t "${pkgdir}/usr/share/wayland-sessions"
-	install -Dm644 example/hyprland.conf -t "${pkgdir}/usr/share/hyprland"
-	install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_pkgname}"
-}

aur/PKGBUILD-git

@@ -1,40 +0,0 @@
-# Maintainer: ThatOneCalculator <kainoa@t1c.dev>, Sander van Kasteel <info@sandervankasteel.nl>
-
-_pkgname="hyprland"
-pkgname="${_pkgname}-git"
-pkgver=r568.g632d00c
-pkgrel=1
-pkgdesc="Hyprland is a dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
-arch=(any)
-url="https://github.com/vaxerski/Hyprland"
-license=('BSD')
-depends=(libxcb xcb-proto xcb-util xcb-util-keysyms libxfixes libx11 libxcomposite xorg-xinput libxrender pixman wayland-protocols wlroots-git cairo pango)
-makedepends=(git cmake ninja gcc gdb)
-source=("${_pkgname}::git+https://github.com/vaxerski/Hyprland.git")
-sha256sums=('SKIP')
-options=(!makeflags !buildflags)
-
-pkgver() {
-  cd "$_pkgname"
-  ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
-build() {
-	cd "${srcdir}/${_pkgname}"
-	make all
-}
-
-package() {
-	cd "${srcdir}/${_pkgname}"
-	mkdir -p "${pkgdir}/usr/share/wayland-sessions"
-	mkdir -p "${pkgdir}/usr/share/hyprland"
-	install -Dm755 build/Hyprland -t "${pkgdir}/usr/bin"
-	install -Dm755 hyprctl/hyprctl -t "${pkgdir}/usr/bin"
-	install -Dm644 assets/*.png -t "${pkgdir}/usr/share/hyprland"
-	install -Dm644 example/hyprland.desktop -t "${pkgdir}/usr/share/wayland-sessions"
-	install -Dm644 example/hyprland.conf -t "${pkgdir}/usr/share/hyprland"
-	install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_pkgname}"
-}

config.mk

@@ -1,4 +0,0 @@
-PREFIX = /usr/local
-CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wdeclaration-after-statement
-CFLAGS += -DXWAYLAND
-

default.nix

@@ -1,84 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  cmake,
-  ninja,
-  libdrm,
-  libinput,
-  libxcb,
-  libxkbcommon,
-  mesa,
-  mount,
-  pango,
-  wayland,
-  wayland-protocols,
-  wayland-scanner,
-  wlroots,
-  xcbutilwm,
-  xwayland,
-  enableXWayland ? true,
-  version ? "git",
-}:
-stdenv.mkDerivation {
-  pname = "hyprland";
-  inherit version;
-  src = ./.;
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    pkg-config
-  ];
-
-  buildInputs =
-    [
-      libdrm
-      libinput
-      libxcb
-      libxkbcommon
-      mesa
-      pango
-      wayland
-      wayland-protocols
-      wayland-scanner
-      (wlroots.override {inherit enableXWayland;})
-      xcbutilwm
-    ]
-    ++ lib.optional enableXWayland xwayland;
-
-  cmakeFlags =
-    ["-DCMAKE_BUILD_TYPE=Release"]
-    ++ lib.optional (!enableXWayland) "-DNO_XWAYLAND=true";
-
-  prePatch = ''
-    make config
-  '';
-
-  postBuild = ''
-    pushd ../hyprctl
-    make all
-    popd
-  '';
-
-  installPhase = ''
-    pushd ..
-    install -Dm644 ./example/hyprland.desktop -t $out/share/wayland-sessions
-    install -Dm755 ./build/Hyprland -t $out/bin
-    install -Dm755 ./hyprctl/hyprctl -t $out/bin
-    install -Dm644 ./assets/* -t $out/share/hyprland
-    install -Dm644 ./example/hyprland.conf -t $out/share/hyprland
-    popd
-  '';
-
-  passthru.providedSessions = ["hyprland"];
-
-  meta = with lib; {
-    homepage = "https://github.com/vaxerski/Hyprland";
-    description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    mainProgram = "Hyprland";
-  };
-}

docs/Contribute.md

@@ -1,32 +0,0 @@
-
-# Contributing
-
-*Thank you for considering contributing to Hyprland.*
-
-## Development
-
-Check the [Wiki] for debugging instructions.
-
-Afterwards, pick yourself an [Issue] or implement your own suggestion.
-
-An good place to search for things to contribute is the [Projects Page]
-
-*As Hyprland is still in its early stages of development, I'd recommend you stick to bug fixes first.*
-
-## Pull Requests
-
-- Please follow the code style
-
-- Code must be readable
-
-- Features should be useful
-
-- Test your changes!
-
-  *Run it on bare metal and check if everything works.*
-
-<!----------------------------------------------------------------------------->
-
-[Issue]: https://github.com/vaxerski/Hyprland/issues
-[Wiki]: https://github.com/vaxerski/Hyprland/wiki/Contributing-&-Debugging
-[Projects page]: https://github.com/vaxerski/Hyprland/projects?type=beta

docs/Hyprland.1

@@ -0,0 +1,46 @@
+.\" Automatically generated by Pandoc 2.9.2.1
+.\"
+.TH "Hyprland" "1" "" "" "Hyprland User Manual"
+.hy
+.SH NAME
+.PP
+Hyprland - Dynamic tiling Wayland compositor
+.SH SYNOPSIS
+.PP
+\f[B]Hyprland\f[R] [\f[I]arg [...]\f[R]].
+.SH DESCRIPTION
+.PP
+\f[B]Hyprland\f[R] is a dynamic tiling Wayland compositor based on
+wlroots that doesn\[aq]t sacrifice on its looks.
+.PP
+You can launch Hyprland by either going into a TTY and executing
+\f[B]Hyprland\f[R], or with a login manager.
+.SH NOTICE
+.PP
+Hyprland is still in pretty early development compared to some other
+Wayland compositors.
+.PP
+Although Hyprland is pretty stable, it may have some bugs.
+.SH CONFIGURATION
+.PP
+For configuration information please see
+<\f[I]https://github.com/hyprwm/Hyprland/wiki\f[R]>.
+.SH OPTIONS
+.TP
+\f[B]-h\f[R], \f[B]--help\f[R]
+Show command usage.
+.TP
+\f[B]-c\f[R], \f[B]--config\f[R]
+Specify config file to use.
+.SH BUGS
+.TP
+Submit bug reports and request features online at:
+<\f[I]https://github.com/hyprwm/Hyprland/issues\f[R]>
+.SH SEE ALSO
+.PP
+Sources at: <\f[I]https://github.com/hyprwm/Hyprland\f[R]>
+.SH COPYRIGHT
+.PP
+Copyright (c) 2022, vaxerski
+.SH AUTHORS
+Vaxerski <\f[I]https://github.com/vaxerski\f[R]>.

docs/Hyprland.1.rst

@@ -0,0 +1,58 @@
+:title: Hyprland
+:author: Vaxerski <*https://github.com/vaxerski*>
+
+NAME
+====
+
+Hyprland - Dynamic tiling Wayland compositor
+
+SYNOPSIS
+========
+
+**Hyprland** [*arg [...]*].
+
+DESCRIPTION
+===========
+
+**Hyprland** is a dynamic tiling Wayland compositor based on
+wlroots that doesn't sacrifice on its looks.
+
+You can launch Hyprland by either going into a TTY and
+executing **Hyprland**, or with a login manager.
+
+NOTICE
+======
+
+Hyprland is still in pretty early development compared to some other Wayland compositors.
+
+Although Hyprland is pretty stable, it may have some bugs.
+
+CONFIGURATION
+=============
+
+For configuration information please see <*https://github.com/hyprwm/Hyprland/wiki*>.
+
+OPTIONS
+=======
+
+**-h**, **--help**
+    Show command usage.
+
+**-c**, **--config**
+    Specify config file to use.
+
+BUGS
+====
+
+Submit bug reports and request features online at:
+    <*https://github.com/hyprwm/Hyprland/issues*>
+
+SEE ALSO
+========
+
+Sources at: <*https://github.com/hyprwm/Hyprland*>
+
+COPYRIGHT
+=========
+
+Copyright (c) 2022, vaxerski

docs/ISSUE_GUIDELINES.md

@@ -0,0 +1,80 @@
+# Issue Guidelines
+
+First of all, please remember to:
+- Check that your issue is not a duplicate
+- Read the [FAQ](https://wiki.hyprland.org/FAQ/)
+- Read the [Configuring Page](https://wiki.hyprland.org/Configuring/Configuring-Hyprland)
+
+<br/>
+
+# Reporting suggestions
+Suggestions are welcome.
+
+Many features can be implemented using bash scripts and Hyprland sockets, read up on those [Here](https://wiki.hyprland.org/IPC). Please do not suggest features that can be implemented as such.
+
+<br/>
+
+# Reporting bugs
+
+All bug reports should have the following:
+- Steps to reproduce
+- Expected outcome
+- Noted outcome
+
+If your bug is one that doesn't crash Hyprland, but feels like invalid behavior, that's all you need to say.
+
+If your bug crashes Hyprland, append additionally:
+- The Hyprland log
+- Your config
+- (v0.22.0beta and up) The Hyprland Crash Report
+- (v0.21.0beta and below) Coredump / Coredump analysis (with a stacktrace)
+
+**Important**: Please do NOT use any package for reporting bugs! Clone and compile from source.
+
+## Obtaining the Hyprland log
+If you are in a TTY, and the hyprland session that crashed was the last one you launched, the log will be printed with
+```
+cat /tmp/hypr/$(ls -t /tmp/hypr/ | head -n 1)/hyprland.log
+```
+feel free to send it to a file, save, copy, etc.
+
+if you are in a Hyprland session, and you want the log of the last session, use
+```
+cat /tmp/hypr/$(ls -t /tmp/hypr/ | head -n 2 | tail -n 1)/hyprland.log
+```
+
+basically, directories in /tmp/hypr are your sessions.
+
+## Obtaining the Hyprland Crash Report (v0.22.0beta and up)
+
+If you have `$XDG_CACHE_HOME` set, the crash report directory is `$XDG_CACHE_HOME/hyprland`. If not, it's `$HOME/.cache/hyprland`.
+
+Go to the crash report directory and you should find a file named `hyprlandCrashReport[XXXX].txt` where `[XXXX]` is the PID of the process that crashed.
+
+Attach that file to your issue.
+## Obtaining the Hyprland coredump (v0.21.0beta and below)
+If you are on systemd, you can simply use
+```
+coredumpctl
+```
+then go to the end (press END on your keyboard) and remember the PID of the last `Hyprland` occurrence. It's the first number after the time, for example `2891`.
+
+exit coredumpctl (ctrl+c) and use
+```
+coredumpctl info [PID]
+```
+where `[PID]` is the PID you remembered.
+
+## Obtaining the debug Hyprland coredump
+A debug coredump provides more information for debugging and may speed up the process of fixing the bug.
+
+Make sure you're on latest git. Run `git pull --recurse-submodules` to sync everything.
+
+1. [Compile Hyprland with debug mode](http://wiki.hyprland.org/Contributing-and-Debugging/#build-in-debug-mode)
+> Note: The config file used will be `hyprlandd.conf` instead of `hyprland.conf`
+
+2. `cd ~`
+3. For your own convenience, launch Hyprland from a tty with the envvar `ASAN_OPTIONS="log_path=asan.log" ~/path/to/Hyprland`
+4. Reproduce the crash. Hyprland should instantly close.
+5. Check out your `~` and find a file called `asan.log.XXXXX` where `XXXXX` will be a number corresponding to the PID of the Hyprland instance that crashed.
+6. That is your coredump. Attach it to your issue.

docs/Install.md

@@ -1,35 +0,0 @@
-
-# Installation
-
-## Packages
-
-*I do not maintain any packages, but some kind people have made them for me.*
-
-**If I missed any, please let me know.**
-
-## Notice
-
-Since I am not the maintainer, I cannot guarantee that those packages will always work and be up to date.
-
-***Use at your own disclosure.*** <br>
-*If they don't work, try building manually.*
-
-#### Arch ( AUR / -git )
-
-```sh
-yay -S hyprland-git
-```
-
----
-
-
-## Building / No XWayland / other
-
-If your distro doesn't have **Hyprland** in its repositories, you want to modify it, or use custom build flags, please refer to the **[Wiki Page][Install]** for the installation instructions.
-
-
-<!----------------------------------------------------------------------------->
-
-[Install]: https://github.com/vaxerski/Hyprland/wiki/Installation
-
-

docs/hyprctl.1

@@ -0,0 +1,145 @@
+.\" Automatically generated by Pandoc 2.9.2.1
+.\"
+.TH "hyprctl" "1" "" "" "hyprctl User Manual"
+.hy
+.SH NAME
+.PP
+hyprctl - Utility for controlling parts of Hyprland from a CLI or a
+script
+.SH SYNOPSIS
+.PP
+\f[B]hyprctl\f[R] [\f[I](opt)flags\f[R]] [\f[B]command\f[R]]
+[\f[I](opt)args\f[R]]
+.SH DESCRIPTION
+.PP
+\f[B]hyprctl\f[R] is a utility for controlling some parts of the
+compositor from a CLI or a script.
+.SH CONTROL COMMANDS
+.PP
+\f[B]dispatch\f[R]
+.RS
+.PP
+Call a dispatcher with an argument.
+.PP
+An argument must be present.
+For dispatchers without parameters it can be anything.
+.PP
+Returns: \f[I]ok\f[R] on success, and an error message on failure.
+.TP
+Examples:
+\f[B]hyprctl\f[R] \f[I]dispatch exec kitty\f[R]
+.RS
+.PP
+\f[B]hyprctl\f[R] \f[I]dispatch pseudo x\f[R]
+.RE
+.RE
+.PP
+\f[B]keyword\f[R]
+.RS
+.PP
+Set a config keyword dynamically.
+.PP
+Returns: \f[I]ok\f[R] on success, and an error message on failure.
+.TP
+Examples:
+\f[B]hyprctl\f[R] \f[I]keyword bind SUPER,0,pseudo\f[R]
+.RS
+.PP
+\f[B]hyprctl\f[R] \f[I]keyword general:border_size 10\f[R]
+.RE
+.RE
+.PP
+\f[B]reload\f[R]
+.RS
+.PP
+Force a reload of the config file.
+.RE
+.PP
+\f[B]kill\f[R]
+.RS
+.PP
+Enter kill mode, where you can kill an app by clicking on it.
+You can exit by pressing ESCAPE.
+.RE
+.SH INFO COMMANDS
+.PP
+\f[B]version\f[R]
+.RS
+.PP
+Prints the Hyprland version, flags, commit and branch of build.
+.RE
+.PP
+\f[B]monitors\f[R]
+.RS
+.PP
+Lists all the outputs with their properties.
+.RE
+.PP
+\f[B]workspaces\f[R]
+.RS
+.PP
+Lists all workspaces with their properties.
+.RE
+.PP
+\f[B]clients\f[R]
+.RS
+.PP
+Lists all windows with their properties.
+.RE
+.PP
+\f[B]devices\f[R]
+.RS
+.PP
+Lists all connected input devices.
+.RE
+.PP
+\f[B]activewindow\f[R]
+.RS
+.PP
+Returns the active window name.
+.RE
+.PP
+\f[B]layers\f[R]
+.RS
+.PP
+Lists all the layers.
+.RE
+.PP
+\f[B]splash\f[R]
+.RS
+.PP
+Returns the current random splash.
+.RE
+.SH OPTIONS
+.PP
+\f[B]--batch\f[R]
+.RS
+.PP
+Specify a batch of commands to execute.
+.TP
+Example:
+\f[B]hyprctl\f[R] \f[I]--batch \[dq]keyword general:border_size 2 ;
+keyword general:gaps_out 20\[dq]\f[R]
+.RS
+.PP
+\f[I];\f[R] separates the commands.
+.RE
+.RE
+.PP
+\f[B]-j\f[R]
+.RS
+.PP
+Outputs information in JSON.
+.RE
+.SH BUGS
+.TP
+Submit bug reports and request features online at:
+<\f[I]https://github.com/hyprwm/Hyprland/issues\f[R]>
+.SH SEE ALSO
+.PP
+Sources at: <\f[I]https://github.com/hyprwm/Hyprland\f[R]>
+.SH COPYRIGHT
+.PP
+Copyright (c) 2022, vaxerski
+.SH AUTHORS
+Vaxerski <\f[I]https://github.com/vaxerski\f[R]>.

docs/hyprctl.1.rst

@@ -0,0 +1,121 @@
+:title: hyprctl(1)
+:author: Vaxerski <*https://github.com/vaxerski*>
+
+NAME
+====
+
+hyprctl - Utility for controlling parts of Hyprland from a CLI or a script
+
+SYNOPSIS
+========
+
+**hyprctl** [*(opt)flags*] [**command**] [*(opt)args*]
+
+DESCRIPTION
+===========
+
+**hyprctl** is a utility for controlling some parts of the compositor from a CLI or a script.
+
+CONTROL COMMANDS
+================
+
+**dispatch**
+
+    Call a dispatcher with an argument.
+
+    An argument must be present.
+    For dispatchers without parameters it can be anything.
+
+    Returns: *ok* on success, and an error message on failure.
+
+    Examples:
+        **hyprctl** *dispatch exec kitty*
+
+        **hyprctl** *dispatch pseudo x*
+
+**keyword**
+
+    Set a config keyword dynamically.
+
+    Returns: *ok* on success, and an error message on failure.
+
+    Examples:
+        **hyprctl** *keyword bind SUPER,0,pseudo*
+
+        **hyprctl** *keyword general:border_size 10*
+
+**reload**
+
+    Force a reload of the config file.
+
+**kill**
+
+    Enter kill mode, where you can kill an app by clicking on it.
+    You can exit by pressing ESCAPE.
+
+INFO COMMANDS
+=============
+
+**version**
+
+    Prints the Hyprland version, flags, commit and branch of build.
+
+**monitors**
+
+    Lists all the outputs with their properties.
+
+**workspaces**
+
+    Lists all workspaces with their properties.
+
+**clients**
+
+    Lists all windows with their properties.
+
+**devices**
+
+    Lists all connected input devices.
+
+**activewindow**
+
+    Returns the active window name.
+
+**layers**
+
+    Lists all the layers.
+
+**splash**
+
+    Returns the current random splash.
+
+OPTIONS
+=======
+
+**--batch**
+
+    Specify a batch of commands to execute.
+
+    Example:
+        **hyprctl** *--batch "keyword general:border_size 2 ; keyword general:gaps_out 20"*
+
+        *;* separates the commands.
+
+**-j**
+
+    Outputs information in JSON.
+
+BUGS
+====
+
+Submit bug reports and request features online at:
+    <*https://github.com/hyprwm/Hyprland/issues*>
+
+SEE ALSO
+========
+
+Sources at: <*https://github.com/hyprwm/Hyprland*>
+
+COPYRIGHT
+=========
+
+Copyright (c) 2022, vaxerski

docs/meson.build

@@ -0,0 +1,2 @@
+install_man ('Hyprland.1')
+install_man ('hyprctl.1')

example/hyprland.conf

@@ -1,98 +1,186 @@
 # This is an example Hyprland config file.
-# Syntax is the same as in Hypr, but settings might differ.
 #
 # Refer to the wiki for more information.
 
-monitor=,1280x720@60,0x0,1
-workspace=DP-1,1
+#
+# Please note not all available settings / options are set here.
+# For a full list, see the wiki
+#
 
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,preferred,auto,auto
+
+
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+
+# Execute your favorite apps at launch
+# exec-once = waybar & hyprpaper & firefox
+
+# Source a file (multi-file configs)
+# source = ~/.config/hypr/myColors.conf
+
+# Set programs that you use
+$terminal = kitty
+$fileManager = dolphin
+$menu = wofi --show drun
+
+# Some default env vars.
+env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
+
+# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
-    kb_layout=
+    kb_layout = us
     kb_variant =
     kb_model =
     kb_options =
     kb_rules =
 
     follow_mouse = 1
+
+    touchpad {
+        natural_scroll = false
+    }
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
 
 general {
-    max_fps=60 # deprecated, unused
-    sensitivity=0.25
-    main_mod=SUPER
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
     gaps_in = 5
     gaps_out = 20
     border_size = 2
-    col.active_border=0x66ee1111
-    col.inactive_border=0x66333333
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
 
-    damage_tracking=full # experimental, monitor is 100% fine, but full might have some minor bugs, especially with high blur settings!
+    layout = dwindle
+
+    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
 }
 
 decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
     rounding = 10
-    blur=1
-    blur_size=3 # minimum 1
-    blur_passes=1 # minimum 1, more passes = more resource intensive.
-    # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts.
-    # if you want heavy blur, you need to up the blur_passes.
-    # the more passes, the more you can up the blur_size without noticing artifacts.
+
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+        
+        vibrancy = 0.1696
+    }
+
+    drop_shadow = true
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
 }
 
 animations {
-    enabled=1
-    animation=windows,1,7,default
-    animation=borders,1,10,default
-    animation=fadein,1,10,default
+    enabled = true
+
+    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
     animation = workspaces, 1, 6, default
 }
 
 dwindle {
-    pseudotile=0 # enable pseudotiling on dwindle
+    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+    pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # you probably want this
 }
 
-# example window rules
-# for windows named/classed as abc and xyz
-#windowrule=move 69 420,abc
-#windowrule=size 420 69,abc
-#windowrule=tile,xyz
-#windowrule=float,abc
-#windowrule=pseudo,abc
-#windowrule=monitor 0,xyz
+master {
+    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    new_is_master = true
+}
 
-# example binds
-bind=SUPER,Q,exec,kitty
-bind=SUPER,C,killactive,
-bind=SUPER,M,exec,pkill Hyprland
-bind=SUPER,E,exec,dolphin
-bind=SUPER,V,togglefloating,
-bind=SUPER,R,exec,wofi --show drun -o DP-3
-bind=SUPER,P,pseudo,
+gestures {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    workspace_swipe = false
+}
 
-bind=SUPER,left,movefocus,l
-bind=SUPER,right,movefocus,r
-bind=SUPER,up,movefocus,u
-bind=SUPER,down,movefocus,d
+misc {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+}
 
-bind=SUPER,1,workspace,1
-bind=SUPER,2,workspace,2
-bind=SUPER,3,workspace,3
-bind=SUPER,4,workspace,4
-bind=SUPER,5,workspace,5
-bind=SUPER,6,workspace,6
-bind=SUPER,7,workspace,7
-bind=SUPER,8,workspace,8
-bind=SUPER,9,workspace,9
-bind=SUPER,0,workspace,10
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = epic-mouse-v1
+    sensitivity = -0.5
+}
 
-bind=ALT,1,movetoworkspace,1
-bind=ALT,2,movetoworkspace,2
-bind=ALT,3,movetoworkspace,3
-bind=ALT,4,movetoworkspace,4
-bind=ALT,5,movetoworkspace,5
-bind=ALT,6,movetoworkspace,6
-bind=ALT,7,movetoworkspace,7
-bind=ALT,8,movetoworkspace,8
-bind=ALT,9,movetoworkspace,9
-bind=ALT,0,movetoworkspace,10
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
+
+
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+$mainMod = SUPER
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, C, killactive,
+bind = $mainMod, M, exit,
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, R, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow

example/hyprland.service

@@ -0,0 +1,12 @@
+; a primitive systemd --user example
+[Unit]
+Description = %p
+BindsTo     = graphical-session.target
+Upholds     = swaybg@333333.service
+
+[Service]
+Type            = notify
+ExecStart       = /usr/bin/Hyprland
+
+[Install]
+WantedBy = default.target

example/meson.build

@@ -0,0 +1,2 @@
+install_data('hyprland.conf', install_dir: join_paths(get_option('datadir'), 'hyprland'), install_tag: 'runtime')
+install_data('hyprland.desktop', install_dir: join_paths(get_option('datadir'), 'wayland-sessions'), install_tag: 'runtime')

example/screenShader.frag

@@ -0,0 +1,16 @@
+//
+// Example blue light filter shader.
+// 
+
+precision mediump float;
+varying vec2 v_texcoord;
+uniform sampler2D tex;
+
+void main() {
+
+    vec4 pixColor = texture2D(tex, v_texcoord);
+
+    pixColor[2] *= 0.8;
+
+    gl_FragColor = pixColor;
+}

example/swaybg@.service

@@ -0,0 +1,13 @@
+; a primitive systemd --user example
+; see example/hyprland.service for more details
+[Unit]
+Description = %p
+BindsTo     = hyprland.service
+Wants       = hyprland.service
+After       = hyprland.service
+
+[Service]
+ExecStart = /usr/bin/swaybg --color #%i
+
+[Install]
+WantedBy = default.target

flake.lock

@@ -1,12 +1,104 @@
 {
   "nodes": {
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": "hyprlang",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711466786,
+        "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1691753796,
+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprcursor",
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1709914708,
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprlang_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711250455,
+        "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653581809,
-        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
         "type": "github"
       },
       "original": {
@@ -18,27 +110,92 @@
     },
     "root": {
       "inputs": {
+        "hyprcursor": "hyprcursor",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang_2",
         "nixpkgs": "nixpkgs",
-        "wlroots": "wlroots"
+        "systems": "systems_2",
+        "wlroots": "wlroots",
+        "xdph": "xdph"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
       }
     },
     "wlroots": {
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1653733431,
-        "narHash": "sha256-0JwNH2E9XlMVa7ZCsqxazpKwpZ2rW5QQjbk0DdZxa48=",
+        "lastModified": 1709983277,
+        "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "93ee4c7684050807e959bb3b6d57826a72fba8c2",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
         "type": "gitlab"
       }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709299639,
+        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -3,53 +3,118 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+    # <https://github.com/nix-systems/nix-systems>
+    systems.url = "github:nix-systems/default-linux";
+
     wlroots = {
-      url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org";
+      type = "gitlab";
+      host = "gitlab.freedesktop.org";
+      owner = "wlroots";
+      repo = "wlroots";
+      rev = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b";
       flake = false;
     };
+
+    hyprcursor = {
+      url = "github:hyprwm/hyprcursor";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
+
+    hyprland-protocols = {
+      url = "github:hyprwm/hyprland-protocols";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
+
+    hyprlang = {
+      url = "github:hyprwm/hyprlang";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
+
+    xdph = {
+      url = "github:hyprwm/xdg-desktop-portal-hyprland";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+      inputs.hyprland-protocols.follows = "hyprland-protocols";
+      inputs.hyprlang.follows = "hyprlang";
+    };
   };
 
   outputs = inputs @ {
     self,
     nixpkgs,
+    systems,
     ...
   }: let
     inherit (nixpkgs) lib;
-    genSystems = lib.genAttrs [
-      "x86_64-linux"
-    ];
-    pkgsFor = nixpkgs.legacyPackages;
-    # https://github.com/NixOS/rfcs/pull/107
-    mkVersion = longDate:
-      lib.concatStrings [
-        "0.pre"
-        "+date="
-        (lib.concatStringsSep "-" [
-          (__substring 0 4 longDate)
-          (__substring 4 2 longDate)
-          (__substring 6 2 longDate)
-        ])
+    eachSystem = lib.genAttrs (import systems);
+    pkgsFor = eachSystem (system:
+      import nixpkgs {
+        localSystem = system;
+        overlays = with self.overlays; [
+          hyprland-packages
+          hyprland-extras
         ];
+      });
   in {
-    packages = genSystems (system: {
-      wlroots = pkgsFor.${system}.wlroots.overrideAttrs (prev: {
-        version = mkVersion inputs.wlroots.lastModifiedDate;
-        src = inputs.wlroots;
+    overlays = import ./nix/overlays.nix {inherit self lib inputs;};
+
+    checks = eachSystem (system:
+      (lib.filterAttrs
+        (n: _: (lib.hasPrefix "hyprland" n) && !(lib.hasSuffix "debug" n))
+        self.packages.${system})
+      // {
+        inherit (self.packages.${system}) xdg-desktop-portal-hyprland;
       });
-      default = pkgsFor.${system}.callPackage ./default.nix {
-        version = mkVersion self.lastModifiedDate;
-        inherit (self.packages.${system}) wlroots;
+
+    packages = eachSystem (system: {
+      default = self.packages.${system}.hyprland;
+      inherit
+        (pkgsFor.${system})
+        # hyprland-packages
+        
+        hyprland
+        hyprland-debug
+        hyprland-legacy-renderer
+        hyprland-unwrapped
+        # hyprland-extras
+        
+        xdg-desktop-portal-hyprland
+        # dependencies
+        
+        hyprland-protocols
+        wlroots-hyprland
+        udis86
+        ;
+    });
+
+    devShells = eachSystem (system: {
+      default =
+        pkgsFor.${system}.mkShell.override {
+          stdenv = pkgsFor.${system}.gcc13Stdenv;
+        } {
+          name = "hyprland-shell";
+          nativeBuildInputs = with pkgsFor.${system}; [cmake python3 expat libxml2];
+          buildInputs = [self.packages.${system}.wlroots-hyprland];
+          hardeningDisable = ["fortify"];
+          inputsFrom = [
+            self.packages.${system}.wlroots-hyprland
+            self.packages.${system}.hyprland
+          ];
         };
     });
 
-    formatter = genSystems (system: pkgsFor.${system}.alejandra);
+    formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra);
 
-    nixosModules.default = import ./module.nix self;
-
-    # Deprecated
-    overlays.default = _: prev: {
-      hyprland = self.packages.${prev.system}.default;
+    nixosModules.default = import ./nix/module.nix inputs;
+    homeManagerModules.default = import ./nix/hm-module.nix self;
   };
-    overlay = self.overlays.default;
+
+  nixConfig = {
+    extra-substituters = ["https://hyprland.cachix.org"];
+    extra-trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
   };
 }

hyprctl/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.19)
+
+project(
+    hyprctl
+    DESCRIPTION "Control utility for Hyprland"
+)
+
+add_executable(hyprctl "main.cpp")

hyprctl/Makefile

@@ -1,4 +1,4 @@
-clean:
-	rm -rf ./hyprctl ./hyprctl
 all:
-	g++ -std=c++20 ./main.cpp -o ./hyprctl
+	$(CXX) $(CXXFLAGS) -std=c++2b ./main.cpp -o ./hyprctl
+clean:
+	rm ./hyprctl

hyprctl/main.cpp

@@ -9,27 +9,184 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
+#include <ranges>
+#include <algorithm>
+#include <signal.h>
+#include <format>
 
 #include <iostream>
 #include <string>
 #include <fstream>
 #include <string>
+#include <vector>
+#include <deque>
+#include <filesystem>
+#include <stdarg.h>
+#include <regex>
 
-const std::string USAGE = R"#(
-usage: hyprctl [command] [(opt)args]
+const std::string USAGE = R"#(usage: hyprctl [(opt)flags] [command] [(opt)args]
 
-    monitors
-    workspaces
-    clients
+commands:
     activewindow
-    layers
+    activeworkspace
+    binds
+    clients
+    configerrors
+    cursorpos
+    decorations
+    devices
+    dismissnotify
     dispatch
+    getoption
+    globalshortcuts
+    hyprpaper
+    instances
     keyword
-    version
+    kill
+    layers
+    layouts
+    monitors
+    notify
+    output
+    plugin
     reload
+    rollinglog
+    setcursor
+    seterror
+    setprop
+    splash
+    switchxkblayout
+    systeminfo
+    version
+    workspacerules
+    workspaces
+
+flags:
+    -j -> output in JSON
+    -r -> refresh state after issuing command (e.g. for updating variables)
+    --batch -> execute a batch of commands, separated by ';'
+    --instance (-i) -> use a specific instance. Can be either signature or index in hyprctl instances (0, 1, etc)
 )#";
 
-void request(std::string arg) {
+#define PAD
+
+std::string instanceSignature;
+
+struct SInstanceData {
+    std::string id;
+    uint64_t    time;
+    uint64_t    pid;
+    std::string wlSocket;
+    bool        valid = true;
+};
+
+std::vector<SInstanceData> instances() {
+    std::vector<SInstanceData> result;
+
+    for (const auto& el : std::filesystem::directory_iterator("/tmp/hypr")) {
+        if (el.is_directory() || !el.path().string().ends_with(".lock"))
+            continue;
+
+        // read lock
+        SInstanceData* data = &result.emplace_back();
+        data->id            = el.path().string();
+        data->id            = data->id.substr(data->id.find_last_of('/') + 1, data->id.find(".lock") - data->id.find_last_of('/') - 1);
+
+        try {
+            data->time = std::stoull(data->id.substr(data->id.find_first_of('_') + 1));
+        } catch (std::exception& e) { continue; }
+
+        // read file
+        std::ifstream ifs(el.path().string());
+
+        int           i = 0;
+        for (std::string line; std::getline(ifs, line); ++i) {
+            if (i == 0) {
+                try {
+                    data->pid = std::stoull(line);
+                } catch (std::exception& e) { continue; }
+            } else if (i == 1) {
+                data->wlSocket = line;
+            } else
+                break;
+        }
+
+        ifs.close();
+    }
+
+    std::erase_if(result, [&](const auto& el) { return kill(el.pid, 0) != 0 && errno == ESRCH; });
+
+    std::sort(result.begin(), result.end(), [&](const auto& a, const auto& b) { return a.time < b.time; });
+
+    return result;
+}
+
+void request(std::string arg, int minArgs = 0) {
+    const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
+
+    const auto ARGS = std::count(arg.begin(), arg.end(), ' ');
+
+    if (ARGS < minArgs) {
+        std::cout << "Not enough arguments, expected at least " << minArgs;
+        return;
+    }
+
+    if (SERVERSOCKET < 0) {
+        std::cout << "Couldn't open a socket (1)";
+        return;
+    }
+
+    if (instanceSignature.empty()) {
+        std::cout << "HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)";
+        return;
+    }
+
+    sockaddr_un serverAddress = {0};
+    serverAddress.sun_family  = AF_UNIX;
+
+    std::string socketPath = "/tmp/hypr/" + instanceSignature + "/.socket.sock";
+
+    strncpy(serverAddress.sun_path, socketPath.c_str(), sizeof(serverAddress.sun_path) - 1);
+
+    if (connect(SERVERSOCKET, (sockaddr*)&serverAddress, SUN_LEN(&serverAddress)) < 0) {
+        std::cout << "Couldn't connect to " << socketPath << ". (3)";
+        return;
+    }
+
+    auto sizeWritten = write(SERVERSOCKET, arg.c_str(), arg.length());
+
+    if (sizeWritten < 0) {
+        std::cout << "Couldn't write (4)";
+        return;
+    }
+
+    std::string reply        = "";
+    char        buffer[8192] = {0};
+
+    sizeWritten = read(SERVERSOCKET, buffer, 8192);
+
+    if (sizeWritten < 0) {
+        std::cout << "Couldn't read (5)";
+        return;
+    }
+
+    reply += std::string(buffer, sizeWritten);
+
+    while (sizeWritten == 8192) {
+        sizeWritten = read(SERVERSOCKET, buffer, 8192);
+        if (sizeWritten < 0) {
+            std::cout << "Couldn't read (5)";
+            return;
+        }
+        reply += std::string(buffer, sizeWritten);
+    }
+
+    close(SERVERSOCKET);
+
+    std::cout << reply;
+}
+
+void requestHyprpaper(std::string arg) {
     const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
 
     if (SERVERSOCKET < 0) {
@@ -37,22 +194,26 @@ void request(std::string arg) {
         return;
     }
 
-    const auto SERVER = gethostbyname("localhost");
-
-    if (!SERVER) {
-        std::cout << "Couldn't get host (2)";
+    if (instanceSignature.empty()) {
+        std::cout << "HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)";
         return;
     }
 
     sockaddr_un serverAddress = {0};
     serverAddress.sun_family  = AF_UNIX;
-    strcpy(serverAddress.sun_path, "/tmp/hypr/.socket.sock");
+
+    std::string socketPath = "/tmp/hypr/" + instanceSignature + "/.hyprpaper.sock";
+
+    strncpy(serverAddress.sun_path, socketPath.c_str(), sizeof(serverAddress.sun_path) - 1);
 
     if (connect(SERVERSOCKET, (sockaddr*)&serverAddress, SUN_LEN(&serverAddress)) < 0) {
-        std::cout << "Couldn't connect to /tmp/hypr/.socket.sock. (3) Is Hyprland running?";
+        std::cout << "Couldn't connect to " << socketPath << ". (3)";
         return;
     }
 
+    arg = arg.substr(arg.find_first_of('/') + 1); // strip flags
+    arg = arg.substr(arg.find_first_of(' ') + 1); // strip "hyprpaper"
+
     auto sizeWritten = write(SERVERSOCKET, arg.c_str(), arg.length());
 
     if (sizeWritten < 0) {
@@ -74,57 +235,191 @@ void request(std::string arg) {
     std::cout << std::string(buffer);
 }
 
-void dispatchRequest(int argc, char** argv) {
+void batchRequest(std::string arg, bool json) {
+    std::string commands = arg.substr(arg.find_first_of(" ") + 1);
 
-    if (argc < 4) {
-        std::cout << "dispatch requires 2 params";
-        return;
+    if (json) {
+        commands = "j/" + std::regex_replace(commands, std::regex(";\\s*"), ";j/");
     }
 
-    std::string rq = "dispatch " + std::string(argv[2]) + " " + std::string(argv[3]);
-
+    std::string rq = "[[BATCH]]" + commands;
     request(rq);
 }
 
-void keywordRequest(int argc, char** argv) {
-    if (argc < 4) {
-        std::cout << "keyword requires 2 params";
-        return;
+void instancesRequest(bool json) {
+    std::string result = "";
+
+    // gather instance data
+    std::vector<SInstanceData> inst = instances();
+
+    if (!json) {
+        for (auto& el : inst) {
+            result += std::format("instance {}:\n\ttime: {}\n\tpid: {}\n\twl socket: {}\n\n", el.id, el.time, el.pid, el.wlSocket);
+        }
+    } else {
+        result += '[';
+        for (auto& el : inst) {
+            result += std::format(R"#(
+{{
+    "instance": "{}",
+    "time": {},
+    "pid": {},
+    "wl_socket": "{}"
+}},)#",
+                                  el.id, el.time, el.pid, el.wlSocket);
         }
 
-    std::string rq = "keyword " + std::string(argv[2]) + " " + std::string(argv[3]);
-
-    request(rq);
+        result.pop_back();
+        result += "\n]";
     }
 
-void batchRequest(int argc, char** argv) {
-    std::string rq = "[[BATCH]]" + std::string(argv[2]);
+    std::cout << result << "\n";
+}
 
-    request(rq);
+std::deque<std::string> splitArgs(int argc, char** argv) {
+    std::deque<std::string> result;
+
+    for (auto i = 1 /* skip the executable */; i < argc; ++i)
+        result.push_back(std::string(argv[i]));
+
+    return result;
+}
+
+bool isNumber(const std::string& str, bool allowfloat) {
+    if (str.empty())
+        return false;
+    return std::ranges::all_of(str.begin(), str.end(), [&](char c) { return isdigit(c) != 0 || c == '-' || (allowfloat && c == '.'); });
 }
 
 int main(int argc, char** argv) {
-    int bflag = 0, sflag = 0, index, c;
+    bool parseArgs = true;
 
     if (argc < 2) {
-        printf("%s", USAGE.c_str());
+        printf("%s\n", USAGE.c_str());
         return 1;
     }
 
-    if (!strcmp(argv[1], "monitors")) request("monitors");
-    else if (!strcmp(argv[1], "clients")) request("clients");
-    else if (!strcmp(argv[1], "workspaces")) request("workspaces");
-    else if (!strcmp(argv[1], "activewindow")) request("activewindow");
-    else if (!strcmp(argv[1], "layers")) request("layers");
-    else if (!strcmp(argv[1], "version")) request("version");
-    else if (!strcmp(argv[1], "reload")) request("reload");
-    else if (!strcmp(argv[1], "dispatch")) dispatchRequest(argc, argv);
-    else if (!strcmp(argv[1], "keyword")) keywordRequest(argc, argv);
-    else if (!strcmp(argv[1], "--batch")) batchRequest(argc, argv);
-    else {
-        printf("%s", USAGE.c_str());
+    std::string fullRequest      = "";
+    std::string fullArgs         = "";
+    const auto  ARGS             = splitArgs(argc, argv);
+    bool        json             = false;
+    std::string overrideInstance = "";
+
+    for (std::size_t i = 0; i < ARGS.size(); ++i) {
+        if (ARGS[i] == "--") {
+            // Stop parsing arguments after --
+            parseArgs = false;
+            continue;
+        }
+        if (parseArgs && (ARGS[i][0] == '-') && !isNumber(ARGS[i], true) /* For stuff like -2 */) {
+            // parse
+            if (ARGS[i] == "-j" && !fullArgs.contains("j")) {
+                fullArgs += "j";
+                json = true;
+            } else if (ARGS[i] == "-r" && !fullArgs.contains("r")) {
+                fullArgs += "r";
+            } else if (ARGS[i] == "-a" && !fullArgs.contains("a")) {
+                fullArgs += "a";
+            } else if (ARGS[i] == "--batch") {
+                fullRequest = "--batch ";
+            } else if (ARGS[i] == "--instance" || ARGS[i] == "-i") {
+                ++i;
+
+                if (i >= ARGS.size()) {
+                    printf("%s\n", USAGE.c_str());
                     return 1;
                 }
 
+                overrideInstance = ARGS[i];
+            } else {
+                printf("%s\n", USAGE.c_str());
+                return 1;
+            }
+
+            continue;
+        }
+
+        fullRequest += ARGS[i] + " ";
+    }
+
+    if (fullRequest.empty()) {
+        printf("%s\n", USAGE.c_str());
+        return 1;
+    }
+
+    fullRequest.pop_back(); // remove trailing space
+
+    fullRequest = fullArgs + "/" + fullRequest;
+
+    // instances is HIS-independent
+    if (fullRequest.contains("/instances")) {
+        instancesRequest(json);
         return 0;
     }
+
+    if (overrideInstance.contains("_"))
+        instanceSignature = overrideInstance;
+    else if (!overrideInstance.empty()) {
+        if (!isNumber(overrideInstance, false)) {
+            std::cout << "instance invalid\n";
+            return 1;
+        }
+
+        const auto INSTANCENO = std::stoi(overrideInstance);
+
+        const auto INSTANCES = instances();
+
+        if (INSTANCENO < 0 || static_cast<std::size_t>(INSTANCENO) >= INSTANCES.size()) {
+            std::cout << "no such instance\n";
+            return 1;
+        }
+
+        instanceSignature = INSTANCES[INSTANCENO].id;
+    } else {
+        const auto ISIG = getenv("HYPRLAND_INSTANCE_SIGNATURE");
+
+        if (!ISIG) {
+            std::cout << "HYPRLAND_INSTANCE_SIGNATURE not set! (is hyprland running?)\n";
+            return 1;
+        }
+
+        instanceSignature = ISIG;
+    }
+
+    int exitStatus = 0;
+
+    if (fullRequest.contains("/--batch"))
+        batchRequest(fullRequest, json);
+    else if (fullRequest.contains("/hyprpaper"))
+        requestHyprpaper(fullRequest);
+    else if (fullRequest.contains("/switchxkblayout"))
+        request(fullRequest, 2);
+    else if (fullRequest.contains("/seterror"))
+        request(fullRequest, 1);
+    else if (fullRequest.contains("/setprop"))
+        request(fullRequest, 3);
+    else if (fullRequest.contains("/plugin"))
+        request(fullRequest, 1);
+    else if (fullRequest.contains("/dismissnotify"))
+        request(fullRequest, 0);
+    else if (fullRequest.contains("/notify"))
+        request(fullRequest, 2);
+    else if (fullRequest.contains("/output"))
+        request(fullRequest, 2);
+    else if (fullRequest.contains("/setcursor"))
+        request(fullRequest, 1);
+    else if (fullRequest.contains("/dispatch"))
+        request(fullRequest, 1);
+    else if (fullRequest.contains("/keyword"))
+        request(fullRequest, 2);
+    else if (fullRequest.contains("/decorations"))
+        request(fullRequest, 1);
+    else if (fullRequest.contains("/--help"))
+        printf("%s", USAGE.c_str());
+    else {
+        request(fullRequest);
+    }
+
+    printf("\n");
+    return exitStatus;
+}

hyprctl/meson.build

@@ -0,0 +1,3 @@
+executable('hyprctl', 'main.cpp',
+  install: true
+)

hyprland.pc.in

@@ -0,0 +1,8 @@
+prefix="@PREFIX@"
+includedir="${prefix}/include"
+
+Name: Hyprland
+URL: https://github.com/hyprwm/Hyprland
+Description: Hyprland header files
+Version: @HYPRLAND_VERSION@
+Cflags: -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots" -I"${includedir}"

hyprpm/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.19)
+
+project(
+    hyprpm
+    DESCRIPTION "A Hyprland Plugin Manager"
+)
+
+file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+
+set(CMAKE_CXX_STANDARD 23)
+
+pkg_check_modules(tomlplusplus REQUIRED IMPORTED_TARGET tomlplusplus)
+
+add_executable(hyprpm ${SRCFILES})
+
+target_link_libraries(hyprpm PUBLIC PkgConfig::tomlplusplus)

hyprpm/src/core/DataState.cpp

@@ -0,0 +1,245 @@
+#include "DataState.hpp"
+#include <toml++/toml.hpp>
+#include <iostream>
+#include <filesystem>
+#include <fstream>
+#include "PluginManager.hpp"
+
+std::string DataState::getDataStatePath() {
+    const auto HOME = getenv("HOME");
+    if (!HOME) {
+        std::cerr << "DataState: no $HOME\n";
+        throw std::runtime_error("no $HOME");
+        return "";
+    }
+
+    const auto XDG_DATA_HOME = getenv("XDG_DATA_HOME");
+
+    if (XDG_DATA_HOME)
+        return std::string{XDG_DATA_HOME} + "/hyprpm";
+    return std::string{HOME} + "/.local/share/hyprpm";
+}
+
+std::string DataState::getHeadersPath() {
+    return getDataStatePath() + "/headersRoot";
+}
+
+void DataState::ensureStateStoreExists() {
+    const auto PATH = getDataStatePath();
+
+    if (!std::filesystem::exists(PATH))
+        std::filesystem::create_directories(PATH);
+
+    if (!std::filesystem::exists(getHeadersPath()))
+        std::filesystem::create_directories(getHeadersPath());
+}
+
+void DataState::addNewPluginRepo(const SPluginRepository& repo) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath() + "/" + repo.name;
+
+    std::filesystem::create_directories(PATH);
+    // clang-format off
+    auto DATA = toml::table{
+        {"repository", toml::table{
+            {"name", repo.name},
+            {"hash", repo.hash},
+            {"url", repo.url},
+            {"rev", repo.rev}
+        }}
+    };
+    for (auto& p : repo.plugins) {
+        // copy .so to the good place
+        if (std::filesystem::exists(p.filename))
+            std::filesystem::copy_file(p.filename, PATH + "/" + p.name + ".so");
+
+        DATA.emplace(p.name, toml::table{
+            {"filename", p.name + ".so"},
+            {"enabled", p.enabled},
+            {"failed", p.failed}
+        });
+    }
+    // clang-format on
+
+    std::ofstream ofs(PATH + "/state.toml", std::ios::trunc);
+    ofs << DATA;
+    ofs.close();
+}
+
+bool DataState::pluginRepoExists(const std::string& urlOrName) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto       STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        const auto NAME = STATE["repository"]["name"].value_or("");
+        const auto URL  = STATE["repository"]["url"].value_or("");
+
+        if (URL == urlOrName || NAME == urlOrName)
+            return true;
+    }
+
+    return false;
+}
+
+void DataState::removePluginRepo(const std::string& urlOrName) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto       STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        const auto NAME = STATE["repository"]["name"].value_or("");
+        const auto URL  = STATE["repository"]["url"].value_or("");
+
+        if (URL == urlOrName || NAME == urlOrName) {
+
+            // unload the plugins!!
+            for (const auto& file : std::filesystem::directory_iterator(entry.path())) {
+                if (!file.path().string().ends_with(".so"))
+                    continue;
+
+                g_pPluginManager->loadUnloadPlugin(std::filesystem::absolute(file.path()), false);
+            }
+
+            std::filesystem::remove_all(entry.path());
+            return;
+        }
+    }
+}
+
+void DataState::updateGlobalState(const SGlobalState& state) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    std::filesystem::create_directories(PATH);
+    // clang-format off
+    auto DATA = toml::table{
+        {"state", toml::table{
+            {"hash", state.headersHashCompiled},
+            {"dont_warn_install", state.dontWarnInstall}
+        }}
+    };
+    // clang-format on
+
+    std::ofstream ofs(PATH + "/state.toml", std::ios::trunc);
+    ofs << DATA;
+    ofs.close();
+}
+
+SGlobalState DataState::getGlobalState() {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    if (!std::filesystem::exists(PATH + "/state.toml"))
+        return SGlobalState{};
+
+    auto         DATA = toml::parse_file(PATH + "/state.toml");
+
+    SGlobalState state;
+    state.headersHashCompiled = DATA["state"]["hash"].value_or("");
+    state.dontWarnInstall     = DATA["state"]["dont_warn_install"].value_or(false);
+
+    return state;
+}
+
+std::vector<SPluginRepository> DataState::getAllRepositories() {
+    ensureStateStoreExists();
+
+    const auto                     PATH = getDataStatePath();
+
+    std::vector<SPluginRepository> repos;
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto              STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        const auto        NAME = STATE["repository"]["name"].value_or("");
+        const auto        URL  = STATE["repository"]["url"].value_or("");
+        const auto        REV  = STATE["repository"]["rev"].value_or("");
+        const auto        HASH = STATE["repository"]["hash"].value_or("");
+
+        SPluginRepository repo;
+        repo.hash = HASH;
+        repo.name = NAME;
+        repo.url  = URL;
+        repo.rev  = REV;
+
+        for (const auto& [key, val] : STATE) {
+            if (key == "repository")
+                continue;
+
+            const auto ENABLED  = STATE[key]["enabled"].value_or(false);
+            const auto FAILED   = STATE[key]["failed"].value_or(false);
+            const auto FILENAME = STATE[key]["filename"].value_or("");
+
+            repo.plugins.push_back(SPlugin{std::string{key.str()}, FILENAME, ENABLED, FAILED});
+        }
+
+        repos.push_back(repo);
+    }
+
+    return repos;
+}
+
+bool DataState::setPluginEnabled(const std::string& name, bool enabled) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        for (const auto& [key, val] : STATE) {
+            if (key == "repository")
+                continue;
+
+            if (key.str() != name)
+                continue;
+
+            const auto FAILED = STATE[key]["failed"].value_or(false);
+
+            if (FAILED)
+                return false;
+
+            (*STATE[key].as_table()).insert_or_assign("enabled", enabled);
+
+            std::ofstream state(entry.path().string() + "/state.toml", std::ios::trunc);
+            state << STATE;
+            state.close();
+
+            return true;
+        }
+    }
+
+    return false;
+}

hyprpm/src/core/DataState.hpp

@@ -0,0 +1,22 @@
+#pragma once
+#include <string>
+#include <vector>
+#include "Plugin.hpp"
+
+struct SGlobalState {
+    std::string headersHashCompiled = "";
+    bool        dontWarnInstall     = false;
+};
+
+namespace DataState {
+    std::string                    getDataStatePath();
+    std::string                    getHeadersPath();
+    void                           ensureStateStoreExists();
+    void                           addNewPluginRepo(const SPluginRepository& repo);
+    void                           removePluginRepo(const std::string& urlOrName);
+    bool                           pluginRepoExists(const std::string& urlOrName);
+    void                           updateGlobalState(const SGlobalState& state);
+    SGlobalState                   getGlobalState();
+    bool                           setPluginEnabled(const std::string& name, bool enabled);
+    std::vector<SPluginRepository> getAllRepositories();
+};

hyprpm/src/core/Manifest.cpp

@@ -0,0 +1,104 @@
+#include "Manifest.hpp"
+#include <toml++/toml.hpp>
+#include <iostream>
+
+CManifest::CManifest(const eManifestType type, const std::string& path) {
+    auto manifest = toml::parse_file(path);
+
+    if (type == MANIFEST_HYPRLOAD) {
+        for (auto& [key, val] : manifest) {
+            if (key.str().ends_with(".build"))
+                continue;
+
+            CManifest::SManifestPlugin plugin;
+            plugin.name = key;
+            m_vPlugins.push_back(plugin);
+        }
+
+        for (auto& plugin : m_vPlugins) {
+            plugin.description = manifest[plugin.name]["description"].value_or("?");
+            plugin.version     = manifest[plugin.name]["version"].value_or("?");
+            plugin.output      = manifest[plugin.name]["build"]["output"].value_or("?");
+            auto authors       = manifest[plugin.name]["authors"].as_array();
+            if (authors) {
+                for (auto&& a : *authors) {
+                    plugin.authors.push_back(a.as_string()->value_or("?"));
+                }
+            } else {
+                auto author = manifest[plugin.name]["author"].value_or("");
+                if (!std::string{author}.empty())
+                    plugin.authors.push_back(author);
+            }
+            auto buildSteps = manifest[plugin.name]["build"]["steps"].as_array();
+            if (buildSteps) {
+                for (auto&& s : *buildSteps) {
+                    plugin.buildSteps.push_back(s.as_string()->value_or("?"));
+                }
+            }
+
+            if (plugin.output.empty() || plugin.buildSteps.empty()) {
+                m_bGood = false;
+                return;
+            }
+        }
+    } else if (type == MANIFEST_HYPRPM) {
+        m_sRepository.name = manifest["repository"]["name"].value_or("");
+        auto authors       = manifest["repository"]["authors"].as_array();
+        if (authors) {
+            for (auto&& a : *authors) {
+                m_sRepository.authors.push_back(a.as_string()->value_or("?"));
+            }
+        } else {
+            auto author = manifest["repository"]["author"].value_or("");
+            if (!std::string{author}.empty())
+                m_sRepository.authors.push_back(author);
+        }
+
+        auto pins = manifest["repository"]["commit_pins"].as_array();
+        if (pins) {
+            for (auto&& pin : *pins) {
+                auto pinArr = pin.as_array();
+                if (pinArr && pinArr->get(1))
+                    m_sRepository.commitPins.push_back(std::make_pair<>(pinArr->get(0)->as_string()->get(), pinArr->get(1)->as_string()->get()));
+            }
+        }
+
+        for (auto& [key, val] : manifest) {
+            if (key.str() == "repository")
+                continue;
+
+            CManifest::SManifestPlugin plugin;
+            plugin.name = key;
+            m_vPlugins.push_back(plugin);
+        }
+
+        for (auto& plugin : m_vPlugins) {
+            plugin.description = manifest[plugin.name]["description"].value_or("?");
+            plugin.output      = manifest[plugin.name]["output"].value_or("?");
+            auto authors       = manifest[plugin.name]["authors"].as_array();
+            if (authors) {
+                for (auto&& a : *authors) {
+                    plugin.authors.push_back(a.as_string()->value_or("?"));
+                }
+            } else {
+                auto author = manifest[plugin.name]["author"].value_or("");
+                if (!std::string{author}.empty())
+                    plugin.authors.push_back(author);
+            }
+            auto buildSteps = manifest[plugin.name]["build"].as_array();
+            if (buildSteps) {
+                for (auto&& s : *buildSteps) {
+                    plugin.buildSteps.push_back(s.as_string()->value_or("?"));
+                }
+            }
+
+            if (plugin.output.empty() || plugin.buildSteps.empty()) {
+                m_bGood = false;
+                return;
+            }
+        }
+    } else {
+        // ???
+        m_bGood = false;
+    }
+}

hyprpm/src/core/Manifest.hpp

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+enum eManifestType {
+    MANIFEST_HYPRLOAD,
+    MANIFEST_HYPRPM
+};
+
+class CManifest {
+  public:
+    CManifest(const eManifestType type, const std::string& path);
+
+    struct SManifestPlugin {
+        std::string              name;
+        std::string              description;
+        std::string              version;
+        std::vector<std::string> authors;
+        std::vector<std::string> buildSteps;
+        std::string              output;
+        bool                     failed = false;
+    };
+
+    struct {
+        std::string                                      name;
+        std::vector<std::string>                         authors;
+        std::vector<std::pair<std::string, std::string>> commitPins;
+    } m_sRepository;
+
+    std::vector<SManifestPlugin> m_vPlugins;
+    bool                         m_bGood = true;
+};

hyprpm/src/core/Plugin.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+struct SPlugin {
+    std::string name;
+    std::string filename;
+    bool        enabled = false;
+    bool        failed  = false;
+};
+
+struct SPluginRepository {
+    std::string          url;
+    std::string          rev;
+    std::string          name;
+    std::vector<SPlugin> plugins;
+    std::string          hash;
+};

hyprpm/src/core/PluginManager.cpp

@@ -0,0 +1,794 @@
+#include "PluginManager.hpp"
+#include "../helpers/Colors.hpp"
+#include "../progress/CProgressBar.hpp"
+#include "Manifest.hpp"
+#include "DataState.hpp"
+
+#include <iostream>
+#include <array>
+#include <filesystem>
+#include <thread>
+#include <fstream>
+#include <algorithm>
+#include <format>
+
+#include <toml++/toml.hpp>
+
+static std::string removeBeginEndSpacesTabs(std::string str) {
+    if (str.empty())
+        return str;
+
+    int countBefore = 0;
+    while (str[countBefore] == ' ' || str[countBefore] == '\t') {
+        countBefore++;
+    }
+
+    int countAfter = 0;
+    while ((int)str.length() - countAfter - 1 >= 0 && (str[str.length() - countAfter - 1] == ' ' || str[str.length() - 1 - countAfter] == '\t')) {
+        countAfter++;
+    }
+
+    str = str.substr(countBefore, str.length() - countBefore - countAfter);
+
+    return str;
+}
+
+static std::string execAndGet(std::string cmd) {
+    cmd += " 2>&1";
+    std::array<char, 128>                          buffer;
+    std::string                                    result;
+    const std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.c_str(), "r"), pclose);
+    if (!pipe)
+        return "";
+
+    while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr) {
+        result += buffer.data();
+    }
+    return result;
+}
+
+SHyprlandVersion CPluginManager::getHyprlandVersion() {
+    static SHyprlandVersion ver;
+    static bool             once = false;
+
+    if (once)
+        return ver;
+
+    once                 = true;
+    const auto HLVERCALL = execAndGet("hyprctl version");
+    if (m_bVerbose)
+        std::cout << Colors::BLUE << "[v] " << Colors::RESET << "version returned: " << HLVERCALL << "\n";
+
+    if (!HLVERCALL.contains("Tag:")) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " You don't seem to be running Hyprland.";
+        return SHyprlandVersion{};
+    }
+
+    std::string hlcommit = HLVERCALL.substr(HLVERCALL.find("at commit") + 10);
+    hlcommit             = hlcommit.substr(0, hlcommit.find_first_of(' '));
+
+    std::string hlbranch = HLVERCALL.substr(HLVERCALL.find("from branch") + 12);
+    hlbranch             = hlbranch.substr(0, hlbranch.find(" at commit "));
+
+    if (m_bVerbose)
+        std::cout << Colors::BLUE << "[v] " << Colors::RESET << "parsed commit " << hlcommit << " at branch " << hlbranch << "\n";
+
+    ver = SHyprlandVersion{hlbranch, hlcommit};
+    return ver;
+}
+
+bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string& rev) {
+    const auto HLVER = getHyprlandVersion();
+
+    if (DataState::pluginRepoExists(url)) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the plugin repository. Repository already installed.\n";
+        return false;
+    }
+
+    auto GLOBALSTATE = DataState::getGlobalState();
+    if (!GLOBALSTATE.dontWarnInstall) {
+        std::cout << Colors::YELLOW << "!" << Colors::RED << " Disclaimer:\n  " << Colors::RESET
+                  << "plugins, especially not official, have no guarantee of stability, availablity or security.\n  Run them at your own risk.\n  "
+                  << "This message will not appear again.\n";
+        GLOBALSTATE.dontWarnInstall = true;
+        DataState::updateGlobalState(GLOBALSTATE);
+    }
+
+    std::cout << Colors::GREEN << "✔" << Colors::RESET << Colors::RED << " adding a new plugin repository " << Colors::RESET << "from " << url << "\n  " << Colors::RED
+              << "MAKE SURE" << Colors::RESET << " that you trust the authors. " << Colors::RED << "DO NOT" << Colors::RESET
+              << " install random plugins without verifying the code and author.\n  "
+              << "Are you sure? [Y/n] ";
+    std::fflush(stdout);
+    std::string input;
+    std::getline(std::cin, input);
+
+    if (input.size() > 0 && input[0] != 'Y' && input[0] != 'y') {
+        std::cout << "Aborting.\n";
+        return false;
+    }
+
+    CProgressBar progress;
+    progress.m_iMaxSteps        = 5;
+    progress.m_iSteps           = 0;
+    progress.m_szCurrentMessage = "Cloning the plugin repository";
+
+    progress.print();
+
+    if (!std::filesystem::exists("/tmp/hyprpm")) {
+        std::filesystem::create_directory("/tmp/hyprpm");
+        std::filesystem::permissions("/tmp/hyprpm", std::filesystem::perms::all, std::filesystem::perm_options::replace);
+    }
+
+    if (std::filesystem::exists("/tmp/hyprpm/new")) {
+        progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " old plugin repo build files found in temp directory, removing.");
+        std::filesystem::remove_all("/tmp/hyprpm/new");
+    }
+
+    progress.printMessageAbove(std::string{Colors::RESET} + " → Cloning " + url);
+
+    std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive " + url + " new");
+
+    if (!std::filesystem::exists("/tmp/hyprpm/new")) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the plugin repository. shell returned:\n" << ret << "\n";
+        return false;
+    }
+
+    if (!rev.empty()) {
+        std::string ret = execAndGet("git -C /tmp/hyprpm/new reset --hard --recurse-submodules " + rev);
+        if (ret.compare(0, 6, "fatal:") == 0) {
+            std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not check out revision " << rev << ". shell returned:\n" << ret << "\n";
+            return false;
+        }
+    }
+
+    progress.m_iSteps = 1;
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " cloned");
+    progress.m_szCurrentMessage = "Reading the manifest";
+    progress.print();
+
+    std::unique_ptr<CManifest> pManifest;
+
+    if (std::filesystem::exists("/tmp/hyprpm/new/hyprpm.toml")) {
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprpm manifest");
+        pManifest = std::make_unique<CManifest>(MANIFEST_HYPRPM, "/tmp/hyprpm/new/hyprpm.toml");
+    } else if (std::filesystem::exists("/tmp/hyprpm/new/hyprload.toml")) {
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprload manifest");
+        pManifest = std::make_unique<CManifest>(MANIFEST_HYPRLOAD, "/tmp/hyprpm/new/hyprload.toml");
+    }
+
+    if (!pManifest) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository does not have a valid manifest\n";
+        return false;
+    }
+
+    if (!pManifest->m_bGood) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository has a corrupted manifest\n";
+        return false;
+    }
+
+    progress.m_iSteps = 2;
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " parsed manifest, found " + std::to_string(pManifest->m_vPlugins.size()) + " plugins:");
+    for (auto& pl : pManifest->m_vPlugins) {
+        std::string message = std::string{Colors::RESET} + " → " + pl.name + " by ";
+        for (auto& a : pl.authors) {
+            message += a + ", ";
+        }
+        if (pl.authors.size() > 0) {
+            message.pop_back();
+            message.pop_back();
+        }
+        message += " version " + pl.version;
+        progress.printMessageAbove(message);
+    }
+
+    if (!pManifest->m_sRepository.commitPins.empty()) {
+        // check commit pins
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Manifest has " + std::to_string(pManifest->m_sRepository.commitPins.size()) + " pins, checking");
+
+        for (auto& [hl, plugin] : pManifest->m_sRepository.commitPins) {
+            if (hl != HLVER.hash)
+                continue;
+
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " commit pin " + plugin + " matched hl, resetting");
+
+            execAndGet("cd /tmp/hyprpm/new/ && git reset --hard --recurse-submodules " + plugin);
+        }
+    }
+
+    progress.m_szCurrentMessage = "Verifying headers";
+    progress.print();
+
+    const auto HEADERSSTATUS = headersValid();
+
+    if (HEADERSSTATUS != HEADERS_OK) {
+        std::cerr << "\n" << headerError(HEADERSSTATUS);
+        return false;
+    }
+
+    progress.m_iSteps = 3;
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " Hyprland headers OK");
+    progress.m_szCurrentMessage = "Building plugin(s)";
+    progress.print();
+
+    for (auto& p : pManifest->m_vPlugins) {
+        std::string out;
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + p.name);
+
+        for (auto& bs : p.buildSteps) {
+            std::string cmd = std::format("cd /tmp/hyprpm/new && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", DataState::getHeadersPath(), bs);
+            out += " -> " + cmd + "\n" + execAndGet(cmd) + "\n";
+        }
+
+        if (m_bVerbose)
+            std::cout << Colors::BLUE << "[v] " << Colors::RESET << "shell returned: " << out << "\n";
+
+        if (!std::filesystem::exists("/tmp/hyprpm/new/" + p.output)) {
+            progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " Plugin " + p.name + " failed to build.\n");
+
+            p.failed = true;
+
+            continue;
+        }
+
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " built " + p.name + " into " + p.output);
+    }
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " all plugins built");
+    progress.m_iSteps           = 4;
+    progress.m_szCurrentMessage = "Installing repository";
+    progress.print();
+
+    // add repo toml to DataState
+    SPluginRepository repo;
+    std::string       repohash = execAndGet("cd /tmp/hyprpm/new/ && git rev-parse HEAD");
+    if (repohash.length() > 0)
+        repohash.pop_back();
+    repo.name = pManifest->m_sRepository.name.empty() ? url.substr(url.find_last_of('/') + 1) : pManifest->m_sRepository.name;
+    repo.url  = url;
+    repo.rev  = rev;
+    repo.hash = repohash;
+    for (auto& p : pManifest->m_vPlugins) {
+        repo.plugins.push_back(SPlugin{p.name, "/tmp/hyprpm/new/" + p.output, false, p.failed});
+    }
+    DataState::addNewPluginRepo(repo);
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " installed repository");
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " you can now enable the plugin(s) with hyprpm enable");
+    progress.m_iSteps           = 5;
+    progress.m_szCurrentMessage = "Done!";
+    progress.print();
+
+    std::cout << "\n";
+
+    // remove build files
+    std::filesystem::remove_all("/tmp/hyprpm/new");
+
+    return true;
+}
+
+bool CPluginManager::removePluginRepo(const std::string& urlOrName) {
+    if (!DataState::pluginRepoExists(urlOrName)) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not remove the repository. Repository is not installed.\n";
+        return false;
+    }
+
+    std::cout << Colors::YELLOW << "!" << Colors::RESET << Colors::RED << " removing a plugin repository: " << Colors::RESET << urlOrName << "\n  "
+              << "Are you sure? [Y/n] ";
+    std::fflush(stdout);
+    std::string input;
+    std::getline(std::cin, input);
+
+    if (input.size() > 0 && input[0] != 'Y' && input[0] != 'y') {
+        std::cout << "Aborting.\n";
+        return false;
+    }
+
+    DataState::removePluginRepo(urlOrName);
+
+    return true;
+}
+
+eHeadersErrors CPluginManager::headersValid() {
+    const auto HLVER = getHyprlandVersion();
+
+    if (!std::filesystem::exists(DataState::getHeadersPath() + "/share/pkgconfig/hyprland.pc"))
+        return HEADERS_MISSING;
+
+    // find headers commit
+    std::string cmd     = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkg-config --cflags --keep-system-cflags hyprland", DataState::getHeadersPath());
+    auto        headers = execAndGet(cmd.c_str());
+
+    if (!headers.contains("-I/"))
+        return HEADERS_MISSING;
+
+    headers.pop_back(); // pop newline
+
+    std::string verHeader = "";
+
+    while (!headers.empty()) {
+        const auto PATH = headers.substr(0, headers.find(" -I/", 3));
+
+        if (headers.find(" -I/", 3) != std::string::npos)
+            headers = headers.substr(headers.find("-I/", 3));
+        else
+            headers = "";
+
+        if (PATH.ends_with("protocols") || PATH.ends_with("wlroots"))
+            continue;
+
+        verHeader = removeBeginEndSpacesTabs(PATH.substr(2)) + "/hyprland/src/version.h";
+        break;
+    }
+
+    if (verHeader.empty())
+        return HEADERS_CORRUPTED;
+
+    // read header
+    std::ifstream ifs(verHeader);
+    if (!ifs.good())
+        return HEADERS_CORRUPTED;
+
+    std::string verHeaderContent((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
+    ifs.close();
+
+    const auto HASHPOS = verHeaderContent.find("#define GIT_COMMIT_HASH");
+
+    if (HASHPOS == std::string::npos || HASHPOS + 23 >= verHeaderContent.length())
+        return HEADERS_CORRUPTED;
+
+    std::string hash = verHeaderContent.substr(HASHPOS + 23);
+    hash             = hash.substr(0, hash.find_first_of('\n'));
+    hash             = hash.substr(hash.find_first_of('"') + 1);
+    hash             = hash.substr(0, hash.find_first_of('"'));
+
+    if (hash != HLVER.hash)
+        return HEADERS_MISMATCHED;
+
+    return HEADERS_OK;
+}
+
+bool CPluginManager::updateHeaders(bool force) {
+
+    DataState::ensureStateStoreExists();
+
+    const auto HLVER = getHyprlandVersion();
+
+    if (!std::filesystem::exists("/tmp/hyprpm")) {
+        std::filesystem::create_directory("/tmp/hyprpm");
+        std::filesystem::permissions("/tmp/hyprpm", std::filesystem::perms::all, std::filesystem::perm_options::replace);
+    }
+
+    if (!force && headersValid() == HEADERS_OK) {
+        std::cout << "\n" << std::string{Colors::GREEN} + "✔" + Colors::RESET + " Headers up to date.\n";
+        return true;
+    }
+
+    CProgressBar progress;
+    progress.m_iMaxSteps        = 5;
+    progress.m_iSteps           = 0;
+    progress.m_szCurrentMessage = "Cloning the hyprland repository";
+    progress.print();
+
+    if (std::filesystem::exists("/tmp/hyprpm/hyprland")) {
+        progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " old hyprland source files found in temp directory, removing.");
+        std::filesystem::remove_all("/tmp/hyprpm/hyprland");
+    }
+
+    progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " Cloning https://github.com/hyprwm/hyprland, this might take a moment.");
+
+    std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive https://github.com/hyprwm/hyprland hyprland");
+
+    if (!std::filesystem::exists("/tmp/hyprpm/hyprland")) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the hyprland repository. shell returned:\n" << ret << "\n";
+        return false;
+    }
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " cloned");
+    progress.m_iSteps           = 2;
+    progress.m_szCurrentMessage = "Checking out sources";
+    progress.print();
+
+    ret =
+        execAndGet("cd /tmp/hyprpm/hyprland && git checkout " + HLVER.branch + " 2>&1 && git submodule update --init 2>&1 && git reset --hard --recurse-submodules " + HLVER.hash);
+
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "git returned: " + ret);
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " checked out to running ver");
+    progress.m_iSteps           = 3;
+    progress.m_szCurrentMessage = "Building Hyprland";
+    progress.print();
+
+    progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " configuring Hyprland");
+
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "setting PREFIX for cmake to " + DataState::getHeadersPath());
+
+    ret = execAndGet(
+        std::format("cd /tmp/hyprpm/hyprland && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=\"{}\" -S . -B ./build -G Ninja",
+                    DataState::getHeadersPath()));
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "cmake returned: " + ret);
+
+    // le hack. Wlroots has to generate its build/include
+    ret = execAndGet("cd /tmp/hyprpm/hyprland/subprojects/wlroots && meson setup -Drenderers=gles2 -Dexamples=false build");
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "meson returned: " + ret);
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " configured Hyprland");
+    progress.m_iSteps           = 4;
+    progress.m_szCurrentMessage = "Installing sources";
+    progress.print();
+
+    // progress.printMessageAbove(
+    //     std::string{Colors::YELLOW} + "!" + Colors::RESET +
+    //     " in order to install the sources, you will need to input your password.\n  If nothing pops up, make sure you have polkit and an authentication daemon running.");
+
+    std::string cmd = std::format("sed -i -e \"s#PREFIX = /usr/local#PREFIX = {}#\" /tmp/hyprpm/hyprland/Makefile && cd /tmp/hyprpm/hyprland && make installheaders",
+                                  DataState::getHeadersPath());
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "installation will run: " + cmd);
+
+    ret = execAndGet(cmd);
+
+    if (m_bVerbose)
+        std::cout << Colors::BLUE << "[v] " << Colors::RESET << "installer returned: " << ret << "\n";
+
+    // remove build files
+    std::filesystem::remove_all("/tmp/hyprpm/hyprland");
+
+    auto HEADERSVALID = headersValid();
+    if (HEADERSVALID == HEADERS_OK) {
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " installed headers");
+        progress.m_iSteps           = 5;
+        progress.m_szCurrentMessage = "Done!";
+        progress.print();
+
+        std::cout << "\n";
+    } else {
+        progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " failed to install headers with error code " + std::to_string((int)HEADERSVALID));
+        progress.m_iSteps           = 5;
+        progress.m_szCurrentMessage = "Failed";
+        progress.print();
+
+        std::cout << "\n";
+
+        std::cerr << "\n" << headerError(HEADERSVALID);
+
+        return false;
+    }
+
+    return true;
+}
+
+bool CPluginManager::updatePlugins(bool forceUpdateAll) {
+    if (headersValid() != HEADERS_OK) {
+        std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " headers are not up-to-date, please run hyprpm update.\n";
+        return false;
+    }
+
+    const auto REPOS = DataState::getAllRepositories();
+
+    if (REPOS.size() < 1) {
+        std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " No repos to update.\n";
+        return true;
+    }
+
+    const auto   HLVER = getHyprlandVersion();
+
+    CProgressBar progress;
+    progress.m_iMaxSteps        = REPOS.size() * 2 + 2;
+    progress.m_iSteps           = 0;
+    progress.m_szCurrentMessage = "Updating repositories";
+    progress.print();
+
+    for (auto& repo : REPOS) {
+        bool update = forceUpdateAll;
+
+        progress.m_iSteps++;
+        progress.m_szCurrentMessage = "Updating " + repo.name;
+        progress.print();
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → checking for updates for " + repo.name);
+
+        if (std::filesystem::exists("/tmp/hyprpm/update")) {
+            progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " old update build files found in temp directory, removing.");
+            std::filesystem::remove_all("/tmp/hyprpm/update");
+        }
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Cloning " + repo.url);
+
+        std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive " + repo.url + " update");
+
+        if (!std::filesystem::exists("/tmp/hyprpm/update")) {
+            std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " could not clone repo: shell returned:\n" + ret;
+            return false;
+        }
+
+        if (!repo.rev.empty()) {
+            progress.printMessageAbove(std::string{Colors::RESET} + " → Plugin has revision set, resetting: " + repo.rev);
+
+            std::string ret = execAndGet("git -C /tmp/hyprpm reset --hard --recurse-submodules " + repo.rev);
+            if (ret.compare(0, 6, "fatal:") == 0) {
+                std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " could not check out revision " + repo.rev + ": shell returned:\n" + ret;
+                return false;
+            }
+        }
+
+        if (!update) {
+            // check if git has updates
+            std::string hash = execAndGet("cd /tmp/hyprpm/update && git rev-parse HEAD");
+            if (!hash.empty())
+                hash.pop_back();
+
+            update = update || hash != repo.hash;
+        }
+
+        if (!update) {
+            std::filesystem::remove_all("/tmp/hyprpm/update");
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " repository " + repo.name + " is up-to-date.");
+            progress.m_iSteps++;
+            progress.print();
+            continue;
+        }
+
+        // we need to update
+
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " repository " + repo.name + " has updates.");
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + repo.name);
+        progress.m_iSteps++;
+        progress.print();
+
+        std::unique_ptr<CManifest> pManifest;
+
+        if (std::filesystem::exists("/tmp/hyprpm/update/hyprpm.toml")) {
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprpm manifest");
+            pManifest = std::make_unique<CManifest>(MANIFEST_HYPRPM, "/tmp/hyprpm/update/hyprpm.toml");
+        } else if (std::filesystem::exists("/tmp/hyprpm/update/hyprload.toml")) {
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprload manifest");
+            pManifest = std::make_unique<CManifest>(MANIFEST_HYPRLOAD, "/tmp/hyprpm/update/hyprload.toml");
+        }
+
+        if (!pManifest) {
+            std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository does not have a valid manifest\n";
+            continue;
+        }
+
+        if (!pManifest->m_bGood) {
+            std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository has a corrupted manifest\n";
+            continue;
+        }
+
+        if (repo.rev.empty() && !pManifest->m_sRepository.commitPins.empty()) {
+            // check commit pins unless a revision is specified
+
+            progress.printMessageAbove(std::string{Colors::RESET} + " → Manifest has " + std::to_string(pManifest->m_sRepository.commitPins.size()) + " pins, checking");
+
+            for (auto& [hl, plugin] : pManifest->m_sRepository.commitPins) {
+                if (hl != HLVER.hash)
+                    continue;
+
+                progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " commit pin " + plugin + " matched hl, resetting");
+
+                execAndGet("cd /tmp/hyprpm/update/ && git reset --hard --recurse-submodules " + plugin);
+            }
+        }
+
+        bool failed = false;
+        for (auto& p : pManifest->m_vPlugins) {
+            std::string out;
+
+            progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + p.name);
+
+            for (auto& bs : p.buildSteps) {
+                std::string cmd = std::format("cd /tmp/hyprpm/update && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", DataState::getHeadersPath(), bs);
+                out += " -> " + cmd + "\n" + execAndGet(cmd) + "\n";
+            }
+
+            if (m_bVerbose)
+                std::cout << Colors::BLUE << "[v] " << Colors::RESET << "shell returned: " << out << "\n";
+
+            if (!std::filesystem::exists("/tmp/hyprpm/update/" + p.output)) {
+                std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Plugin " << p.name << " failed to build.\n";
+                failed = true;
+                break;
+            }
+
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " built " + p.name + " into " + p.output);
+        }
+
+        if (failed)
+            continue;
+
+        // add repo toml to DataState
+        SPluginRepository newrepo = repo;
+        newrepo.plugins.clear();
+        execAndGet(
+            "cd /tmp/hyprpm/update/ && git pull --recurse-submodules && git reset --hard --recurse-submodules"); // repo hash in the state.toml has to match head and not any pin
+        std::string repohash = execAndGet("cd /tmp/hyprpm/update && git rev-parse HEAD");
+        if (repohash.length() > 0)
+            repohash.pop_back();
+        newrepo.hash = repohash;
+        for (auto& p : pManifest->m_vPlugins) {
+            const auto OLDPLUGINIT = std::find_if(repo.plugins.begin(), repo.plugins.end(), [&](const auto& other) { return other.name == p.name; });
+            newrepo.plugins.push_back(SPlugin{p.name, "/tmp/hyprpm/update/" + p.output, OLDPLUGINIT != repo.plugins.end() ? OLDPLUGINIT->enabled : false});
+        }
+        DataState::removePluginRepo(newrepo.name);
+        DataState::addNewPluginRepo(newrepo);
+
+        std::filesystem::remove_all("/tmp/hyprpm/update");
+
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " updated " + repo.name);
+    }
+
+    progress.m_iSteps++;
+    progress.m_szCurrentMessage = "Updating global state...";
+    progress.print();
+
+    auto GLOBALSTATE                = DataState::getGlobalState();
+    GLOBALSTATE.headersHashCompiled = HLVER.hash;
+    DataState::updateGlobalState(GLOBALSTATE);
+
+    progress.m_iSteps++;
+    progress.m_szCurrentMessage = "Done!";
+    progress.print();
+
+    std::cout << "\n";
+
+    return true;
+}
+
+bool CPluginManager::enablePlugin(const std::string& name) {
+    bool ret = DataState::setPluginEnabled(name, true);
+    if (ret)
+        std::cout << Colors::GREEN << "✔" << Colors::RESET << " Enabled " << name << "\n";
+    return ret;
+}
+
+bool CPluginManager::disablePlugin(const std::string& name) {
+    bool ret = DataState::setPluginEnabled(name, false);
+    if (ret)
+        std::cout << Colors::GREEN << "✔" << Colors::RESET << " Disabled " << name << "\n";
+    return ret;
+}
+
+ePluginLoadStateReturn CPluginManager::ensurePluginsLoadState() {
+    if (headersValid() != HEADERS_OK) {
+        std::cerr << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " headers are not up-to-date, please run hyprpm update.\n";
+        return LOADSTATE_HEADERS_OUTDATED;
+    }
+
+    const auto HOME = getenv("HOME");
+    const auto HIS  = getenv("HYPRLAND_INSTANCE_SIGNATURE");
+    if (!HOME || !HIS) {
+        std::cerr << "PluginManager: no $HOME or HIS\n";
+        return LOADSTATE_FAIL;
+    }
+    const auto               HYPRPMPATH = DataState::getDataStatePath() + "/";
+
+    auto                     pluginLines = execAndGet("hyprctl plugins list | grep Plugin");
+
+    std::vector<std::string> loadedPlugins;
+
+    std::cout << Colors::GREEN << "✔" << Colors::RESET << " Ensuring plugin load state\n";
+
+    // iterate line by line
+    while (!pluginLines.empty()) {
+        auto plLine = pluginLines.substr(0, pluginLines.find("\n"));
+
+        if (pluginLines.find("\n") != std::string::npos)
+            pluginLines = pluginLines.substr(pluginLines.find("\n") + 1);
+        else
+            pluginLines = "";
+
+        if (plLine.back() != ':')
+            continue;
+
+        plLine = plLine.substr(7);
+        plLine = plLine.substr(0, plLine.find(" by "));
+
+        loadedPlugins.push_back(plLine);
+    }
+
+    // get state
+    const auto REPOS = DataState::getAllRepositories();
+
+    auto       enabled = [REPOS](const std::string& plugin) -> bool {
+        for (auto& r : REPOS) {
+            for (auto& p : r.plugins) {
+                if (p.name == plugin && p.enabled)
+                    return true;
+            }
+        }
+
+        return false;
+    };
+
+    auto repoForName = [REPOS](const std::string& name) -> std::string {
+        for (auto& r : REPOS) {
+            for (auto& p : r.plugins) {
+                if (p.name == name)
+                    return r.name;
+            }
+        }
+
+        return "";
+    };
+
+    // unload disabled plugins
+    for (auto& p : loadedPlugins) {
+        if (!enabled(p)) {
+            // unload
+            loadUnloadPlugin(HYPRPMPATH + repoForName(p) + "/" + p + ".so", false);
+            std::cout << Colors::GREEN << "✔" << Colors::RESET << " Unloaded " << p << "\n";
+        }
+    }
+
+    // load enabled plugins
+    for (auto& r : REPOS) {
+        for (auto& p : r.plugins) {
+            if (!p.enabled)
+                continue;
+
+            if (std::find_if(loadedPlugins.begin(), loadedPlugins.end(), [&](const auto& other) { return other == p.name; }) != loadedPlugins.end())
+                continue;
+
+            loadUnloadPlugin(HYPRPMPATH + repoForName(p.name) + "/" + p.filename, true);
+            std::cout << Colors::GREEN << "✔" << Colors::RESET << " Loaded " << p.name << "\n";
+        }
+    }
+
+    std::cout << Colors::GREEN << "✔" << Colors::RESET << " Plugin load state ensured\n";
+
+    return LOADSTATE_OK;
+}
+
+bool CPluginManager::loadUnloadPlugin(const std::string& path, bool load) {
+    if (load)
+        execAndGet("hyprctl plugin load " + path);
+    else
+        execAndGet("hyprctl plugin unload " + path);
+
+    return true;
+}
+
+void CPluginManager::listAllPlugins() {
+    const auto REPOS = DataState::getAllRepositories();
+
+    for (auto& r : REPOS) {
+        std::cout << std::string{Colors::RESET} + " → Repository " + r.name + ":\n";
+
+        for (auto& p : r.plugins) {
+
+            std::cout << std::string{Colors::RESET} + "  │ Plugin " + p.name;
+
+            if (!p.failed)
+                std::cout << "\n  └─ enabled: " << (p.enabled ? Colors::GREEN : Colors::RED) << (p.enabled ? "true" : "false") << Colors::RESET << "\n";
+            else
+                std::cout << "\n  └─ enabled: " << Colors::RED << "Plugin failed to build" << Colors::RESET << "\n";
+        }
+    }
+}
+
+void CPluginManager::notify(const eNotifyIcons icon, uint32_t color, int durationMs, const std::string& message) {
+    execAndGet("hyprctl notify " + std::to_string((int)icon) + " " + std::to_string(durationMs) + " " + std::to_string(color) + " " + message);
+}
+
+std::string CPluginManager::headerError(const eHeadersErrors err) {
+    switch (err) {
+        case HEADERS_CORRUPTED: return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers corrupted. Please run hyprpm update to fix those.\n";
+        case HEADERS_MISMATCHED: return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers version mismatch. Please run hyprpm update to fix those.\n";
+        case HEADERS_NOT_HYPRLAND: return std::string{Colors::RED} + "✖" + Colors::RESET + " It doesn't seem you are running on hyprland.\n";
+        case HEADERS_MISSING: return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers missing. Please run hyprpm update to fix those.\n";
+        case HEADERS_DUPLICATED: {
+            return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers duplicated!!! This is a very bad sign.\n" +
+                " This could be due to e.g. installing hyprland manually while a system package of hyprland is also installed.\n" +
+                " If the above doesn't apply, check your /usr/include and /usr/local/include directories\n and remove all the hyprland headers.\n";
+        }
+        default: break;
+    }
+
+    return std::string{Colors::RED} + "✖" + Colors::RESET + " Unknown header error. Please run hyprpm update to fix those.\n";
+}

hyprpm/src/core/PluginManager.hpp

@@ -0,0 +1,63 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+enum eHeadersErrors {
+    HEADERS_OK = 0,
+    HEADERS_NOT_HYPRLAND,
+    HEADERS_MISSING,
+    HEADERS_CORRUPTED,
+    HEADERS_MISMATCHED,
+    HEADERS_DUPLICATED
+};
+
+enum eNotifyIcons {
+    ICON_WARNING = 0,
+    ICON_INFO,
+    ICON_HINT,
+    ICON_ERROR,
+    ICON_CONFUSED,
+    ICON_OK,
+    ICON_NONE
+};
+
+enum ePluginLoadStateReturn {
+    LOADSTATE_OK = 0,
+    LOADSTATE_FAIL,
+    LOADSTATE_PARTIAL_FAIL,
+    LOADSTATE_HEADERS_OUTDATED
+};
+
+struct SHyprlandVersion {
+    std::string branch;
+    std::string hash;
+};
+
+class CPluginManager {
+  public:
+    bool                   addNewPluginRepo(const std::string& url, const std::string& rev);
+    bool                   removePluginRepo(const std::string& urlOrName);
+
+    eHeadersErrors         headersValid();
+    bool                   updateHeaders(bool force = false);
+    bool                   updatePlugins(bool forceUpdateAll);
+
+    void                   listAllPlugins();
+
+    bool                   enablePlugin(const std::string& name);
+    bool                   disablePlugin(const std::string& name);
+    ePluginLoadStateReturn ensurePluginsLoadState();
+
+    bool                   loadUnloadPlugin(const std::string& path, bool load);
+    SHyprlandVersion       getHyprlandVersion();
+
+    void                   notify(const eNotifyIcons icon, uint32_t color, int durationMs, const std::string& message);
+
+    bool                   m_bVerbose = false;
+
+  private:
+    std::string headerError(const eHeadersErrors err);
+};
+
+inline std::unique_ptr<CPluginManager> g_pPluginManager;

hyprpm/src/helpers/Colors.hpp

@@ -0,0 +1,11 @@
+#pragma once
+
+namespace Colors {
+    constexpr const char* RED     = "\x1b[31m";
+    constexpr const char* GREEN   = "\x1b[32m";
+    constexpr const char* YELLOW  = "\x1b[33m";
+    constexpr const char* BLUE    = "\x1b[34m";
+    constexpr const char* MAGENTA = "\x1b[35m";
+    constexpr const char* CYAN    = "\x1b[36m";
+    constexpr const char* RESET   = "\x1b[0m";
+};

hyprpm/src/main.cpp

@@ -0,0 +1,164 @@
+#include "progress/CProgressBar.hpp"
+#include "helpers/Colors.hpp"
+#include "core/PluginManager.hpp"
+#include "core/DataState.hpp"
+
+#include <iostream>
+#include <vector>
+#include <string>
+#include <chrono>
+#include <thread>
+
+const std::string HELP = R"#(┏ hyprpm, a Hyprland Plugin Manager
+┃
+┣ add [url] [git rev]    → Install a new plugin repository from git. Git revision
+┃                          is optional, when set, commit locks are ignored.
+┣ remove [url/name]      → Remove an installed plugin repository
+┣ enable [name]          → Enable a plugin
+┣ disable [name]         → Disable a plugin
+┣ update                 → Check and update all plugins if needed
+┣ reload                 → Reload hyprpm state. Ensure all enabled plugins are loaded.
+┣ list                   → List all installed plugins
+┃
+┣ Flags:
+┃
+┣ --notify       | -n    → Send a hyprland notification for important events (e.g. load fail)
+┣ --help         | -h    → Show this menu
+┣ --verbose      | -v    → Enable too much logging
+┣ --force        | -f    → Force an operation ignoring checks (e.g. update -f)
+┗
+)#";
+
+int               main(int argc, char** argv, char** envp) {
+    std::vector<std::string> ARGS{argc};
+    for (int i = 0; i < argc; ++i) {
+        ARGS[i] = std::string{argv[i]};
+    }
+
+    if (ARGS.size() < 2) {
+        std::cout << HELP;
+        return 1;
+    }
+
+    std::vector<std::string> command;
+    bool                     notify = false, verbose = false, force = false;
+
+    for (int i = 1; i < argc; ++i) {
+        if (ARGS[i].starts_with("-")) {
+            if (ARGS[i] == "--help" || ARGS[i] == "-h") {
+                std::cout << HELP;
+                return 0;
+            } else if (ARGS[i] == "--notify" || ARGS[i] == "-n") {
+                notify = true;
+            } else if (ARGS[i] == "--verbose" || ARGS[i] == "-v") {
+                verbose = true;
+            } else if (ARGS[i] == "--force" || ARGS[i] == "-f") {
+                force = true;
+                std::cout << Colors::RED << "!" << Colors::RESET << " Using --force, I hope you know what you are doing.\n";
+            } else {
+                std::cerr << "Unrecognized option " << ARGS[i] << "\n";
+                return 1;
+            }
+        } else {
+            command.push_back(ARGS[i]);
+        }
+    }
+
+    if (command.empty()) {
+        std::cout << HELP;
+        return 0;
+    }
+
+    g_pPluginManager             = std::make_unique<CPluginManager>();
+    g_pPluginManager->m_bVerbose = verbose;
+
+    if (command[0] == "add") {
+        if (command.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for add.\n";
+            return 1;
+        }
+
+        std::string rev = "";
+        if (command.size() >= 3) {
+            rev = command[2];
+        }
+
+        return g_pPluginManager->addNewPluginRepo(command[1], rev) ? 0 : 1;
+    } else if (command[0] == "remove") {
+        if (ARGS.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for remove.\n";
+            return 1;
+        }
+
+        return g_pPluginManager->removePluginRepo(command[1]) ? 0 : 1;
+    } else if (command[0] == "update") {
+        bool headersValid = g_pPluginManager->headersValid() == HEADERS_OK;
+        bool headers      = g_pPluginManager->updateHeaders(force);
+        if (headers) {
+            const auto HLVER            = g_pPluginManager->getHyprlandVersion();
+            auto       GLOBALSTATE      = DataState::getGlobalState();
+            const auto COMPILEDOUTDATED = HLVER.hash != GLOBALSTATE.headersHashCompiled;
+
+            bool       ret1 = g_pPluginManager->updatePlugins(!headersValid || force || COMPILEDOUTDATED);
+
+            if (!ret1)
+                return 1;
+
+            auto ret2 = g_pPluginManager->ensurePluginsLoadState();
+
+            if (ret2 != LOADSTATE_OK)
+                return 1;
+        } else if (notify)
+            g_pPluginManager->notify(ICON_ERROR, 0, 10000, "[hyprpm] Couldn't update headers");
+    } else if (command[0] == "enable") {
+        if (ARGS.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for enable.\n";
+            return 1;
+        }
+
+        if (!g_pPluginManager->enablePlugin(command[1])) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Couldn't enable plugin (missing?)\n";
+            return 1;
+        }
+
+        auto ret = g_pPluginManager->ensurePluginsLoadState();
+        if (ret != LOADSTATE_OK)
+            return 1;
+    } else if (command[0] == "disable") {
+        if (command.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for disable.\n";
+            return 1;
+        }
+
+        if (!g_pPluginManager->disablePlugin(command[1])) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Couldn't disable plugin (missing?)\n";
+            return 1;
+        }
+
+        auto ret = g_pPluginManager->ensurePluginsLoadState();
+        if (ret != LOADSTATE_OK)
+            return 1;
+    } else if (command[0] == "reload") {
+        auto ret = g_pPluginManager->ensurePluginsLoadState();
+
+        if (ret != LOADSTATE_OK && notify) {
+            switch (ret) {
+                case LOADSTATE_FAIL:
+                case LOADSTATE_PARTIAL_FAIL: g_pPluginManager->notify(ICON_ERROR, 0, 10000, "[hyprpm] Failed to load plugins"); break;
+                case LOADSTATE_HEADERS_OUTDATED:
+                    g_pPluginManager->notify(ICON_ERROR, 0, 10000, "[hyprpm] Failed to load plugins: Outdated headers. Please run hyprpm update manually.");
+                    break;
+                default: break;
+            }
+        } else if (notify) {
+            g_pPluginManager->notify(ICON_OK, 0, 4000, "[hyprpm] Loaded plugins");
+        }
+    } else if (command[0] == "list") {
+        g_pPluginManager->listAllPlugins();
+    } else {
+        std::cout << HELP;
+        return 1;
+    }
+
+    return 0;
+}

hyprpm/src/meson.build

@@ -0,0 +1,10 @@
+globber = run_command('sh', '-c', 'find . -name "*.cpp" | sort', check: true)
+src = globber.stdout().strip().split('\n')
+
+executable('hyprpm', src,
+  dependencies: [
+    dependency('threads'),
+    dependency('tomlplusplus')
+  ],
+  install : true
+)

hyprpm/src/progress/CProgressBar.cpp

@@ -0,0 +1,80 @@
+#include "CProgressBar.hpp"
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+#include <format>
+
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "../helpers/Colors.hpp"
+
+void CProgressBar::printMessageAbove(const std::string& msg) {
+    struct winsize w;
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+
+    std::string spaces;
+    for (size_t i = 0; i < w.ws_col; ++i) {
+        spaces += ' ';
+    }
+
+    std::cout << "\r" << spaces << "\r" << msg << "\n";
+    print();
+}
+
+void CProgressBar::print() {
+    struct winsize w;
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+
+    if (m_bFirstPrint)
+        std::cout << "\n";
+    m_bFirstPrint = false;
+
+    std::string spaces;
+    for (size_t i = 0; i < w.ws_col; ++i) {
+        spaces += ' ';
+    }
+
+    std::cout << "\r" << spaces << "\r";
+
+    std::string message = "";
+
+    float       percentDone = 0;
+    if (m_fPercentage >= 0)
+        percentDone = m_fPercentage;
+    else
+        percentDone = (float)m_iSteps / (float)m_iMaxSteps;
+
+    const auto BARWIDTH = std::clamp(w.ws_col - static_cast<unsigned long>(m_szCurrentMessage.length()) - 2, 0UL, 50UL);
+
+    // draw bar
+    message += std::string{" "} + Colors::GREEN;
+    size_t i = 0;
+    for (; i < std::floor(percentDone * BARWIDTH); ++i) {
+        message += "━";
+    }
+
+    if (i < BARWIDTH) {
+        i++;
+
+        message += std::string{"╍"} + Colors::RESET;
+
+        for (; i < BARWIDTH; ++i) {
+            message += "━";
+        }
+    } else
+        message += Colors::RESET;
+
+    // draw progress
+    if (m_fPercentage >= 0)
+        message += "  " + std::format("{}%", static_cast<int>(percentDone * 100.0)) + " ";
+    else
+        message += "  " + std::format("{} / {}", m_iSteps, m_iMaxSteps) + " ";
+
+    // draw message
+    std::cout << message + " " + m_szCurrentMessage;
+
+    std::fflush(stdout);
+}

hyprpm/src/progress/CProgressBar.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <string>
+
+class CProgressBar {
+  public:
+    void        print();
+    void        printMessageAbove(const std::string& msg);
+
+    std::string m_szCurrentMessage = "";
+    size_t      m_iSteps           = 0;
+    size_t      m_iMaxSteps        = 0;
+    float       m_fPercentage      = -1; // if != -1, use percentage
+
+  private:
+    bool m_bFirstPrint = true;
+};

meson.build

@@ -0,0 +1,97 @@
+project('Hyprland', 'cpp', 'c',
+  version : run_command('jq', '-r', '.version', join_paths(meson.source_root(), 'props.json'), check: true).stdout().strip(),
+  default_options : [
+    'warning_level=2',
+    'default_library=static',
+    'optimization=3',
+    'buildtype=release',
+    'debug=false'
+    # 'cpp_std=c++23' # not yet supported by meson, as of version 0.63.0
+    ])
+
+# clang v14.0.6 uses C++2b instead of C++23, so we've gotta account for that
+# replace the following with a project default option once meson gets support for C++23
+cpp_compiler = meson.get_compiler('cpp')
+if cpp_compiler.has_argument('-std=c++23')
+  add_global_arguments('-std=c++23', language: 'cpp')
+elif cpp_compiler.has_argument('-std=c++2b')
+  add_global_arguments('-std=c++2b', language: 'cpp')
+else
+  error('Could not configure current C++ compiler (' + cpp_compiler.get_id() + ' ' + cpp_compiler.version() + ') with required C++ standard (C++23)')
+endif
+
+add_project_arguments(
+  [
+    '-Wno-unused-parameter',
+    '-Wno-unused-value',
+    '-Wno-missing-field-initializers',
+    '-Wno-narrowing',
+  ],
+  language: 'cpp')
+
+if cpp_compiler.check_header('execinfo.h')
+  add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
+endif
+
+wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+have_xwlr = wlroots.get_variable('features').get('xwayland')
+xcb_dep = dependency('xcb', required: get_option('xwayland'))
+
+cmake = import('cmake')
+udis = cmake.subproject('udis86')
+udis86 = udis.dependency('libudis86')
+
+if get_option('xwayland').enabled() and not have_xwlr
+	error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
+endif
+have_xwayland = xcb_dep.found() and have_xwlr
+
+if not have_xwayland
+  add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
+endif
+
+backtrace_dep = cpp_compiler.find_library('execinfo', required: false)
+systemd_dep = dependency('libsystemd', required: get_option('systemd'))
+
+if get_option('systemd').enabled()
+  if systemd_dep.found()
+    add_project_arguments('-DUSES_SYSTEMD', language: 'cpp')
+  else
+  	error('Cannot enable systemd in Hyprland: libsystemd was not found')
+  endif
+endif
+
+if get_option('legacy_renderer').enabled()
+  add_project_arguments('-DLEGACY_RENDERER', language: 'cpp')
+endif
+
+if get_option('buildtype') == 'debug'
+  add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
+endif
+
+version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
+
+globber = run_command('find', 'src', '-name', '*.h*', check: true)
+headers = globber.stdout().strip().split('\n')
+foreach file : headers
+  install_headers(file, subdir: 'hyprland', preserve_path: true)
+endforeach
+
+subdir('protocols')
+subdir('src')
+subdir('hyprctl')
+subdir('hyprpm/src')
+subdir('assets')
+subdir('example')
+subdir('docs')
+
+pkg_install_dir = join_paths(get_option('datadir'), 'pkgconfig')
+
+import('pkgconfig').generate(
+  name: 'Hyprland',
+  filebase: 'hyprland',
+  url: 'https://github.com/hyprwm/Hyprland',
+  description: 'Hyprland header files',
+  install_dir: pkg_install_dir,
+  subdirs: ['', 'hyprland/protocols', 'hyprland/wlroots'],
+)

meson_options.txt

@@ -0,0 +1,3 @@
+option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
+option('systemd', type: 'feature', value: 'auto', description: 'Enable systemd integration')
+option('legacy_renderer', type: 'feature', value: 'disabled', description: 'Enable legacy renderer')

module.nix

@@ -1,62 +0,0 @@
-# Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/programs/sway.nix
-self: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.programs.hyprland;
-in {
-  options.programs.hyprland = {
-    enable = mkEnableOption ''
-      Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks.
-      You can manually launch Hyprland by executing "exec Hyprland" on a TTY.
-      A configuration file will be generated in ~/.config/hypr/hyprland.conf.
-      See <link xlink:href="https://github.com/vaxerski/Hyprland/wiki" /> for
-      more information.
-    '';
-
-    package = mkOption {
-      type = types.package;
-      default = self.packages.${pkgs.system}.default;
-      defaultText = literalExpression "<Hyprland flake>.packages.<system>.default";
-      example = literalExpression "<Hyprland flake>.packages.<system>.default.override { }";
-      description = ''
-        Hyprland package to use.
-      '';
-    };
-
-    extraPackages = mkOption {
-      type = with types; listOf package;
-      default = with pkgs; [
-        kitty
-        wofi
-        swaybg
-      ];
-      defaultText = literalExpression ''
-        with pkgs; [ kitty wofi swaybg ];
-      '';
-      example = literalExpression ''
-        with pkgs; [
-          alacritty wofi
-        ]
-      '';
-      description = ''
-        Extra packages to be installed system wide.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [cfg.package] ++ cfg.extraPackages;
-    security.polkit.enable = true;
-    hardware.opengl.enable = mkDefault true;
-    fonts.enableDefaultFonts = mkDefault true;
-    programs.dconf.enable = mkDefault true;
-    services.xserver.displayManager.sessionPackages = [cfg.package];
-    programs.xwayland.enable = mkDefault true;
-    xdg.portal.enable = mkDefault true;
-    xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr];
-  };
-}

nix/default.nix

@@ -0,0 +1,161 @@
+{
+  lib,
+  stdenv,
+  pkg-config,
+  makeWrapper,
+  meson,
+  ninja,
+  binutils,
+  cairo,
+  git,
+  hyprcursor,
+  hyprland-protocols,
+  hyprlang,
+  jq,
+  libGL,
+  libdrm,
+  libexecinfo,
+  libinput,
+  libxcb,
+  libxkbcommon,
+  mesa,
+  pango,
+  pciutils,
+  systemd,
+  tomlplusplus,
+  udis86,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  wlroots,
+  xcbutilwm,
+  xwayland,
+  debug ? false,
+  enableXWayland ? true,
+  legacyRenderer ? false,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  wrapRuntimeDeps ? true,
+  version ? "git",
+  commit,
+  date,
+  # deprecated flags
+  enableNvidiaPatches ? false,
+  nvidiaPatches ? false,
+  hidpiXWayland ? false,
+}:
+assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
+assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
+assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; let
+  wlr = wlroots.override {inherit enableXWayland;};
+in
+  stdenv.mkDerivation {
+    pname = "hyprland${lib.optionalString debug "-debug"}";
+    inherit version;
+
+    src = lib.cleanSourceWith {
+      filter = name: type: let
+        baseName = baseNameOf (toString name);
+      in
+        ! (lib.hasSuffix ".nix" baseName);
+      src = lib.cleanSource ../.;
+    };
+
+    patches = [
+      # make meson use the provided wlroots instead of the git submodule
+      ./patches/meson-build.patch
+    ];
+
+    postPatch = ''
+      # Fix hardcoded paths to /usr installation
+      sed -i "s#/usr#$out#" src/render/OpenGL.cpp
+
+      # Generate version.h
+      cp src/version.h.in src/version.h
+      substituteInPlace src/version.h \
+        --replace "@HASH@" '${commit}' \
+        --replace "@BRANCH@" "" \
+        --replace "@MESSAGE@" "" \
+        --replace "@DATE@" "${date}" \
+        --replace "@TAG@" "" \
+        --replace "@DIRTY@" '${
+        if commit == ""
+        then "dirty"
+        else ""
+      }'
+    '';
+
+    nativeBuildInputs = [
+      jq
+      makeWrapper
+      meson
+      ninja
+      pkg-config
+      wayland-scanner
+    ];
+
+    outputs = [
+      "out"
+      "man"
+      "dev"
+    ];
+
+    buildInputs =
+      [
+        cairo
+        git
+        hyprcursor.dev
+        hyprland-protocols
+        hyprlang
+        libdrm
+        libGL
+        libinput
+        libxkbcommon
+        mesa
+        pango
+        pciutils
+        tomlplusplus
+        udis86
+        wayland
+        wayland-protocols
+        wlr
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isMusl [libexecinfo]
+      ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland]
+      ++ lib.optionals withSystemd [systemd];
+
+    mesonBuildType =
+      if debug
+      then "debug"
+      else "release";
+
+    mesonAutoFeatures = "disabled";
+
+    mesonFlags = [
+      (lib.mesonEnable "xwayland" enableXWayland)
+      (lib.mesonEnable "legacy_renderer" legacyRenderer)
+      (lib.mesonEnable "systemd" withSystemd)
+    ];
+
+    postInstall = ''
+      ln -s ${wlr}/include/wlr $dev/include/hyprland/wlroots
+
+      ${lib.optionalString wrapRuntimeDeps ''
+        wrapProgram $out/bin/Hyprland \
+          --suffix PATH : ${lib.makeBinPath [
+          stdenv.cc
+          binutils
+          pciutils
+        ]}
+      ''}
+    '';
+
+    passthru.providedSessions = ["hyprland"];
+
+    meta = with lib; {
+      homepage = "https://github.com/hyprwm/Hyprland";
+      description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
+      license = licenses.bsd3;
+      platforms = wlr.meta.platforms;
+      mainProgram = "Hyprland";
+    };
+  }

nix/hm-module.nix

@@ -0,0 +1,14 @@
+self: {
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (pkgs.stdenv.hostPlatform) system;
+
+  package = self.packages.${system}.default;
+in {
+  config = {
+    wayland.windowManager.hyprland.package = lib.mkDefault package;
+  };
+}

nix/module.nix

@@ -0,0 +1,21 @@
+inputs: {
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (pkgs.stdenv.hostPlatform) system;
+  cfg = config.programs.hyprland;
+
+  package = inputs.self.packages.${system}.hyprland;
+  portalPackage = inputs.self.packages.${system}.xdg-desktop-portal-hyprland.override {
+    hyprland = cfg.finalPackage;
+  };
+in {
+  config = {
+    programs.hyprland = {
+      package = lib.mkDefault package;
+      portalPackage = lib.mkDefault portalPackage;
+    };
+  };
+}

nix/overlays.nix

@@ -0,0 +1,78 @@
+{
+  self,
+  lib,
+  inputs,
+}: let
+  props = builtins.fromJSON (builtins.readFile ../props.json);
+
+  mkDate = longDate: (lib.concatStringsSep "-" [
+    (builtins.substring 0 4 longDate)
+    (builtins.substring 4 2 longDate)
+    (builtins.substring 6 2 longDate)
+  ]);
+in {
+  # Contains what a user is most likely to care about:
+  # Hyprland itself, XDPH and the Share Picker.
+  default = lib.composeManyExtensions (with self.overlays; [
+    hyprland-packages
+    hyprland-extras
+  ]);
+
+  # Packages for variations of Hyprland, dependencies included.
+  hyprland-packages = lib.composeManyExtensions [
+    # Dependencies
+    inputs.hyprcursor.overlays.default
+    inputs.hyprland-protocols.overlays.default
+    inputs.hyprlang.overlays.default
+    self.overlays.wlroots-hyprland
+    self.overlays.udis86
+    # Hyprland packages themselves
+    (final: prev: let
+      date = mkDate (self.lastModifiedDate or "19700101");
+    in {
+      hyprland = final.callPackage ./default.nix {
+        stdenv = final.gcc13Stdenv;
+        version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
+        commit = self.rev or "";
+        wlroots = final.wlroots-hyprland; # explicit override until decided on breaking change of the name
+        udis86 = final.udis86-hyprland; # explicit override until decided on breaking change of the name
+        inherit date;
+      };
+      hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
+      hyprland-debug = final.hyprland.override {debug = true;};
+      hyprland-legacy-renderer = final.hyprland.override {legacyRenderer = true;};
+      hyprland-nvidia =
+        builtins.trace ''
+          hyprland-nvidia was removed. Please use the hyprland package.
+          Nvidia patches are no longer needed.
+        ''
+        final.hyprland;
+      hyprland-hidpi =
+        builtins.trace ''
+          hyprland-hidpi was removed. Please use the hyprland package.
+          For more information, refer to https://wiki.hyprland.org/Configuring/XWayland.
+        ''
+        final.hyprland;
+    })
+  ];
+
+  # Packages for extra software recommended for usage with Hyprland,
+  # including forked or patched packages for compatibility.
+  hyprland-extras = lib.composeManyExtensions [
+    inputs.xdph.overlays.xdg-desktop-portal-hyprland
+  ];
+
+  udis86 = final: prev: {
+    udis86-hyprland = final.callPackage ./udis86.nix {};
+  };
+
+  # Patched version of wlroots for Hyprland.
+  # It is under a new package name so as to not conflict with
+  # the standard version in nixpkgs.
+  wlroots-hyprland = final: prev: {
+    wlroots-hyprland = final.callPackage ./wlroots.nix {
+      version = "${mkDate (inputs.wlroots.lastModifiedDate or "19700101")}_${inputs.wlroots.shortRev or "dirty"}";
+      src = inputs.wlroots;
+    };
+  };
+}

nix/patches/meson-build.patch

@@ -0,0 +1,61 @@
+diff --git a/meson.build b/meson.build
+index 1d2c7f9f..c5ef4e67 100644
+--- a/meson.build
++++ b/meson.build
+@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
+   add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
+ endif
+ 
+-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+-have_xwlr = wlroots.get_variable('features').get('xwayland')
+-xcb_dep = dependency('xcb', required: get_option('xwayland'))
+-
+-cmake = import('cmake')
+-udis = cmake.subproject('udis86')
+-udis86 = udis.dependency('libudis86')
+-
+-if get_option('xwayland').enabled() and not have_xwlr
+-	error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
+-endif
+-have_xwayland = xcb_dep.found() and have_xwlr
+-
+-if not have_xwayland
++if get_option('xwayland').disabled()
+   add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
+ endif
+ 
+@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
+   add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
+ endif
+ 
+-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
+-
+ globber = run_command('find', 'src', '-name', '*.h*', check: true)
+ headers = globber.stdout().strip().split('\n')
+ foreach file : headers
+diff --git a/src/meson.build b/src/meson.build
+index 45701f5f..3505cefe 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -9,7 +9,7 @@ executable('Hyprland', src,
+     server_protos,
+     dependency('wayland-server'),
+     dependency('wayland-client'),
+-    wlroots.get_variable('wlroots'),
++    dependency('wlroots'),
+     dependency('cairo'),
+     dependency('hyprcursor'),
+     dependency('hyprlang', version: '>= 0.3.2'),
+@@ -16,12 +16,12 @@ executable('Hyprland', src,
+     dependency('egl'),
+     dependency('xkbcommon'),
+     dependency('libinput'),
+-    xcb_dep,
++    dependency('xcb', required: get_option('xwayland')),
+     backtrace_dep,
+     systemd_dep,
+-    udis86,
++    dependency('udis86'),
+ 
+     dependency('pixman-1'),
+     dependency('gl', 'opengl'),

nix/udis86.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  python3,
+}:
+stdenv.mkDerivation {
+  pname = "udis86";
+  version = "unstable-2022-10-13";
+
+  src = fetchFromGitHub {
+    owner = "canihavesomecoffee";
+    repo = "udis86";
+    rev = "5336633af70f3917760a6d441ff02d93477b0c86";
+    hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g=";
+  };
+
+  nativeBuildInputs = [autoreconfHook python3];
+
+  configureFlags = ["--enable-shared"];
+
+  outputs = ["bin" "out" "dev" "lib"];
+
+  meta = with lib; {
+    homepage = "https://udis86.sourceforge.net";
+    license = licenses.bsd2;
+    mainProgram = "udcli";
+    description = "Easy-to-use, minimalistic x86 disassembler library (libudis86)";
+    platforms = platforms.all;
+  };
+}

nix/update-inputs.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env -S nix shell nixpkgs#jq -c bash
+
+# Update inputs when the Mesa version is outdated. We don't want
+# incompatibilities between the user's system and Hyprland.
+
+# get the current Nixpkgs revision
+REV=$(jq <flake.lock '.nodes.nixpkgs.locked.rev' -r)
+# check versions for current and remote nixpkgs' mesa
+CRT_VER=$(nix eval --raw github:nixos/nixpkgs/"$REV"#mesa.version)
+NEW_VER=$(nix eval --raw github:nixos/nixpkgs/nixos-unstable#mesa.version)
+
+if [ "$CRT_VER" != "$NEW_VER" ]; then
+  echo "Updating Mesa $CRT_VER -> $NEW_VER and flake inputs"
+
+  # update inputs to latest versions
+  nix flake update
+else
+  echo "nixpkgs is up to date!"
+fi

nix/update-wlroots.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#gnused nixpkgs#ripgrep -c bash
+
+# get wlroots revision from submodule
+SUB_REV=$(git submodule status | rg wlroots | awk '{ print substr($1,2) }')
+# and from lockfile
+CRT_REV=$(rg rev flake.nix | awk '{ print substr($3, 2, 40) }')
+
+if [ "$SUB_REV" != "$CRT_REV" ]; then
+  echo "Updating wlroots..."
+  # update wlroots to submodule revision
+  sed -Ei "s/\w{40}/$SUB_REV/g" flake.nix
+  nix flake lock
+
+  echo "wlroots: $CRT_REV -> $SUB_REV"
+else
+  echo "wlroots is up to date!"
+fi

nix/wlroots.nix

@@ -0,0 +1,13 @@
+{
+  version,
+  src,
+  wlroots,
+  enableXWayland ? true,
+}:
+wlroots.overrideAttrs (old: {
+  inherit version src enableXWayland;
+
+  pname = "${old.pname}-hyprland";
+
+  patches = [ ]; # don't inherit old.patches
+})

props.json

@@ -0,0 +1,3 @@
+{
+    "version": "0.38.1"
+}

protocols/ext-workspace-unstable-v1.xml

@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="ext_workspace_unstable_v1">
-  <copyright>
-    Copyright © 2019 Christopher Billington
-    Copyright © 2020 Ilia Bozhinov
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <interface name="zext_workspace_manager_v1" version="1">
-    <description summary="list and control workspaces">
-      Workspaces, also called virtual desktops, are groups of surfaces. A
-      compositor with a concept of workspaces may only show some such groups of
-      surfaces (those of 'active' workspaces) at a time. 'Activating' a
-      workspace is a request for the compositor to display that workspace's
-      surfaces as normal, whereas the compositor may hide or otherwise
-      de-emphasise surfaces that are associated only with 'inactive' workspaces.
-      Workspaces are grouped by which sets of outputs they correspond to, and
-      may contain surfaces only from those outputs. In this way, it is possible
-      for each output to have its own set of workspaces, or for all outputs (or
-      any other arbitrary grouping) to share workspaces. Compositors may
-      optionally conceptually arrange each group of workspaces in an
-      N-dimensional grid.
-
-      The purpose of this protocol is to enable the creation of taskbars and
-      docks by providing them with a list of workspaces and their properties,
-      and allowing them to activate and deactivate workspaces.
-
-      After a client binds the zext_workspace_manager_v1, each workspace will be
-      sent via the workspace event.
-    </description>
-
-    <event name="workspace_group">
-      <description summary="a workspace group has been created">
-        This event is emitted whenever a new workspace group has been created.
-
-        All initial details of the workspace group (workspaces, outputs) will be
-        sent immediately after this event via the corresponding events in
-        zext_workspace_group_handle_v1.
-      </description>
-      <arg name="workspace_group" type="new_id" interface="zext_workspace_group_handle_v1"/>
-    </event>
-
-    <request name="commit">
-      <description summary="all requests about the workspaces have been sent">
-        The client must send this request after it has finished sending other
-        requests. The compositor must process a series of requests preceding a
-        commit request atomically.
-
-        This allows changes to the workspace properties to be seen as atomic,
-        even if they happen via multiple events, and even if they involve
-        multiple zext_workspace_handle_v1 objects, for example, deactivating one
-        workspace and activating another.
-      </description>
-    </request>
-
-    <event name="done">
-      <description summary="all information about the workspace groups has been sent">
-        This event is sent after all changes in all workspace groups have been
-        sent.
-
-        This allows changes to one or more zext_workspace_group_handle_v1
-        properties to be seen as atomic, even if they happen via multiple
-        events. In particular, an output moving from one workspace group to
-        another sends an output_enter event and an output_leave event to the two
-        zext_workspace_group_handle_v1 objects in question. The compositor sends
-        the done event only after updating the output information in both
-        workspace groups.
-      </description>
-    </event>
-
-    <event name="finished">
-      <description summary="the compositor has finished with the workspace_manager">
-        This event indicates that the compositor is done sending events to the
-        zext_workspace_manager_v1. The server will destroy the object
-        immediately after sending this request, so it will become invalid and
-        the client should free any resources associated with it.
-      </description>
-    </event>
-
-    <request name="stop">
-      <description summary="stop sending events">
-        Indicates the client no longer wishes to receive events for new
-        workspace groups. However the compositor may emit further workspace
-        events, until the finished event is emitted.
-
-        The client must not send any more requests after this one.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zext_workspace_group_handle_v1" version="1">
-    <description summary="a workspace group assigned to a set of outputs">
-      A zext_workspace_group_handle_v1 object represents a a workspace group
-      that is assigned a set of outputs and contains a number of workspaces.
-
-      The set of outputs assigned to the workspace group is conveyed to the client via
-      output_enter and output_leave events, and its workspaces are conveyed with
-      workspace events.
-
-      For example, a compositor which has a set of workspaces for each output may
-      advertise a workspace group (and its workspaces) per output, whereas a compositor
-      where a workspace spans all outputs may advertise a single workspace group for all
-      outputs.
-    </description>
-
-    <event name="output_enter">
-      <description summary="output assigned to workspace group">
-        This event is emitted whenever an output is assigned to the workspace
-        group.
-      </description>
-      <arg name="output" type="object" interface="wl_output"/>
-    </event>
-
-    <event name="output_leave">
-      <description summary="output removed from workspace group">
-        This event is emitted whenever an output is removed from the workspace
-        group.
-      </description>
-      <arg name="output" type="object" interface="wl_output"/>
-    </event>
-
-    <event name="workspace">
-      <description summary="workspace added to workspace group">
-        This event is emitted whenever a new workspace has been created.
-
-        All initial details of the workspace (name, coordinates, state) will
-        be sent immediately after this event via the corresponding events in
-        zext_workspace_handle_v1.
-      </description>
-      <arg name="workspace" type="new_id" interface="zext_workspace_handle_v1"/>
-    </event>
-
-    <event name="remove">
-      <description summary="this workspace group has been destroyed">
-        This event means the zext_workspace_group_handle_v1 has been destroyed.
-        It is guaranteed there won't be any more events for this
-        zext_workspace_group_handle_v1. The zext_workspace_group_handle_v1 becomes
-        inert so any requests will be ignored except the destroy request.
-
-        The compositor must remove all workspaces belonging to a workspace group
-        before removing the workspace group.
-      </description>
-    </event>
-
-    <request name="create_workspace">
-      <description summary="create a new workspace">
-        Request that the compositor create a new workspace with the given name.
-
-        There is no guarantee that the compositor will create a new workspace,
-        or that the created workspace will have the provided name.
-      </description>
-      <arg name="workspace" type="string"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the zext_workspace_handle_v1 object">
-        Destroys the zext_workspace_handle_v1 object.
-
-        This request should be called either when the client does not want to
-        use the workspace object any more or after the remove event to finalize
-        the destruction of the object.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zext_workspace_handle_v1" version="1">
-    <description summary="a workspace handing a group of surfaces">
-      A zext_workspace_handle_v1 object represents a a workspace that handles a
-      group of surfaces.
-
-      Each workspace has a name, conveyed to the client with the name event; a
-      list of states, conveyed to the client with the state event; and
-      optionally a set of coordinates, conveyed to the client with the
-      coordinates event. The client may request that the compositor activate or
-      deactivate the workspace.
-
-      Each workspace can belong to only a single workspace group.
-      Depepending on the compositor policy, there might be workspaces with
-      the same name in different workspace groups, but these workspaces are still
-      separate (e.g. one of them might be active while the other is not).
-    </description>
-
-    <event name="name">
-      <description summary="workspace name changed">
-        This event is emitted immediately after the zext_workspace_handle_v1 is
-        created and whenever the name of the workspace changes.
-      </description>
-      <arg name="name" type="string"/>
-    </event>
-
-    <event name="coordinates">
-      <description summary="workspace coordinates changed">
-        This event is used to organize workspaces into an N-dimensional grid
-        within a workspace group, and if supported, is emitted immediately after
-        the zext_workspace_handle_v1 is created and whenever the coordinates of
-        the workspace change. Compositors may not send this event if they do not
-        conceptually arrange workspaces in this way. If compositors simply
-        number workspaces, without any geometric interpretation, they may send
-        1D coordinates, which clients should not interpret as implying any
-        geometry. Sending an empty array means that the compositor no longer
-        orders the workspace geometrically.
-
-        Coordinates have an arbitrary number of dimensions N with an uint32
-        position along each dimension. By convention if N > 1, the first
-        dimension is X, the second Y, the third Z, and so on. The compositor may
-        chose to utilize these events for a more novel workspace layout
-        convention, however. No guarantee is made about the grid being filled or
-        bounded; there may be a workspace at coordinate 1 and another at
-        coordinate 1000 and none in between. Within a workspace group, however,
-        workspaces must have unique coordinates of equal dimensionality.
-      </description>
-      <arg name="coordinates" type="array"/>
-    </event>
-
-    <event name="state">
-      <description summary="the state of the workspace changed">
-        This event is emitted immediately after the zext_workspace_handle_v1 is
-        created and each time the workspace state changes, either because of a
-        compositor action or because of a request in this protocol.
-      </description>
-      <arg name="state" type="array"/>
-    </event>
-
-    <enum name="state">
-      <description summary="types of states on the workspace">
-        The different states that a workspace can have.
-      </description>
-
-      <entry name="active" value="0" summary="the workspace is active"/>
-      <entry name="urgent" value="1" summary="the workspace requests attention"/>
-      <entry name="hidden" value="2">
-        <description summary="the workspace is not visible">
-          The workspace is not visible in its workspace group, and clients
-          attempting to visualize the compositor workspace state should not
-          display such workspaces.
-        </description>
-      </entry>
-    </enum>
-
-    <event name="remove">
-      <description summary="this workspace has been destroyed">
-        This event means the zext_workspace_handle_v1 has been destroyed. It is
-        guaranteed there won't be any more events for this
-        zext_workspace_handle_v1. The zext_workspace_handle_v1 becomes inert so
-        any requests will be ignored except the destroy request.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the zext_workspace_handle_v1 object">
-        Destroys the zext_workspace_handle_v1 object.
-
-        This request should be called either when the client does not want to
-        use the workspace object any more or after the remove event to finalize
-        the destruction of the object.
-      </description>
-    </request>
-
-    <request name="activate">
-      <description summary="activate the workspace">
-        Request that this workspace be activated.
-
-        There is no guarantee the workspace will be actually activated, and
-        behaviour may be compositor-dependent. For example, activating a
-        workspace may or may not deactivate all other workspaces in the same
-        group.
-      </description>
-    </request>
-
-    <request name="deactivate">
-      <description summary="activate the workspace">
-        Request that this workspace be deactivated.
-
-        There is no guarantee the workspace will be actually deactivated.
-      </description>
-    </request>
-
-    <request name="remove">
-      <description summary="remove the workspace">
-        Request that this workspace be removed.
-
-        There is no guarantee the workspace will be actually removed.
-      </description>
-    </request>
-  </interface>
-</protocol>

protocols/meson.build

@@ -0,0 +1,70 @@
+wayland_protos = dependency('wayland-protocols',
+	version: '>=1.32',
+	fallback: 'wayland-protocols',
+	default_options: ['tests=false'],
+)
+
+hyprland_protos = dependency('hyprland-protocols',
+	version: '>=0.2',
+  fallback: 'hyprland-protocols',
+)
+
+wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
+hl_protocol_dir = hyprland_protos.get_variable('pkgdatadir')
+
+wayland_scanner_dep = dependency('wayland-scanner', native: true)
+wayland_scanner = find_program(
+	wayland_scanner_dep.get_variable('wayland_scanner'),
+	native: true,
+)
+
+protocols = [
+  [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
+  [wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'],
+  [wl_protocol_dir, 'unstable/text-input/text-input-unstable-v1.xml'],
+  [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
+  [wl_protocol_dir, 'staging/fractional-scale/fractional-scale-v1.xml'],
+  [wl_protocol_dir, 'staging/cursor-shape/cursor-shape-v1.xml'],
+  [wl_protocol_dir, 'staging/tearing-control/tearing-control-v1.xml'],
+  ['wlr-foreign-toplevel-management-unstable-v1.xml'],
+  ['wlr-layer-shell-unstable-v1.xml'],
+  ['wlr-output-power-management-unstable-v1.xml'],
+  ['wlr-screencopy-unstable-v1.xml'],
+  ['pointer-constraints-unstable-v1.xml'],
+  ['tablet-unstable-v2.xml'],
+  ['idle.xml'],
+  [hl_protocol_dir, 'protocols/hyprland-toplevel-export-v1.xml'],
+  [hl_protocol_dir, 'protocols/hyprland-global-shortcuts-v1.xml']
+]
+wl_protos_src = []
+wl_protos_headers = []
+foreach p : protocols
+	xml = join_paths(p)
+	wl_protos_src += custom_target(
+		xml.underscorify() + '_server_c',
+		input: xml,
+		output: '@BASENAME@-protocol.c',
+		command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
+	)
+	wl_protos_headers += custom_target(
+		xml.underscorify() + '_server_h',
+		input: xml,
+		install: true,
+		install_dir: join_paths(get_option('includedir'), 'hyprland/protocols'),
+		output: '@BASENAME@-protocol.h',
+		command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
+	)
+endforeach
+
+wayland_server = dependency('wayland-server', version: '>=1.20.0')
+
+lib_server_protos = static_library(
+	'server_protos',
+	wl_protos_src + wl_protos_headers,
+	dependencies: wayland_server.partial_dependency(compile_args: true),
+)
+
+server_protos = declare_dependency(
+	link_with: lib_server_protos,
+	sources: wl_protos_headers,
+)

protocols/wlr-foreign-toplevel-management-unstable-v1.xml

@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="wlr_foreign_toplevel_management_unstable_v1">
+  <copyright>
+    Copyright © 2018 Ilia Bozhinov
+
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    the copyright holders not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission.  The copyright holders make no
+    representations about the suitability of this software for any
+    purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+    THIS SOFTWARE.
+  </copyright>
+
+  <interface name="zwlr_foreign_toplevel_manager_v1" version="3">
+    <description summary="list and control opened apps">
+      The purpose of this protocol is to enable the creation of taskbars
+      and docks by providing them with a list of opened applications and
+      letting them request certain actions on them, like maximizing, etc.
+
+      After a client binds the zwlr_foreign_toplevel_manager_v1, each opened
+      toplevel window will be sent via the toplevel event
+    </description>
+
+    <event name="toplevel">
+      <description summary="a toplevel has been created">
+        This event is emitted whenever a new toplevel window is created. It
+        is emitted for all toplevels, regardless of the app that has created
+        them.
+
+        All initial details of the toplevel(title, app_id, states, etc.) will
+        be sent immediately after this event via the corresponding events in
+        zwlr_foreign_toplevel_handle_v1.
+      </description>
+      <arg name="toplevel" type="new_id" interface="zwlr_foreign_toplevel_handle_v1"/>
+    </event>
+
+    <request name="stop">
+      <description summary="stop sending events">
+        Indicates the client no longer wishes to receive events for new toplevels.
+        However the compositor may emit further toplevel_created events, until
+        the finished event is emitted.
+
+        The client must not send any more requests after this one.
+      </description>
+    </request>
+
+    <event name="finished" type="destructor">
+      <description summary="the compositor has finished with the toplevel manager">
+        This event indicates that the compositor is done sending events to the
+        zwlr_foreign_toplevel_manager_v1. The server will destroy the object
+        immediately after sending this request, so it will become invalid and
+        the client should free any resources associated with it.
+      </description>
+    </event>
+  </interface>
+
+  <interface name="zwlr_foreign_toplevel_handle_v1" version="3">
+    <description summary="an opened toplevel">
+      A zwlr_foreign_toplevel_handle_v1 object represents an opened toplevel
+      window. Each app may have multiple opened toplevels.
+
+      Each toplevel has a list of outputs it is visible on, conveyed to the
+      client with the output_enter and output_leave events.
+    </description>
+
+    <event name="title">
+      <description summary="title change">
+        This event is emitted whenever the title of the toplevel changes.
+      </description>
+      <arg name="title" type="string"/>
+    </event>
+
+    <event name="app_id">
+      <description summary="app-id change">
+        This event is emitted whenever the app-id of the toplevel changes.
+      </description>
+      <arg name="app_id" type="string"/>
+    </event>
+
+    <event name="output_enter">
+      <description summary="toplevel entered an output">
+        This event is emitted whenever the toplevel becomes visible on
+        the given output. A toplevel may be visible on multiple outputs.
+      </description>
+      <arg name="output" type="object" interface="wl_output"/>
+    </event>
+
+    <event name="output_leave">
+      <description summary="toplevel left an output">
+        This event is emitted whenever the toplevel stops being visible on
+        the given output. It is guaranteed that an entered-output event
+        with the same output has been emitted before this event.
+      </description>
+      <arg name="output" type="object" interface="wl_output"/>
+    </event>
+
+    <request name="set_maximized">
+      <description summary="requests that the toplevel be maximized">
+        Requests that the toplevel be maximized. If the maximized state actually
+        changes, this will be indicated by the state event.
+      </description>
+    </request>
+
+    <request name="unset_maximized">
+      <description summary="requests that the toplevel be unmaximized">
+        Requests that the toplevel be unmaximized. If the maximized state actually
+        changes, this will be indicated by the state event.
+      </description>
+    </request>
+
+    <request name="set_minimized">
+      <description summary="requests that the toplevel be minimized">
+        Requests that the toplevel be minimized. If the minimized state actually
+        changes, this will be indicated by the state event.
+      </description>
+    </request>
+
+    <request name="unset_minimized">
+      <description summary="requests that the toplevel be unminimized">
+        Requests that the toplevel be unminimized. If the minimized state actually
+        changes, this will be indicated by the state event.
+      </description>
+    </request>
+
+    <request name="activate">
+      <description summary="activate the toplevel">
+        Request that this toplevel be activated on the given seat.
+        There is no guarantee the toplevel will be actually activated.
+      </description>
+      <arg name="seat" type="object" interface="wl_seat"/>
+    </request>
+
+    <enum name="state">
+      <description summary="types of states on the toplevel">
+        The different states that a toplevel can have. These have the same meaning
+        as the states with the same names defined in xdg-toplevel
+      </description>
+
+      <entry name="maximized"  value="0" summary="the toplevel is maximized"/>
+      <entry name="minimized"  value="1" summary="the toplevel is minimized"/>
+      <entry name="activated"  value="2" summary="the toplevel is active"/>
+      <entry name="fullscreen" value="3" summary="the toplevel is fullscreen" since="2"/>
+    </enum>
+
+    <event name="state">
+      <description summary="the toplevel state changed">
+        This event is emitted immediately after the zlw_foreign_toplevel_handle_v1
+        is created and each time the toplevel state changes, either because of a
+        compositor action or because of a request in this protocol.
+      </description>
+
+      <arg name="state" type="array"/>
+    </event>
+
+    <event name="done">
+      <description summary="all information about the toplevel has been sent">
+        This event is sent after all changes in the toplevel state have been
+        sent.
+
+        This allows changes to the zwlr_foreign_toplevel_handle_v1 properties
+        to be seen as atomic, even if they happen via multiple events.
+      </description>
+    </event>
+
+    <request name="close">
+      <description summary="request that the toplevel be closed">
+        Send a request to the toplevel to close itself. The compositor would
+        typically use a shell-specific method to carry out this request, for
+        example by sending the xdg_toplevel.close event. However, this gives
+        no guarantees the toplevel will actually be destroyed. If and when
+        this happens, the zwlr_foreign_toplevel_handle_v1.closed event will
+        be emitted.
+      </description>
+    </request>
+
+    <request name="set_rectangle">
+      <description summary="the rectangle which represents the toplevel">
+        The rectangle of the surface specified in this request corresponds to
+        the place where the app using this protocol represents the given toplevel.
+        It can be used by the compositor as a hint for some operations, e.g
+        minimizing. The client is however not required to set this, in which
+        case the compositor is free to decide some default value.
+
+        If the client specifies more than one rectangle, only the last one is
+        considered.
+
+        The dimensions are given in surface-local coordinates.
+        Setting width=height=0 removes the already-set rectangle.
+      </description>
+
+      <arg name="surface" type="object" interface="wl_surface"/>
+      <arg name="x" type="int"/>
+      <arg name="y" type="int"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+    </request>
+
+    <enum name="error">
+      <entry name="invalid_rectangle" value="0"
+        summary="the provided rectangle is invalid"/>
+    </enum>
+
+    <event name="closed">
+      <description summary="this toplevel has been destroyed">
+        This event means the toplevel has been destroyed. It is guaranteed there
+        won't be any more events for this zwlr_foreign_toplevel_handle_v1. The
+        toplevel itself becomes inert so any requests will be ignored except the
+        destroy request.
+      </description>
+    </event>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the zwlr_foreign_toplevel_handle_v1 object">
+        Destroys the zwlr_foreign_toplevel_handle_v1 object.
+
+        This request should be called either when the client does not want to
+        use the toplevel anymore or after the closed event to finalize the
+        destruction of the object.
+      </description>
+    </request>
+
+    <!-- Version 2 additions -->
+
+    <request name="set_fullscreen" since="2">
+      <description summary="request that the toplevel be fullscreened">
+        Requests that the toplevel be fullscreened on the given output. If the
+        fullscreen state and/or the outputs the toplevel is visible on actually
+        change, this will be indicated by the state and output_enter/leave
+        events.
+
+        The output parameter is only a hint to the compositor. Also, if output
+        is NULL, the compositor should decide which output the toplevel will be
+        fullscreened on, if at all.
+      </description>
+      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
+    </request>
+
+    <request name="unset_fullscreen" since="2">
+      <description summary="request that the toplevel be unfullscreened">
+        Requests that the toplevel be unfullscreened. If the fullscreen state
+        actually changes, this will be indicated by the state event.
+      </description>
+    </request>
+
+    <!-- Version 3 additions -->
+
+    <event name="parent" since="3">
+      <description summary="parent change">
+        This event is emitted whenever the parent of the toplevel changes.
+
+        No event is emitted when the parent handle is destroyed by the client.
+      </description>
+      <arg name="parent" type="object" interface="zwlr_foreign_toplevel_handle_v1" allow-null="true"/>
+    </event>
+  </interface>
+</protocol>

protocols/wlr-output-power-management-unstable-v1.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="wlr_output_power_management_unstable_v1">
+  <copyright>
+    Copyright © 2019 Purism SPC
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice (including the next
+    paragraph) shall be included in all copies or substantial portions of the
+    Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+  </copyright>
+
+  <description summary="Control power management modes of outputs">
+    This protocol allows clients to control power management modes
+    of outputs that are currently part of the compositor space. The
+    intent is to allow special clients like desktop shells to power
+    down outputs when the system is idle.
+
+    To modify outputs not currently part of the compositor space see
+    wlr-output-management.
+
+    Warning! The protocol described in this file is experimental and
+    backward incompatible changes may be made. Backward compatible changes
+    may be added together with the corresponding interface version bump.
+    Backward incompatible changes are done by bumping the version number in
+    the protocol and interface names and resetting the interface version.
+    Once the protocol is to be declared stable, the 'z' prefix and the
+    version number in the protocol and interface names are removed and the
+    interface version number is reset.
+  </description>
+
+  <interface name="zwlr_output_power_manager_v1" version="1">
+    <description summary="manager to create per-output power management">
+      This interface is a manager that allows creating per-output power
+      management mode controls.
+    </description>
+
+    <request name="get_output_power">
+      <description summary="get a power management for an output">
+        Create a output power management mode control that can be used to
+        adjust the power management mode for a given output.
+      </description>
+      <arg name="id" type="new_id" interface="zwlr_output_power_v1"/>
+      <arg name="output" type="object" interface="wl_output"/>
+    </request>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the manager">
+        All objects created by the manager will still remain valid, until their
+        appropriate destroy request has been called.
+      </description>
+    </request>
+  </interface>
+
+  <interface name="zwlr_output_power_v1" version="1">
+    <description summary="adjust power management mode for an output">
+      This object offers requests to set the power management mode of
+      an output.
+    </description>
+
+    <enum name="mode">
+      <entry name="off" value="0"
+             summary="Output is turned off."/>
+      <entry name="on" value="1"
+             summary="Output is turned on, no power saving"/>
+    </enum>
+
+    <enum name="error">
+      <entry name="invalid_mode" value="1" summary="inexistent power save mode"/>
+    </enum>
+
+    <request name="set_mode">
+      <description summary="Set an outputs power save mode">
+        Set an output's power save mode to the given mode. The mode change
+        is effective immediately. If the output does not support the given
+        mode a failed event is sent.
+      </description>
+      <arg name="mode" type="uint" enum="mode" summary="the power save mode to set"/>
+    </request>
+
+    <event name="mode">
+      <description summary="Report a power management mode change">
+        Report the power management mode change of an output.
+
+        The mode event is sent after an output changed its power
+        management mode. The reason can be a client using set_mode or the
+        compositor deciding to change an output's mode.
+        This event is also sent immediately when the object is created
+        so the client is informed about the current power management mode.
+      </description>
+      <arg name="mode" type="uint" enum="mode"
+           summary="the output's new power management mode"/>
+    </event>
+
+    <event name="failed">
+      <description summary="object no longer valid">
+        This event indicates that the output power management mode control
+        is no longer valid. This can happen for a number of reasons,
+        including:
+        - The output doesn't support power management
+        - Another client already has exclusive power management mode control
+          for this output
+        - The output disappeared
+
+        Upon receiving this event, the client should destroy this object.
+      </description>
+    </event>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy this power management">
+        Destroys the output power management mode control object.
+      </description>
+    </request>
+  </interface>
+</protocol>

scripts/generateVersion.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+cp -fr ./src/version.h.in ./src/version.h
+
+HASH=$(git rev-parse HEAD)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+MESSAGE=$(git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1 | sed -e 's/#//g' -e 's/\"//g')
+DATE=$(git show ${GIT_COMMIT_HASH} --no-patch --format=%cd --date=local)
+DIRTY=$(git diff-index --quiet HEAD -- || echo dirty)
+TAG=$(git describe --tags)
+
+sed -i -e "s#@HASH@#${HASH}#" ./src/version.h
+sed -i -e "s#@BRANCH@#${BRANCH}#" ./src/version.h
+sed -i -e "s#@MESSAGE@#${MESSAGE}#" ./src/version.h
+sed -i -e "s#@DATE@#${DATE}#" ./src/version.h
+sed -i -e "s#@DIRTY@#${DIRTY}#" ./src/version.h
+sed -i -e "s#@TAG@#${TAG}#" ./src/version.h

scripts/hyprlandStaticAsan.diff

@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 71766a8c..bd8cdc0e 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -101,7 +101,7 @@ message(STATUS "Checking deps...")
+ find_package(Threads REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ find_package(OpenGL REQUIRED)
+-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2 hyprcursor) # we do not check for wlroots, as we provide it ourselves
++pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2 hyprcursor libffi) # we do not check for wlroots, as we provide it ourselves
+ 
+ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+ 
+@@ -121,6 +121,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+         message(STATUS "Enabling ASan")
+ 
+         target_link_libraries(Hyprland asan)
++        target_link_libraries(Hyprland ${CMAKE_SOURCE_DIR}/libwayland-server.a)
+         target_compile_options(Hyprland PUBLIC -fsanitize=address)
+     endif()
+ 

scripts/waylandStatic.diff

@@ -0,0 +1,23 @@
+diff --git a/src/meson.build b/src/meson.build
+index 5d04334..6645eec 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -170,7 +170,7 @@ if get_option('libraries')
+ 		error('We probably need to bump the SONAME of libwayland-server and -client')
+ 	endif
+ 
+-	wayland_server = library(
++	wayland_server = static_library(
+ 		'wayland-server',
+ 		sources: [
+ 			wayland_server_protocol_core_h,
+@@ -180,9 +180,6 @@ if get_option('libraries')
+ 			'wayland-shm.c',
+ 			'event-loop.c'
+ 		],
+-		# To avoid an unnecessary SONAME bump, wayland 1.x.y produces
+-		# libwayland-server.so.0.x.y.
+-		version: '.'.join(['0', wayland_version[1], wayland_version[2]]),
+ 		dependencies: [
+ 			epoll_dep,
+ 			ffi_dep,

src/Compositor.hpp

@@ -10,18 +10,29 @@
 #include "config/ConfigManager.hpp"
 #include "managers/ThreadManager.hpp"
 #include "managers/XWaylandManager.hpp"
-#include "managers/InputManager.hpp"
+#include "managers/input/InputManager.hpp"
 #include "managers/LayoutManager.hpp"
 #include "managers/KeybindManager.hpp"
 #include "managers/AnimationManager.hpp"
 #include "managers/EventManager.hpp"
+#include "managers/ProtocolManager.hpp"
+#include "managers/SessionLockManager.hpp"
+#include "managers/HookSystemManager.hpp"
 #include "debug/HyprDebugOverlay.hpp"
+#include "debug/HyprNotificationOverlay.hpp"
 #include "helpers/Monitor.hpp"
-#include "helpers/Workspace.hpp"
-#include "Window.hpp"
+#include "desktop/Workspace.hpp"
+#include "desktop/Window.hpp"
 #include "render/Renderer.hpp"
 #include "render/OpenGL.hpp"
 #include "hyprerror/HyprError.hpp"
+#include "plugins/PluginSystem.hpp"
+#include "helpers/Watchdog.hpp"
+
+enum eManagersInitStage {
+    STAGE_PRIORITY = 0,
+    STAGE_LATE
+};
 
 class CCompositor {
   public:
@@ -30,113 +41,187 @@ public:
 
     // ------------------ WLR BASICS ------------------ //
     wl_display*                                m_sWLDisplay;
+    wl_event_loop*                             m_sWLEventLoop;
     wlr_backend*                               m_sWLRBackend;
+    wlr_session*                               m_sWLRSession;
     wlr_renderer*                              m_sWLRRenderer;
     wlr_allocator*                             m_sWLRAllocator;
     wlr_compositor*                            m_sWLRCompositor;
     wlr_subcompositor*                         m_sWLRSubCompositor;
     wlr_data_device_manager*                   m_sWLRDataDevMgr;
+    wlr_drm*                                   m_sWRLDRM;
+    wlr_drm_lease_v1_manager*                  m_sWRLDRMLeaseMgr;
     wlr_xdg_activation_v1*                     m_sWLRXDGActivation;
     wlr_output_layout*                         m_sWLROutputLayout;
-    wlr_idle*                        m_sWLRIdle;
+    wlr_idle_notifier_v1*                      m_sWLRIdleNotifier;
     wlr_layer_shell_v1*                        m_sWLRLayerShell;
     wlr_xdg_shell*                             m_sWLRXDGShell;
     wlr_cursor*                                m_sWLRCursor;
-    wlr_xcursor_manager*             m_sWLRXCursorMgr;
     wlr_virtual_keyboard_manager_v1*           m_sWLRVKeyboardMgr;
     wlr_output_manager_v1*                     m_sWLROutputMgr;
     wlr_presentation*                          m_sWLRPresentation;
-    wlr_scene*                       m_sWLRScene;
-    wlr_input_inhibit_manager*       m_sWLRInhibitMgr;
     wlr_keyboard_shortcuts_inhibit_manager_v1* m_sWLRKbShInhibitMgr;
     wlr_egl*                                   m_sWLREGL;
     int                                        m_iDRMFD;
-    wlr_ext_workspace_manager_v1*    m_sWLREXTWorkspaceMgr;
-    wlr_linux_dmabuf_v1*             m_sWLRDmabuf;
     wlr_pointer_constraints_v1*                m_sWLRPointerConstraints;
     wlr_relative_pointer_manager_v1*           m_sWLRRelPointerMgr;
     wlr_server_decoration_manager*             m_sWLRServerDecoMgr;
     wlr_xdg_decoration_manager_v1*             m_sWLRXDGDecoMgr;
     wlr_virtual_pointer_manager_v1*            m_sWLRVirtPtrMgr;
     wlr_foreign_toplevel_manager_v1*           m_sWLRToplevelMgr;
+    wlr_tablet_manager_v2*                     m_sWLRTabletManager;
+    wlr_xdg_foreign_registry*                  m_sWLRForeignRegistry;
+    wlr_idle_inhibit_manager_v1*               m_sWLRIdleInhibitMgr;
+    wlr_pointer_gestures_v1*                   m_sWLRPointerGestures;
+    wlr_output_power_manager_v1*               m_sWLROutputPowerMgr;
+    wlr_input_method_manager_v2*               m_sWLRIMEMgr;
+    wlr_text_input_manager_v3*                 m_sWLRTextInputMgr;
+    wlr_xdg_activation_v1*                     m_sWLRActivation;
+    wlr_linux_dmabuf_v1*                       m_sWLRLinuxDMABuf;
+    wlr_backend*                               m_sWLRHeadlessBackend;
+    wlr_session_lock_manager_v1*               m_sWLRSessionLockMgr;
+    wlr_gamma_control_manager_v1*              m_sWLRGammaCtrlMgr;
+    wlr_cursor_shape_manager_v1*               m_sWLRCursorShapeMgr;
+    wlr_tearing_control_manager_v1*            m_sWLRTearingControlMgr;
     // ------------------------------------------------- //
 
+    std::string                               m_szWLDisplaySocket   = "";
+    std::string                               m_szInstanceSignature = "";
+    std::string                               m_szCurrentSplash     = "error";
 
-    const char*             m_szWLDisplaySocket;
+    std::vector<std::shared_ptr<CMonitor>>    m_vMonitors;
+    std::vector<std::shared_ptr<CMonitor>>    m_vRealMonitors; // for all monitors, even those turned off
+    std::vector<std::unique_ptr<CWindow>>     m_vWindows;
+    std::vector<std::unique_ptr<CWorkspace>>  m_vWorkspaces;
+    std::vector<CWindow*>                     m_vWindowsFadingOut;
+    std::vector<SLayerSurface*>               m_vSurfacesFadingOut;
 
-    std::list<SMonitor>     m_lMonitors;
-    std::list<CWindow>      m_lWindows;
-    std::list<SXDGPopup>    m_lXDGPopups;
-    std::list<CWorkspace>   m_lWorkspaces;
-    std::list<SSubsurface>  m_lSubsurfaces;
-    std::list<CWindow*>     m_lWindowsFadingOut;
-    std::list<SLayerSurface*> m_lSurfacesFadingOut;
+    std::unordered_map<std::string, uint64_t> m_mMonitorIDMap;
 
+    void                                      initServer();
     void                                      startCompositor();
-    void                    cleanupExit();
+    void                                      cleanup();
+    void                                      createLockFile();
+    void                                      removeLockFile();
 
     wlr_surface*                              m_pLastFocus   = nullptr;
     CWindow*                                  m_pLastWindow  = nullptr;
-    SMonitor*               m_pLastMonitor = nullptr;
+    CMonitor*                                 m_pLastMonitor = nullptr;
+
+    std::vector<CWindow*>                     m_vWindowFocusHistory; // first element is the most recently focused.
 
     SSeat                                     m_sSeat;
 
     bool                                      m_bReadyToProcess = false;
+    bool                                      m_bSessionActive  = true;
+    bool                                      m_bDPMSStateON    = true;
+    bool                                      m_bUnsafeState    = false;   // unsafe state is when there is no monitors.
+    bool                                      m_bNextIsUnsafe   = false;   // because wlroots
+    CMonitor*                                 m_pUnsafeOutput   = nullptr; // fallback output for the unsafe state
+    bool                                      m_bExitTriggered  = false;   // For exit dispatcher
+    bool                                      m_bIsShuttingDown = false;
 
     // ------------------------------------------------- //
 
-    SMonitor*               getMonitorFromID(const int&);
-    SMonitor*               getMonitorFromName(const std::string&);
-    SMonitor*               getMonitorFromCursor();
-    SMonitor*               getMonitorFromVector(const Vector2D&);
+    CMonitor*      getMonitorFromID(const int&);
+    CMonitor*      getMonitorFromName(const std::string&);
+    CMonitor*      getMonitorFromDesc(const std::string&);
+    CMonitor*      getMonitorFromCursor();
+    CMonitor*      getMonitorFromVector(const Vector2D&);
     void           removeWindowFromVectorSafe(CWindow*);
     void           focusWindow(CWindow*, wlr_surface* pSurface = nullptr);
     void           focusSurface(wlr_surface*, CWindow* pWindowOwner = nullptr);
     bool           windowExists(CWindow*);
     bool           windowValidMapped(CWindow*);
-    CWindow*                vectorToWindow(const Vector2D&);
-    CWindow*                vectorToWindowIdeal(const Vector2D&);
-    CWindow*                vectorToWindowTiled(const Vector2D&);
-    wlr_surface*            vectorToLayerSurface(const Vector2D&, std::list<SLayerSurface*>*, Vector2D*);
+    bool           monitorExists(CMonitor*);
+    CWindow*       vectorToWindowUnified(const Vector2D&, uint8_t properties, CWindow* pIgnoreWindow = nullptr);
+    wlr_surface*   vectorToLayerSurface(const Vector2D&, std::vector<std::unique_ptr<SLayerSurface>>*, Vector2D*, SLayerSurface**);
+    wlr_surface*   vectorToLayerPopupSurface(const Vector2D&, CMonitor* monitor, Vector2D*, SLayerSurface**);
     wlr_surface*   vectorWindowToSurface(const Vector2D&, CWindow*, Vector2D& sl);
-    CWindow*                windowFromCursor();
-    CWindow*                windowFloatingFromCursor();
-    SMonitor*               getMonitorFromOutput(wlr_output*);
-    CWindow*                getWindowForPopup(wlr_xdg_popup*);
+    Vector2D       vectorToSurfaceLocal(const Vector2D&, CWindow*, wlr_surface*);
+    CMonitor*      getMonitorFromOutput(wlr_output*);
+    CMonitor*      getRealMonitorFromOutput(wlr_output*);
     CWindow*       getWindowFromSurface(wlr_surface*);
+    CWindow*       getWindowFromHandle(uint32_t);
+    CWindow*       getWindowFromZWLRHandle(wl_resource*);
     bool           isWorkspaceVisible(const int&);
     CWorkspace*    getWorkspaceByID(const int&);
     CWorkspace*    getWorkspaceByName(const std::string&);
     CWorkspace*    getWorkspaceByString(const std::string&);
     void           sanityCheckWorkspaces();
-    int                     getWindowsOnWorkspace(const int&);
+    void           updateWorkspaceWindowDecos(const int&);
+    int            getWindowsOnWorkspace(const int& id, std::optional<bool> onlyTiled = {});
+    CWindow*       getUrgentWindow();
+    bool           hasUrgentWindowOnWorkspace(const int&);
     CWindow*       getFirstWindowOnWorkspace(const int&);
-    void                    fixXWaylandWindowsOnWorkspace(const int&);
+    CWindow*       getTopLeftWindowOnWorkspace(const int&);
     CWindow*       getFullscreenWindowOnWorkspace(const int&);
     bool           doesSeatAcceptInput(wlr_surface*);
     bool           isWindowActive(CWindow*);
-    void                    moveWindowToTop(CWindow*);
-    void                    cleanupFadingOut();
+    void           changeWindowZOrder(CWindow*, bool);
+    void           cleanupFadingOut(const int& monid);
     CWindow*       getWindowInDirection(CWindow*, char);
-    void                    deactivateAllWLRWorkspaces(wlr_ext_workspace_handle_v1* exclude = nullptr);
-    CWindow*                getNextWindowOnWorkspace(CWindow*);
+    CWindow*       getNextWindowOnWorkspace(CWindow*, bool focusableOnly = false, std::optional<bool> floating = {});
+    CWindow*       getPrevWindowOnWorkspace(CWindow*, bool focusableOnly = false, std::optional<bool> floating = {});
     int            getNextAvailableNamedWorkspace();
     bool           isPointOnAnyMonitor(const Vector2D&);
-    CWindow*                getConstraintWindow(SMouse*);
-    SMonitor*               getMonitorInDirection(const char&);
-    void                    updateAllWindowsBorders();
-    void                    updateWindowBorderColor(CWindow*);
+    bool           isPointOnReservedArea(const Vector2D& point, const CMonitor* monitor = nullptr);
+    CMonitor*      getMonitorInDirection(const char&);
+    CMonitor*      getMonitorInDirection(CMonitor*, const char&);
+    void           updateAllWindowsAnimatedDecorationValues();
+    void           updateWorkspaceWindows(const int64_t& id);
+    void           updateWindowAnimatedDecorationValues(CWindow*);
+    int            getNextAvailableMonitorID(std::string const& name);
+    void           moveWorkspaceToMonitor(CWorkspace*, CMonitor*, bool noWarpCursor = false);
+    void           swapActiveWorkspaces(CMonitor*, CMonitor*);
+    CMonitor*      getMonitorFromString(const std::string&);
+    bool           workspaceIDOutOfBounds(const int64_t&);
+    void           setWindowFullscreen(CWindow*, bool, eFullscreenMode mode = FULLSCREEN_INVALID);
+    void           updateFullscreenFadeOnWorkspace(CWorkspace*);
+    CWindow*       getX11Parent(CWindow*);
+    void           scheduleFrameForMonitor(CMonitor*);
+    void           addToFadingOutSafe(SLayerSurface*);
+    void           addToFadingOutSafe(CWindow*);
+    CWindow*       getWindowByRegex(const std::string&);
+    void           warpCursorTo(const Vector2D&, bool force = false);
+    SLayerSurface* getLayerSurfaceFromWlr(wlr_layer_surface_v1*);
+    SLayerSurface* getLayerSurfaceFromSurface(wlr_surface*);
+    void           closeWindow(CWindow*);
+    Vector2D       parseWindowVectorArgsRelative(const std::string&, const Vector2D&);
+    void           forceReportSizesToWindowsOnWorkspace(const int&);
+    CWorkspace*    createNewWorkspace(const int&, const int&, const std::string& name = ""); // will be deleted next frame if left empty and unfocused!
+    void           renameWorkspace(const int&, const std::string& name = "");
+    void           setActiveMonitor(CMonitor*);
+    bool           isWorkspaceSpecial(const int&);
+    int            getNewSpecialID();
+    void           performUserChecks();
+    void           moveWindowToWorkspaceSafe(CWindow* pWindow, CWorkspace* pWorkspace);
+    CWindow*       getForceFocus();
+    void           notifyIdleActivity();
+    void           setIdleActivityInhibit(bool inhibit);
+    void           arrangeMonitors();
+    void           enterUnsafeState();
+    void           leaveUnsafeState();
+    void           setPreferredScaleForSurface(wlr_surface* pSurface, double scale);
+    void           setPreferredTransformForSurface(wlr_surface* pSurface, wl_output_transform transform);
+    void           updateSuspendedStates();
+
+    std::string    explicitConfigPath;
 
   private:
     void     initAllSignals();
-};
+    void     removeAllSignals();
+    void     setRandomSplash();
+    void     initManagers(eManagersInitStage stage);
+    void     prepareFallbackOutput();
 
+    uint64_t m_iHyprlandPID = 0;
+};
 
 inline std::unique_ptr<CCompositor> g_pCompositor;
 
 // For XWayland
-inline std::map<std::string, xcb_atom_t> HYPRATOMS = {
-    HYPRATOM("_NET_WM_WINDOW_TYPE"),
+inline std::map<std::string, xcb_atom_t> HYPRATOMS = {HYPRATOM("_NET_WM_WINDOW_TYPE"),
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_NORMAL"),
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_DOCK"),
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_DIALOG"),
@@ -147,4 +232,8 @@ inline std::map<std::string, xcb_atom_t> HYPRATOMS = {
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_DROPDOWN_MENU"),
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_POPUP_MENU"),
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_TOOLTIP"),
-    HYPRATOM("_NET_WM_WINDOW_TYPE_NOTIFICATION")};
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_NOTIFICATION"),
+                                                      HYPRATOM("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE"),
+                                                      HYPRATOM("_NET_SUPPORTING_WM_CHECK"),
+                                                      HYPRATOM("_NET_WM_NAME"),
+                                                      HYPRATOM("UTF8_STRING")};

src/SharedDefs.hpp

@@ -0,0 +1,72 @@
+#pragma once
+
+#include "helpers/Vector2D.hpp"
+#include <functional>
+
+enum eIcons {
+    ICON_WARNING = 0,
+    ICON_INFO,
+    ICON_HINT,
+    ICON_ERROR,
+    ICON_CONFUSED,
+    ICON_OK,
+    ICON_NONE
+};
+
+enum eRenderStage {
+    RENDER_PRE = 0,      /* Before binding the gl context */
+    RENDER_BEGIN,        /* Just when the rendering begins, nothing has been rendered yet. Damage, current render data in opengl valid. */
+    RENDER_PRE_WINDOWS,  /* Pre windows, post bottom and overlay layers */
+    RENDER_POST_WINDOWS, /* Post windows, pre top/overlay layers, etc */
+    RENDER_LAST_MOMENT,  /* Last moment to render with the gl context */
+    RENDER_POST,         /* After rendering is finished, gl context not available anymore */
+    RENDER_POST_MIRROR,  /* After rendering a mirror */
+    RENDER_PRE_WINDOW,   /* Before rendering a window (any pass) Note some windows (e.g. tiled) may have 2 passes (main & popup) */
+    RENDER_POST_WINDOW,  /* After rendering a window (any pass) */
+};
+
+enum eInputType {
+    INPUT_TYPE_AXIS = 0,
+    INPUT_TYPE_BUTTON,
+    INPUT_TYPE_DRAG_START,
+    INPUT_TYPE_DRAG_END,
+    INPUT_TYPE_MOTION
+};
+
+struct SCallbackInfo {
+    bool cancelled = false; /* on cancellable events, will cancel the event. */
+};
+
+struct SWindowDecorationExtents {
+    Vector2D topLeft;
+    Vector2D bottomRight;
+
+    //
+    SWindowDecorationExtents operator*(const double& scale) const {
+        return SWindowDecorationExtents{topLeft * scale, bottomRight * scale};
+    }
+
+    SWindowDecorationExtents round() {
+        return {topLeft.round(), bottomRight.round()};
+    }
+
+    bool operator==(const SWindowDecorationExtents& other) const {
+        return topLeft == other.topLeft && bottomRight == other.bottomRight;
+    }
+
+    void addExtents(const SWindowDecorationExtents& other) {
+        topLeft     = topLeft.getComponentMax(other.topLeft);
+        bottomRight = bottomRight.getComponentMax(other.bottomRight);
+    }
+};
+
+enum eHyprCtlOutputFormat {
+    FORMAT_NORMAL = 0,
+    FORMAT_JSON
+};
+
+struct SHyprCtlCommand {
+    std::string                                                   name  = "";
+    bool                                                          exact = true;
+    std::function<std::string(eHyprCtlOutputFormat, std::string)> fn;
+};

src/Window.cpp

@@ -1,16 +0,0 @@
-#include "Window.hpp"
-#include "Compositor.hpp"
-
-CWindow::CWindow() {
-    m_vRealPosition.create(AVARTYPE_VECTOR, &g_pConfigManager->getConfigValuePtr("animations:windows_speed")->floatValue, &g_pConfigManager->getConfigValuePtr("animations:windows")->intValue, &g_pConfigManager->getConfigValuePtr("animations:windows_curve")->strValue, (void*) this, AVARDAMAGE_ENTIRE);
-    m_vRealSize.create(AVARTYPE_VECTOR, &g_pConfigManager->getConfigValuePtr("animations:windows_speed")->floatValue, &g_pConfigManager->getConfigValuePtr("animations:windows")->intValue, &g_pConfigManager->getConfigValuePtr("animations:windows_curve")->strValue, (void*)this, AVARDAMAGE_ENTIRE);
-    m_cRealBorderColor.create(AVARTYPE_COLOR, &g_pConfigManager->getConfigValuePtr("animations:borders_speed")->floatValue, &g_pConfigManager->getConfigValuePtr("animations:borders")->intValue, &g_pConfigManager->getConfigValuePtr("animations:borders_curve")->strValue, (void*)this, AVARDAMAGE_BORDER);
-    m_fAlpha.create(AVARTYPE_FLOAT, &g_pConfigManager->getConfigValuePtr("animations:fadein_speed")->floatValue, &g_pConfigManager->getConfigValuePtr("animations:fadein")->intValue, &g_pConfigManager->getConfigValuePtr("animations:fadein_curve")->strValue, (void*)this, AVARDAMAGE_ENTIRE);
-}
-
-CWindow::~CWindow() {
-    if (g_pCompositor->isWindowActive(this)) {
-        g_pCompositor->m_pLastFocus = nullptr;
-        g_pCompositor->m_pLastWindow = nullptr;
-    }
-}

src/Window.hpp

@@ -1,108 +0,0 @@
-#pragma once
-
-#include "defines.hpp"
-#include "events/Events.hpp"
-#include "helpers/SubsurfaceTree.hpp"
-#include "helpers/AnimatedVariable.hpp"
-#include "render/decorations/IHyprWindowDecoration.hpp"
-#include <deque>
-
-struct SWindowSpecialRenderData {
-    float alpha = 1.f;
-};  
-
-struct SWindowAdditionalConfigData {
-    std::string animationStyle = "";
-    int rounding = -1; // -1 means no
-};
-
-class CWindow {
-public:
-    CWindow();
-    ~CWindow();
-
-    DYNLISTENER(commitWindow);
-    DYNLISTENER(mapWindow);
-    DYNLISTENER(unmapWindow);
-    DYNLISTENER(destroyWindow);
-    DYNLISTENER(setTitleWindow);
-    DYNLISTENER(fullscreenWindow);
-    DYNLISTENER(newPopupXDG);
-   // DYNLISTENER(newSubsurfaceWindow);
-
-    union {
-        wlr_xdg_surface* xdg;
-        wlr_xwayland_surface* xwayland;
-    } m_uSurface;
-
-    // this is the position and size of the "bounding box"
-    Vector2D            m_vPosition = Vector2D(0,0);
-    Vector2D            m_vSize = Vector2D(0,0);
-
-    // this is the real position and size used to draw the thing
-    CAnimatedVariable m_vRealPosition;
-    CAnimatedVariable m_vRealSize;
-
-    // this is used for pseudotiling
-    bool                m_bIsPseudotiled = false;
-    Vector2D            m_vPseudoSize = Vector2D(0,0);
-
-    uint64_t        m_iTags = 0;
-    bool            m_bIsFloating = false;
-    bool            m_bDraggingTiled = false; // for dragging around tiled windows
-    bool            m_bIsFullscreen = false;
-    uint64_t        m_iMonitorID = -1;
-    std::string     m_szTitle = "";
-    int             m_iWorkspaceID = -1;
-
-    bool            m_bIsMapped = false;
-
-    bool            m_bRequestsFloat = false;
-
-    // This is for fullscreen apps
-    bool            m_bCreatedOverFullscreen = false;
-
-    // XWayland stuff
-    bool            m_bIsX11 = false;
-    bool            m_bMappedX11 = false;
-    uint64_t        m_iX11Type = 0;
-    bool            m_bIsModal = false;
-    bool            m_bX11DoesntWantBorders = false;
-    DYNLISTENER(activateX11);
-    DYNLISTENER(configureX11);
-    //
-
-    // For nofocus
-    bool            m_bNoFocus = false;
-
-    SSurfaceTreeNode* m_pSurfaceTree = nullptr;
-
-    // Animated border
-    CAnimatedVariable m_cRealBorderColor;
-
-    // Fade in-out
-    CAnimatedVariable m_fAlpha;
-    bool            m_bFadingOut = false;
-    bool            m_bReadyToDelete = false;
-    Vector2D        m_vOriginalClosedPos; // these will be used for calculations later on in
-    Vector2D        m_vOriginalClosedSize; // drawing the closing animations
-
-    // For hidden windows and stuff
-    bool            m_bHidden = false;
-
-    // Foreign Toplevel proto
-    wlr_foreign_toplevel_handle_v1* m_phForeignToplevel = nullptr;
-
-    // Window decorations
-    std::deque<std::unique_ptr<IHyprWindowDecoration>> m_dWindowDecorations;
-
-    // Special render data, rules, etc
-    SWindowSpecialRenderData m_sSpecialRenderData;
-    SWindowAdditionalConfigData m_sAdditionalConfigData;
-
-    // For the list lookup
-    bool operator==(const CWindow& rhs) {
-        return m_uSurface.xdg == rhs.m_uSurface.xdg && m_uSurface.xwayland == rhs.m_uSurface.xwayland && m_vPosition == rhs.m_vPosition && m_vSize == rhs.m_vSize && m_bFadingOut == rhs.m_bFadingOut;
-    }
-
-};