diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/freya/packages/admin.scm | 19 | ||||
| -rw-r--r-- | modules/freya/packages/assembly.scm | 32 | ||||
| -rw-r--r-- | modules/freya/packages/cmake.scm | 32 | ||||
| -rw-r--r-- | modules/freya/packages/freedesktop.scm | 40 | ||||
| -rw-r--r-- | modules/freya/packages/gl.scm | 21 | ||||
| -rw-r--r-- | modules/freya/packages/hypr.scm | 790 | ||||
| -rw-r--r-- | modules/freya/packages/wm.scm | 742 | ||||
| -rw-r--r-- | modules/freya/system.scm | 5 |
8 files changed, 812 insertions, 869 deletions
diff --git a/modules/freya/packages/admin.scm b/modules/freya/packages/admin.scm deleted file mode 100644 index 6b4160f..0000000 --- a/modules/freya/packages/admin.scm +++ /dev/null @@ -1,19 +0,0 @@ -(define-module (freya packages admin) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (gnu packages admin)) - -(define-public libseat-0.8.0 - (package - (inherit libseat) - (name "libseat") - (version "0.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~kennylevinsen/seatd") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "02wzrgp8di6hqmicnm2fim6jnvbn62wy248ikvdvrhiywrb7i931")))))) diff --git a/modules/freya/packages/assembly.scm b/modules/freya/packages/assembly.scm deleted file mode 100644 index 5b6609f..0000000 --- a/modules/freya/packages/assembly.scm +++ /dev/null @@ -1,32 +0,0 @@ -(define-module (freya packages assembly) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix packages) - #:use-module (gnu packages autotools) - #:use-module (gnu packages python)) - -(define-public udis86 - (let ((revision "186") - (commit "5336633af70f3917760a6d441ff02d93477b0c86")) - (package - (name "udis86") - (version (git-version "1.7.2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/canihavesomecoffee/udis86") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0y5z1169wff578jylpafsww4px4y6gickhcs885a9c660d8xs9qy")))) - (build-system gnu-build-system) - (native-inputs (list autoconf automake libtool python-minimal-wrapper)) - (home-page "https://github.com/canihavesomecoffee/udis86") - (synopsis "Disassembler Library for x86 and x86-64") - (description - "Udis86 is a disassembler for the x86 and x86-64 class of instruction -set architectures. It consists of a C library called @code{libudis86} and a -command line tool called @code{udcli} that incorporates the library.") - (license license:bsd-2)))) diff --git a/modules/freya/packages/cmake.scm b/modules/freya/packages/cmake.scm deleted file mode 100644 index c05ec7b..0000000 --- a/modules/freya/packages/cmake.scm +++ /dev/null @@ -1,32 +0,0 @@ -(define-module (freya packages cmake) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module (guix utils) - #:use-module (gnu packages check) - #:use-module (gnu packages debug) - #:use-module (gnu packages cmake) - #:use-module (gnu packages python)) - -(define-public cmake-minimal-3.30.0 - (package - (inherit cmake-minimal) - (name "cmake-minimal") - (version "3.30.0") - (source (origin - (inherit (package-source cmake-minimal)) - (method url-fetch) - (uri (string-append "https://cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "0ygmk5wfs00kjx59ackda13049ighgjmyyc0yls4q5aw0pk5nzhm")))) - (arguments - (substitute-keyword-arguments (package-arguments cmake-minimal) - ((#:configure-flags flags ''()) - #~(append (list "-DCMake_ENABLE_DEBUGGER=false") #$flags)) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'delete-help-documentation) - (delete 'check))))))) diff --git a/modules/freya/packages/freedesktop.scm b/modules/freya/packages/freedesktop.scm deleted file mode 100644 index 4016a45..0000000 --- a/modules/freya/packages/freedesktop.scm +++ /dev/null @@ -1,40 +0,0 @@ -(define-module (freya packages freedesktop) - #:use-module (guix git-download) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (gnu packages check) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages python)) - -(define-public libinput-minimal-1.26.1 - (package - (inherit libinput-minimal) - (name "libinput-minimal") - (version "1.26.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.freedesktop.org/libinput/libinput.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "094k23i10jjmgdzhv5lj7xpc3fgkwi9afcihf0l2fjj71ym8l9fy")))) - (native-inputs - (modify-inputs (package-native-inputs libinput) - (append python-minimal-wrapper python-pytest))))) - - -(define-public wayland-1.23.1 - (package - (inherit wayland) - (name "wayland") - (version "1.23.1") - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.freedesktop.org/" name - "/" name "/-/releases/" version "/downloads/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6")))))) diff --git a/modules/freya/packages/gl.scm b/modules/freya/packages/gl.scm deleted file mode 100644 index dd5e7c2..0000000 --- a/modules/freya/packages/gl.scm +++ /dev/null @@ -1,21 +0,0 @@ -(define-module (freya packages gl) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module (guix utils) - #:use-module (ice-9 match) - #:use-module (gnu packages) - #:use-module (gnu packages gl)) - -(define-public mesa-libglvnd - (package - (inherit mesa) - (inputs - (modify-inputs - (package-inputs mesa) - (prepend libglvnd))) - (arguments - (substitute-keyword-arguments (package-arguments mesa) - ((#:configure-flags flags ''()) - #~(append (list "-Dglvnd=true") - #$flags)))))) diff --git a/modules/freya/packages/hypr.scm b/modules/freya/packages/hypr.scm new file mode 100644 index 0000000..a3fce00 --- /dev/null +++ b/modules/freya/packages/hypr.scm @@ -0,0 +1,790 @@ +(define-module (freya packages hypr) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (gnu packages wm) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages cpp) + #:use-module (gnu packages check) + #:use-module (gnu packages gcc) + #:use-module (gnu packages build-tools) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages compression) + #:use-module (gnu packages gtk) + #:use-module (gnu packages gl) + #:use-module (gnu packages linux) + #:use-module (gnu packages gnome) + #:use-module (gnu packages pciutils) + #:use-module (gnu packages image) + #:use-module (gnu packages xml) + #:use-module (gnu packages web) + #:use-module (gnu packages version-control) + #:use-module (gnu packages python) + #:use-module (gnu packages autotools) + #:use-module (gnu packages xorg) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages man) + #:use-module (gnu packages qt) + #:use-module (gnu packages cmake) + #:use-module (gnu packages admin) + #:use-module (gnu packages glib) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (guix build-system meson) + #:use-module (guix build-system trivial) + #:use-module (guix build-system gnu) + #:use-module (guix build utils) + #:use-module (freya packages linux) + #:use-module (guix utils)) + + +;; Newer packages needed for Hyprland +;; +;; - libinput +;; - wayland +;; - hwdata +;; - udis86 +;; - xorg headers +;; - mesa libglvnd + + +(define-public libinput-minimal-for-hyprland + (hidden-package (package + (inherit libinput-minimal) + (name "libinput-minimal") + (version "1.26.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/libinput/libinput.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "094k23i10jjmgdzhv5lj7xpc3fgkwi9afcihf0l2fjj71ym8l9fy")))) + (native-inputs + (modify-inputs (package-native-inputs libinput) + (append python-minimal-wrapper python-pytest)))))) + + +(define-public wayland-for-hyprland + (hidden-package (package + (inherit wayland) + (name "wayland") + (version "1.23.1") + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.freedesktop.org/" name + "/" name "/-/releases/" version "/downloads/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6"))))))) + + +(define-public hwdata-for-hyprland + (hidden-package (package + (inherit hwdata) + (arguments + (substitute-keyword-arguments (package-arguments hwdata) + ((#:phases _) #~%standard-phases))) + (outputs '("out"))))) + + +(define-public udis86-for-hyprland + (let ((revision "186") + (commit "5336633af70f3917760a6d441ff02d93477b0c86")) + (hidden-package (package + (name "udis86") + (version (git-version "1.7.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/canihavesomecoffee/udis86") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y5z1169wff578jylpafsww4px4y6gickhcs885a9c660d8xs9qy")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool python-minimal-wrapper)) + (home-page "https://github.com/canihavesomecoffee/udis86") + (synopsis "Disassembler Library for x86 and x86-64") + (description + "Udis86 is a disassembler for the x86 and x86-64 class of instruction +set architectures. It consists of a C library called @code{libudis86} and a +command line tool called @code{udcli} that incorporates the library.") + (license license:bsd-2))))) + + +(define-public xorg-server-xwayland-for-hyprland + (hidden-package (package + (inherit xorg-server-xwayland) + (arguments + (substitute-keyword-arguments (package-arguments xorg-server-xwayland) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'install 'install-headers + (lambda _ + (let ((fmw (string-append #$output "/include"))) + (mkdir-p fmw) + (copy-recursively "include" fmw)) + )) + ))))))) + + +(define-public mesa-for-hyprland + (hidden-package (package + (inherit mesa) + (inputs + (modify-inputs + (package-inputs mesa) + (prepend libglvnd))) + (arguments + (substitute-keyword-arguments (package-arguments mesa) + ((#:configure-flags flags ''()) + #~(append (list "-Dglvnd=true") + #$flags))))))) + + +;; Hyprland Packages + + +(define-public hyprland-protocols + (package + (name "hyprland-protocols") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprland-protocols") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0x86w7z3415qvixfhk9a8v5fnbnxdydzx366qz0mpmfg5h86qyha")))) + (build-system meson-build-system) + (home-page "https://hyprland.org") + (synopsis "Wayland protocol extensions for Hyprland") + (description + "This package provides Wayland protocol extensions for Hyprland and it +exists in an effort to bridge the gap between Hyprland and KDE/Gnome's +functionality. Since @code{wlr-protocols} is closed for new submissions, and +@code{wayland-protocols} is very slow with changes, this package will hold +protocols used by Hyprland to bridge the aforementioned gap.") + (license license:bsd-3))) + + + +;; Common Packages needed by +;; multiple hyprland packages + +(define hyprwayland-common + (list ; libs + cairo + pango + ; mesa + mesa-for-hyprland + libglvnd + ; wayland + wayland-for-hyprland + wayland-protocols-next + hyprland-protocols)) + +;; Common Packages needed by +;; aquamarine and any package +;; that uses it + +(define aquamarine-common + (append hyprwayland-common + (list ; lib + libseat + pixman + libinput-minimal-for-hyprland + ; x11 + libdisplay-info + libxcb + libxinerama + libxcursor + libxkbcommon + xcb-util + xcb-util-errors + xcb-util-keysyms + xcb-util-wm))) + + +(define-public hyprlang + (package + (name "hyprlang") + (version "0.5.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprlang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yvfrz3hdyxzhngzhr0bgc5279ra5fv01hbfi6pdj84pz0lpaw02")))) + (build-system cmake-build-system) + (native-inputs (list gcc-13 + pkg-config)) + (inputs (list hyprutils)) + (home-page "https://hyprland.org/hyprlang/") + (synopsis "Official implementation library for hypr config language") + (description + "This package provides the official implementation for hypr configuration +language used in @code{hyprland}.") + (license license:gpl3+))) + + +(define-public hyprcursor + (package + (name "hyprcursor") + (version "0.1.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprcursor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rdn03ln7pqcwp8h4nmi7nc489q8y25dd3v4paq8ykvwzhvs3a1n")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) + (inputs (list cairo hyprlang librsvg libzip tomlplusplus)) + (native-inputs (list gcc-13 pkg-config)) + (home-page "https://hyprland.org/") + (synopsis "Hyprland cursor format, library and utilities") + (description + "This package provides Hyprland cursor format, library and utilities.") + (license license:bsd-3))) + + +(define-public hyprwayland-scanner + (package + (name "hyprwayland-scanner") + (version "0.4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprwayland-scanner") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r7ay4zjkfyr0xd73wz99qhnqjq7nma98gm51wm9lmai4igw90qw")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) + (inputs (list pugixml)) + (native-inputs (list gcc-13 pkg-config)) + (home-page "https://github.com/hyprwm/hyprwayland-scanner") + (synopsis "hyprland implementation of wayland-scanner, in and for c++") + (description + "this package provides a hyprland implementation of wayland-scanner, in and +for c++.") + (license license:bsd-3))) + + +(define-public hyprutils + (package + (name "hyprutils") + (version "0.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprutils") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01dh24rf62gb6xm32f7mfv6wx0dxprr1q9y73hvv7xanrjyia2zn")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) + (native-inputs (list gcc-13 pkg-config pixman)) + (home-page "https://github.com/hyprwm/hyprutils") + (synopsis "Hyprland utilities library used across the ecosystem ") + (description + "this package provides hyprutils") + (license license:bsd-3))) + + +(define-public aquamarine + (package + (name "aquamarine") + (version "0.4.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/aquamarine") + (commit (string-append "v" version)))) + (patches (list + (local-file "patches/aquamarine-fix-cmake.patch"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0x1zz1ywchs0awkjkvdgskgqnp6pz5lqwmgr8g0zc0i7inhyg1p3")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f)) + (native-inputs + (list gcc-13 + pkg-config + mesa-headers + hyprwayland-scanner + hwdata-for-hyprland)) + (inputs + (append aquamarine-common (list hyprutils))) + (home-page "https://hyprland.org") + (synopsis "Aquamarine is a very light linux rendering backend library ") + (description "") ;; TODO: this + (license license:bsd-3))) + + +(define-public hyprland + (package + (name "hyprland") + (version "0.44.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/Hyprland") + (commit (string-append "v" version)))) + (patches (list + (local-file "patches/hyprland-fix-cmake.patch"))) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("hyprpm" + "subprojects")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11vw1h9al4jvqprwbrmxvcpxwhvsjj398wbz4flqbnmxa8idvdq1")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f + #:cmake cmake-3.30 + #:build-type "release" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src" "\\.cpp$") + (("/usr/local(/bin/Hyprland)" _ path) + (string-append #$output path)) + (("/usr") #$output) + (("(execAndGet\\(\")\\<(cat|fc-list|lspci)\\>" + _ pre cmd) + (string-append + pre (search-input-file + inputs (string-append "bin/" cmd)))) + (("\\<cc\\>") (search-input-file inputs "bin/gcc")) + ;; NOTE: Add binutils to inputs will override ld-wrapper. + (("(execAndGet\\(\\(\")\\<nm\\>" _ pre) + (string-append pre #$binutils "/bin/nm")) + (("\\<(addr2line|objcopy)\\>" _ cmd) + (string-append #$binutils "/bin/" cmd))) + (substitute* "CMakeLists.txt" + (("libudis86") "udis86")) + )) + (add-after 'fix-path 'fix-protocols + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((protocols (string-append + (getcwd) + "/subprojects/hyprland-protocols/protocols"))) + (mkdir-p protocols) + (copy-recursively + (search-input-directory inputs "share/hyprland-protocols/protocols") + protocols)))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (mesa (assoc-ref inputs "mesa"))) + (wrap-program (string-append out "/bin/Hyprland") + `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d"))))))) + ))) + (native-inputs + (list gcc-14 + jq + pkg-config + hyprwayland-scanner + hwdata-for-hyprland)) + (inputs + (append aquamarine-common + (list ; libs + pciutils + libliftoff + udis86-for-hyprland + xorg-server-xwayland-for-hyprland + ; hypr + aquamarine + hyprcursor + hyprlang + hyprutils))) + (home-page "https://hyprland.org") + (synopsis "Dynamic tiling Wayland compositor based on wlroots") + (description + "Hyprland is a dynamic tiling Wayland compositor based on @code{wlroots} +th doesn't sacrifice on its looks. It supports multiple layouts, fancy +ef cts, has a very flexible IPC model allowing for a lot of customization, and +mo .") + (license license:bsd-3))) + + +(define-public hyprpaper + (package + (name "hyprpaper") + (version "0.7.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/hyprwm/hyprpaper" + "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 + "1d23nsj5hzyxwvhkg9a7x1b8jgyqwzad91zb1894jnxr2d844h28")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) + (native-inputs + (list gcc-13 + pkg-config)) + (inputs + (append hyprwayland-common + (list ; libs + libjpeg-turbo + libwebp + ; hypr + hyprlang))) + (home-page "https://github.com/hyprwm/hyprpaper") + (license license:bsd-3) + (synopsis "Hyprpaper is a blazing fast wayland wallpaper utility with IPC controls.") + (description "Hyprpaper is a blazing fast wayland wallpaper utility with IPC controls."))) + + +(define-public hypridle + (package + (name "hypridle") + (version "0.1.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/hyprwm/hypridle" + "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 + "0ybwip7yq9q569naz5bnrvcdz99648c4pln2zi30z21y333hpas0")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) + (native-inputs + (list gcc-13 + pkg-config)) + (inputs + (append hyprwayland-common + (list hyprlang + sdbus-c++))) + (home-page "https://github.com/hyprwm/hypridle") + (license license:bsd-3) + (synopsis "Hyprland's idle daemon ") + (description "Hyprland's idle daemon "))) + + +(define-public hyprlock + (package + (name "hyprlock") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/hyprwm/hyprlock" + "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 + "0q5smah3zmg8vwipfd74n664mavkgzrqjn0i57gwmbwc111illw7")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (mesa (assoc-ref inputs "mesa"))) + (wrap-program (string-append out "/bin/hyprlock") + `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d")))))))))) + (native-inputs + (list gcc-13 + pkg-config + mesa-headers + wayland)) + (inputs + (append aquamarine-common + (list ; lib + libjpeg-turbo + libwebp + libdrm + linux-pam + ; hypr + aquamarine + hyprlang + hyprutils))) + (home-page "https://github.com/hyprwm/hyprlock") + (license license:bsd-3) + (synopsis "Screen locker for Hyprland") + (description "Screen locker for hyprland."))) + + +(define-public xdg-desktop-portal-hyprland + (package + (name "xdg-desktop-portal-hyprland") + (version "1.3.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/xdg-desktop-portal-hyprland") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17ba9jkccyp8gv79ds70khgm5wm6x8zs5m9nkilq4n2j7fsa8cfl")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ;No tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "\\.cp?*$") + (("/bin/sh") "sh") + (("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd) + (search-input-file inputs (string-append "/bin/" cmd))) + (("\\<(hyprland-share-picker)\\>" _ cmd) + (string-append #$output "/bin/" cmd)))))))) + (native-inputs + (list gcc-13 + pkg-config + hyprwayland-scanner)) + (inputs + (append hyprwayland-common + (list ; libs + bash-minimal + grim + sdbus-c++ + slurp + qtbase + pipewire-new + qtwayland + ; hypr + hyprland + hyprlang + hyprutils))) + (home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland") + (synopsis "XDG Desktop Portal backend for Hyprland") + (description + "This package provides @code{xdg-desktop-portal-hyprland}, which extends +@code{xdg-desktop-portal-wlr} for Hyprland with support for +@code{xdg-desktop-portal} screenshot and casting interfaces, while adding a few +extra portals specific to Hyprland, mostly for window sharing.") + (license license:bsd-3))) + + +(define-public hyprland-plugin-hy3 + (package + (name "hyprland-plugin-hy3") + (version "0.44.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/outfoxxed/hy3.git") + (commit (string-append "hl" version)))) + (sha256 + (base32 + "03gxjkn43j85ff8d0hx9nhv5bfwv7vw7m8kacpmajmfnx43mldg9")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f + #:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release"))) + (native-inputs + (list gcc-13 + pkg-config + hyprwayland-scanner)) + (inputs + (append aquamarine-common + (list ; lib + gcc-13 + libdrm + ; hypr + aquamarine + hyprland + hyprlang + hyprutils))) + (license license:gpl3) + (home-page "https://github.com/outfoxxed/hy3") + (synopsis "i3 / sway like layout for hyprland.") + (description "Hyprland plugin for an i3 / sway like manual tiling layout"))) + + +(define-syntax hyprland-plugin-impl + (syntax-rules () + ((_ plugin) + (package + (name (string-append "hyprland-plugin-" plugin)) + (version "0.44.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprland-plugins.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0v2zwvrjgc7zg4l8c50934kyq3y5x9f0d34gh3kyh44grfn8w9zx")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f + #:cmake cmake-3.30 + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir (string-append "../source/" plugin "/"))))))) + (native-inputs + (list pkg-config + gcc-13 + hyprwayland-scanner)) + (inputs + (append aquamarine-common + (list ; libs + gcc-13 + libdrm + ; hypr + aquamarine + hyprland + hyprlang + hyprutils))) + (license license:bsd-3) + (home-page "https://github.com/hyprwm/hyprland-plugins") + (synopsis (string-append "official " plugin " plugin for hyprland")) + (description (string-append "official " plugin " plugin for hyprland")))))) + + +(define-public hyprland-plugin-borders-plus-plus + (hyprland-plugin-impl "borders-plus-plus")) + + +(define-public hyprland-plugin-csgo-vulkan-fix + (hyprland-plugin-impl "csgo-vulkan-fix")) + + +(define-public hyprland-plugin-hyprbars + (hyprland-plugin-impl "hyprbars")) + + +(define-public hyprland-plugin-hyprexpo + (hyprland-plugin-impl "hyprexpo")) + + +(define-public hyprland-plugin-hyprtrails + (hyprland-plugin-impl "hyprtrails")) + + +(define-public hyprland-plugin-hyprwinwrap + (hyprland-plugin-impl "hyprwinwrap")) + + +(define-public hyprland-plugins + (package + (name "hyprland-plugins") + (version "0.44.0") + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (begin (mkdir %output) #t))) + (license license:bsd-3) + (home-page "https://github.com/hyprwm/hyprland-plugins") + (synopsis "A collection of all the official hyprland plugins") + (description "A metapackage containing inputs for each official plugin") + (propagated-inputs (list hyprland-plugin-borders-plus-plus + hyprland-plugin-csgo-vulkan-fix + hyprland-plugin-hyprbars + hyprland-plugin-hyprexpo + hyprland-plugin-hyprtrails + hyprland-plugin-hyprwinwrap)))) + + +(define-syntax hyprland-contrib-impl + (syntax-rules () + ((_ contrib) + (package + (name (string-append "hyprland-conrib-" contrib)) + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/contrib.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0ld0sj7ahf9jf8cqzbqkhj3m2w60027ixic24ih26nwy90b5qjwx")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check) + (add-after 'unpack 'chdir + (lambda _ (chdir (string-append "../source/" contrib "/")))) + (add-after 'chdir 'patch-make + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("scdoc") (string-append (assoc-ref inputs "scdoc") "/bin/scdoc"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "install" (string-append "PREFIX=" (assoc-ref outputs "out"))))) + ))) + (native-inputs (list scdoc)) + (license license:expat) + (home-page "https://github.com/hyprwm/contrib") + (synopsis (string-append "official " contrib " script for hyprland")) + (description (string-append "official " contrib " script for hyprland")))))) + + +(define-public hyprland-contrib-grimblast + (hyprland-contrib-impl "grimblast")) + + +(define-public hyprland-contrib-hyprprop + (hyprland-contrib-impl "hyprprop")) + + +(define-public hyprland-contrib-scratchpad + (hyprland-contrib-impl "scratchpad")) + + +(define-public hyprland-contrib-shellevents + (hyprland-contrib-impl "shellevents")) + + +(define-public hyprland-contrib + (package + (name "hyprland-contrib") + (version "0.1") + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (begin (mkdir %output) #t))) + (license license:bsd-3) + (home-page "https://github.com/hyprwm/contrib") + (synopsis "A collection of all the official hyprland contrib scripts") + (description "A metapackage containing inputs for each official contrib script") + (propagated-inputs (list hyprland-contrib-grimblast + hyprland-contrib-hyprprop + hyprland-contrib-scratchpad + hyprland-contrib-shellevents)))) diff --git a/modules/freya/packages/wm.scm b/modules/freya/packages/wm.scm index 372a419..4235657 100644 --- a/modules/freya/packages/wm.scm +++ b/modules/freya/packages/wm.scm @@ -2,47 +2,11 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages wm) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages cpp) - #:use-module (gnu packages gcc) - #:use-module (gnu packages build-tools) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xdisorg) - #:use-module (gnu packages gtk) - #:use-module (gnu packages gl) - #:use-module (gnu packages linux) - #:use-module (gnu packages gnome) - #:use-module (gnu packages compression) - #:use-module (gnu packages pciutils) - #:use-module (gnu packages image) - #:use-module (gnu packages glib) - #:use-module (gnu packages xml) - #:use-module (gnu packages web) - #:use-module (gnu packages version-control) - #:use-module (gnu packages python) - #:use-module (gnu packages autotools) - #:use-module (gnu packages xorg) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages base) - #:use-module (gnu packages bash) - #:use-module (gnu packages man) - #:use-module (gnu packages qt) #:use-module (guix download) #:use-module (guix packages) #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module (guix build-system cmake) - #:use-module (guix build-system meson) - #:use-module (guix build-system trivial) - #:use-module (guix build-system qt) - #:use-module (guix build-system gnu) #:use-module (guix build utils) - #:use-module (freya packages gl) - #:use-module (freya packages admin) - #:use-module (freya packages cmake) - #:use-module (freya packages linux) - #:use-module (freya packages freedesktop) - #:use-module (freya packages assembly) #:use-module (guix utils)) @@ -80,689 +44,23 @@ #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true"))))) -(define-public libliftoff - (package - (name "libliftoff") - (version "0.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/emersion/libliftoff" - "/archive/refs/tags/v" version ".tar.gz")) - (sha256 - (base32 - "17ssbjbv8njgvfha8zsx4nixpi5xxl1rwvk0lcacgqk0nmjyb23s")))) - (build-system meson-build-system) - (native-inputs (list gcc-13 - pkg-config - cmake-minimal-3.30.0 - libdrm)) - (home-page "https://github.com/emersion/libliftoff") - (synopsis "Lightweight KMS plane library") - (description "") - (license license:expat))) - - -(define-public wayland-protocols-1.36 - (package - (inherit wayland-protocols) - (name "wayland-protocols") - (version "1.36") - (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.freedesktop.org/wayland/wayland-protocols" - "/-/releases/" version "/downloads/" - "wayland-protocols-" version ".tar.xz")) - (sha256 - (base32 - "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi")))))) - - -(define-public hyprlang - (package - (name "hyprlang") - (version "0.5.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/hyprlang") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yvfrz3hdyxzhngzhr0bgc5279ra5fv01hbfi6pdj84pz0lpaw02")))) - (build-system cmake-build-system) - (native-inputs (list gcc-13 - pkg-config)) - (inputs (list hyprutils)) - (home-page "https://hyprland.org/hyprlang/") - (synopsis "Official implementation library for hypr config language") - (description - "This package provides the official implementation for hypr configuration -language used in @code{hyprland}.") - (license license:gpl3+))) - - -(define-public hyprcursor - (package - (name "hyprcursor") - (version "0.1.10") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/hyprcursor") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1rdn03ln7pqcwp8h4nmi7nc489q8y25dd3v4paq8ykvwzhvs3a1n")))) - (build-system cmake-build-system) - (arguments (list #:tests? #f)) - (inputs (list cairo hyprlang librsvg libzip tomlplusplus)) - (native-inputs (list gcc-13 pkg-config)) - (home-page "https://hyprland.org/") - (synopsis "Hyprland cursor format, library and utilities") - (description - "This package provides Hyprland cursor format, library and utilities.") - (license license:bsd-3))) - - -(define-public hyprland-protocols - (package - (name "hyprland-protocols") - (version "0.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/hyprland-protocols") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0x86w7z3415qvixfhk9a8v5fnbnxdydzx366qz0mpmfg5h86qyha")))) - (build-system meson-build-system) - (home-page "https://hyprland.org") - (synopsis "Wayland protocol extensions for Hyprland") - (description - "This package provides Wayland protocol extensions for Hyprland and it -exists in an effort to bridge the gap between Hyprland and KDE/Gnome's -functionality. Since @code{wlr-protocols} is closed for new submissions, and -@code{wayland-protocols} is very slow with changes, this package will hold -protocols used by Hyprland to bridge the aforementioned gap.") - (license license:bsd-3))) - - -(define-public hyprwayland-scanner - (package - (name "hyprwayland-scanner") - (version "0.4.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/hyprwayland-scanner") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0r7ay4zjkfyr0xd73wz99qhnqjq7nma98gm51wm9lmai4igw90qw")))) - (build-system cmake-build-system) - (arguments (list #:tests? #f)) - (inputs (list pugixml)) - (native-inputs (list gcc-13 pkg-config)) - (home-page "https://github.com/hyprwm/hyprwayland-scanner") - (synopsis "hyprland implementation of wayland-scanner, in and for c++") - (description - "this package provides a hyprland implementation of wayland-scanner, in and -for c++.") - (license license:bsd-3))) - - -(define-public hyprutils - (package - (name "hyprutils") - (version "0.2.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/hyprutils") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01dh24rf62gb6xm32f7mfv6wx0dxprr1q9y73hvv7xanrjyia2zn")))) - (build-system cmake-build-system) - (arguments (list #:tests? #f)) - (native-inputs (list gcc-13 pkg-config)) - (propagated-inputs (list pixman)) - (home-page "https://github.com/hyprwm/hyprutils") - (synopsis "Hyprland utilities library used across the ecosystem ") - (description - "this package provides hyprutils") - (license license:bsd-3))) - - -(define hwdata-for-hyprland - (package - (inherit hwdata) - (arguments - (substitute-keyword-arguments (package-arguments hwdata) - ((#:phases _) #~%standard-phases))) - (outputs '("out")))) - - -(define-public aquamarine - (package - (name "aquamarine") - (version "0.4.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/aquamarine") - (commit (string-append "v" version)))) - (patches (list - (local-file "patches/aquamarine-fix-cmake.patch"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0x1zz1ywchs0awkjkvdgskgqnp6pz5lqwmgr8g0zc0i7inhyg1p3")))) - (build-system cmake-build-system) - (arguments - (list #:tests? #f)) - (native-inputs - (list gcc-13 - pkg-config - mesa-headers - hyprwayland-scanner - hwdata-for-hyprland)) - (propagated-inputs - (list mesa-libglvnd - libglvnd - libseat-0.8.0 - libinput-minimal-1.26.1 - libxkbcommon - libdisplay-info - libxcb - libxinerama - libxcursor - xcb-util - xcb-util-errors - xcb-util-keysyms - xcb-util-wm - wayland-1.23.1 - wayland-protocols-1.36)) - (inputs - (list hyprutils)) - (home-page "https://hyprland.org") - (synopsis "Aquamarine is a very light linux rendering backend library ") - (description "") ;; TODO: this - (license license:bsd-3))) - - -(define xorg-server-xwayland-for-hyprland - (package - (inherit xorg-server-xwayland) - (arguments - (substitute-keyword-arguments (package-arguments xorg-server-xwayland) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'install 'install-headers - (lambda _ - (let ((fmw (string-append #$output "/include"))) - (mkdir-p fmw) - (copy-recursively "include" fmw)) - )) - )))))) - - -(define-public hyprland - (package - (name "hyprland") - (version "0.44.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/Hyprland") - (commit (string-append "v" version)))) - (patches (list - (local-file "patches/hyprland-fix-cmake.patch"))) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file-recursively - '("hyprpm" - "subprojects")))) - (file-name (git-file-name name version)) - (sha256 - (base32 "11vw1h9al4jvqprwbrmxvcpxwhvsjj398wbz4flqbnmxa8idvdq1")))) - (build-system cmake-build-system) - (arguments - (list #:tests? #f - #:build-type "release" - #:cmake cmake-minimal-3.30.0 - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "src" "\\.cpp$") - (("/usr/local(/bin/Hyprland)" _ path) - (string-append #$output path)) - (("/usr") #$output) - (("(execAndGet\\(\")\\<(cat|fc-list|lspci)\\>" - _ pre cmd) - (string-append - pre (search-input-file - inputs (string-append "bin/" cmd)))) - (("\\<cc\\>") (search-input-file inputs "bin/gcc")) - ;; NOTE: Add binutils to inputs will override ld-wrapper. - (("(execAndGet\\(\\(\")\\<nm\\>" _ pre) - (string-append pre #$binutils "/bin/nm")) - (("\\<(addr2line|objcopy)\\>" _ cmd) - (string-append #$binutils "/bin/" cmd))) - (substitute* "CMakeLists.txt" - (("libudis86") "udis86")) - )) - (add-after 'fix-path 'fix-protocols - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((protocols (string-append - (getcwd) - "/subprojects/hyprland-protocols/protocols"))) - (mkdir-p protocols) - (copy-recursively - (search-input-directory inputs "share/hyprland-protocols/protocols") - protocols)))) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (mesa (assoc-ref inputs "mesa"))) - (wrap-program (string-append out "/bin/Hyprland") - `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d"))))))) - ))) - (native-inputs - (list gcc-14 - jq - pkg-config - hyprwayland-scanner - hwdata-for-hyprland)) - (inputs - (list gcc-14 - - cairo - pango - pciutils - libliftoff - udis86 - - aquamarine - hyprcursor - hyprland-protocols - hyprlang - hyprutils - - xorg-server-xwayland-for-hyprland)) - (home-page "https://hyprland.org") - (synopsis "Dynamic tiling Wayland compositor based on wlroots") - (description - "Hyprland is a dynamic tiling Wayland compositor based on @code{wlroots} -th doesn't sacrifice on its looks. It supports multiple layouts, fancy -ef cts, has a very flexible IPC model allowing for a lot of customization, and -mo .") - (license license:bsd-3))) - - -(define-public hyprpaper - (package - (name "hyprpaper") - (version "0.7.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hyprwm/hyprpaper" - "/archive/refs/tags/v" version ".tar.gz")) - (sha256 - (base32 - "1d23nsj5hzyxwvhkg9a7x1b8jgyqwzad91zb1894jnxr2d844h28")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) - (native-inputs - (list gcc-13 - pkg-config)) - (inputs - (list hyprlang - wayland-protocols-1.36 - wayland - cairo - libjpeg-turbo - libwebp - mesa - pango - libglvnd)) - (home-page "https://github.com/hyprwm/hyprpaper") - (license license:bsd-3) - (synopsis "Hyprpaper is a blazing fast wayland wallpaper utility with IPC controls.") - (description "Hyprpaper is a blazing fast wayland wallpaper utility with IPC controls."))) - - -(define-public hypridle - (package - (name "hypridle") - (version "0.1.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hyprwm/hypridle" - "/archive/refs/tags/v" version ".tar.gz")) - (sha256 - (base32 - "0ybwip7yq9q569naz5bnrvcdz99648c4pln2zi30z21y333hpas0")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) - (native-inputs - (list gcc-13 - pkg-config)) - (inputs - (list hyprlang - wayland-protocols-1.36 - wayland - sdbus-c++)) - (home-page "https://github.com/hyprwm/hypridle") - (license license:bsd-3) - (synopsis "Hyprland's idle daemon ") - (description "Hyprland's idle daemon "))) - - -(define-public hyprlock - (package - (name "hyprlock") - (version "0.4.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hyprwm/hyprlock" - "/archive/refs/tags/v" version ".tar.gz")) - (sha256 - (base32 - "0q5smah3zmg8vwipfd74n664mavkgzrqjn0i57gwmbwc111illw7")))) - (build-system cmake-build-system) - (arguments - (list - #:tests? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (mesa (assoc-ref inputs "mesa"))) - (wrap-program (string-append out "/bin/hyprlock") - `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d")))))))))) - (native-inputs - (list gcc-13 - pkg-config - mesa-headers - wayland)) - (inputs - (list cairo - pango - libxkbcommon - hyprlang - hyprutils - mesa-libglvnd - libdrm - libglvnd - wayland-protocols-1.36 - libjpeg-turbo - libwebp - linux-pam)) - (home-page "https://github.com/hyprwm/hyprlock") - (license license:bsd-3) - (synopsis "Screen locker for Hyprland") - (description "Screen locker for hyprland."))) - - -(define-public xdg-desktop-portal-hyprland - (package - (name "xdg-desktop-portal-hyprland") - (version "1.3.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/xdg-desktop-portal-hyprland") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17ba9jkccyp8gv79ds70khgm5wm6x8zs5m9nkilq4n2j7fsa8cfl")))) - (build-system cmake-build-system) - (arguments - (list #:tests? #f ;No tests - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "." "\\.cp?*$") - (("/bin/sh") "sh") - (("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd) - (search-input-file inputs (string-append "/bin/" cmd))) - (("\\<(hyprland-share-picker)\\>" _ cmd) - (string-append #$output "/bin/" cmd)))))))) - (native-inputs - (list gcc-13 - pkg-config - wayland - hyprwayland-scanner)) - (inputs - (list bash-minimal - grim - hyprland - hyprutils - hyprland-protocols - wayland-protocols-1.36 - hyprlang - mesa-libglvnd - pipewire-new - qtwayland - sdbus-c++ - slurp - qtbase)) - (home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland") - (synopsis "XDG Desktop Portal backend for Hyprland") - (description - "This package provides @code{xdg-desktop-portal-hyprland}, which extends -@code{xdg-desktop-portal-wlr} for Hyprland with support for -@code{xdg-desktop-portal} screenshot and casting interfaces, while adding a few -extra portals specific to Hyprland, mostly for window sharing.") - (license license:bsd-3))) - - -(define-public hyprland-plugin-hy3 - (package - (name "hyprland-plugin-hy3") - (version "0.44.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/outfoxxed/hy3.git") - (commit (string-append "hl" version)))) - (sha256 - (base32 - "03gxjkn43j85ff8d0hx9nhv5bfwv7vw7m8kacpmajmfnx43mldg9")))) - (build-system cmake-build-system) - (arguments - (list #:tests? #f - #:cmake cmake-minimal-3.30.0 - #:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release"))) - (native-inputs - (list gcc-13 - pkg-config - hyprwayland-scanner)) - (inputs - (list gcc-13 - aquamarine - pango - gcc-13 - hyprland-protocols - hyprland - hyprlang - hyprutils - libdrm)) - (license license:gpl3) - (home-page "https://github.com/outfoxxed/hy3") - (synopsis "i3 / sway like layout for hyprland.") - (description "Hyprland plugin for an i3 / sway like manual tiling layout"))) - - -(define-syntax hyprland-plugin-impl - (syntax-rules () - ((_ plugin) - (package - (name (string-append "hyprland-plugin-" plugin)) - (version "0.44.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/hyprland-plugins.git") - (commit (string-append "v" version)))) - (sha256 - (base32 - "0v2zwvrjgc7zg4l8c50934kyq3y5x9f0d34gh3kyh44grfn8w9zx")) - (file-name (git-file-name name version)))) - (build-system cmake-build-system) - (arguments - (list #:tests? #f - #:cmake cmake-minimal-3.30.0 - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir (string-append "../source/" plugin "/"))))))) - (native-inputs - (list pkg-config - gcc-13 - hyprwayland-scanner)) - (inputs - (list gcc-13 - aquamarine - pango - hyprland-protocols - hyprland - hyprlang - hyprutils - libdrm)) - (license license:bsd-3) - (home-page "https://github.com/hyprwm/hyprland-plugins") - (synopsis (string-append "official " plugin " plugin for hyprland")) - (description (string-append "official " plugin " plugin for hyprland")))))) - - -(define-public hyprland-plugin-borders-plus-plus - (hyprland-plugin-impl "borders-plus-plus")) - - -(define-public hyprland-plugin-csgo-vulkan-fix - (hyprland-plugin-impl "csgo-vulkan-fix")) - - -(define-public hyprland-plugin-hyprbars - (hyprland-plugin-impl "hyprbars")) - - -(define-public hyprland-plugin-hyprexpo - (hyprland-plugin-impl "hyprexpo")) - - -(define-public hyprland-plugin-hyprtrails - (hyprland-plugin-impl "hyprtrails")) - - -(define-public hyprland-plugin-hyprwinwrap - (hyprland-plugin-impl "hyprwinwrap")) - - -(define-public hyprland-plugins - (package - (name "hyprland-plugins") - (version "0.44.0") - (source #f) - (build-system trivial-build-system) - (arguments '(#:builder (begin (mkdir %output) #t))) - (license license:bsd-3) - (home-page "https://github.com/hyprwm/hyprland-plugins") - (synopsis "A collection of all the official hyprland plugins") - (description "A metapackage containing inputs for each official plugin") - (propagated-inputs (list hyprland-plugin-borders-plus-plus - hyprland-plugin-csgo-vulkan-fix - hyprland-plugin-hyprbars - hyprland-plugin-hyprexpo - hyprland-plugin-hyprtrails - hyprland-plugin-hyprwinwrap)))) - - -(define-syntax hyprland-contrib-impl - (syntax-rules () - ((_ contrib) - (package - (name (string-append "hyprland-conrib-" contrib)) - (version "0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/contrib.git") - (commit (string-append "v" version)))) - (sha256 - (base32 - "0ld0sj7ahf9jf8cqzbqkhj3m2w60027ixic24ih26nwy90b5qjwx")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (delete 'check) - (add-after 'unpack 'chdir - (lambda _ (chdir (string-append "../source/" contrib "/")))) - (add-after 'chdir 'patch-make - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Makefile" - (("scdoc") (string-append (assoc-ref inputs "scdoc") "/bin/scdoc"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "install" (string-append "PREFIX=" (assoc-ref outputs "out"))))) - ))) - (native-inputs (list scdoc)) - (license license:expat) - (home-page "https://github.com/hyprwm/contrib") - (synopsis (string-append "official " contrib " script for hyprland")) - (description (string-append "official " contrib " script for hyprland")))))) - - -(define-public hyprland-contrib-grimblast - (hyprland-contrib-impl "grimblast")) - - -(define-public hyprland-contrib-hyprprop - (hyprland-contrib-impl "hyprprop")) - - -(define-public hyprland-contrib-scratchpad - (hyprland-contrib-impl "scratchpad")) - - -(define-public hyprland-contrib-shellevents - (hyprland-contrib-impl "shellevents")) - - -(define-public hyprland-contrib - (package - (name "hyprland-contrib") - (version "0.1") - (source #f) - (build-system trivial-build-system) - (arguments '(#:builder (begin (mkdir %output) #t))) - (license license:bsd-3) - (home-page "https://github.com/hyprwm/contrib") - (synopsis "A collection of all the official hyprland contrib scripts") - (description "A metapackage containing inputs for each official contrib script") - (propagated-inputs (list hyprland-contrib-grimblast - hyprland-contrib-hyprprop - hyprland-contrib-scratchpad - hyprland-contrib-shellevents)))) +;(define-public libliftoff +; (package +; (name "libliftoff") +; (version "0.1.0") +; (source (origin +; (method url-fetch) +; (uri (string-append "https://github.com/emersion/libliftoff" +; "/archive/refs/tags/v" version ".tar.gz")) +; (sha256 +; (base32 +; "17ssbjbv8njgvfha8zsx4nixpi5xxl1rwvk0lcacgqk0nmjyb23s")))) +; (build-system meson-build-system) +; (native-inputs (list gcc-13 +; pkg-config +; cmake-minimal-3.30.0 +; libdrm)) +; (home-page "https://github.com/emersion/libliftoff") +; (synopsis "Lightweight KMS plane library") +; (description "") +; (license license:expat))) diff --git a/modules/freya/system.scm b/modules/freya/system.scm index 501d0e9..eba3301 100644 --- a/modules/freya/system.scm +++ b/modules/freya/system.scm @@ -32,7 +32,6 @@ #:use-module (freya bootloader uki) #:use-module (freya packages certs) #:use-module (freya packages linux) - #:use-module (freya packages gl) #:use-module (freya packages qt) #:use-module (freya packages wm) #:use-module (freya packages pulseaudio) @@ -83,6 +82,7 @@ "xf86-video-qxl" ; video audio + "mesa" "mesa-utils" "glu" "libglvnd" @@ -156,8 +156,7 @@ ; system virt-manager-ovmf - freya-ca-certs - mesa) + freya-ca-certs) %base-packages)) (services |