1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-25 09:09:49 +01:00
Commit graph

166 commits

Author SHA1 Message Date
Vaxry
914851b91a
internal: better versioning ()
* better versioning

* meson: better versioning

* nix: better versioning

---------

Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
2023-10-10 20:21:57 +01:00
vaxerski
c8cc811e85 nix: update patches for meson changes 2023-09-17 00:08:19 +01:00
Mihai Fufezan
f6473aa3ad flake.lock: update nixpkgs and xdph
- nix/module: update xdph override
- nix/overlays: remove hyprland-share-picker (now built directly inside xdph)
2023-09-14 12:03:48 +03:00
Mihai Fufezan
0be6b03ee9
Nix: use gcc13Stdenv 2023-09-07 11:20:08 +03:00
Mihai Fufezan
0d5a6f3168
Nix: fix xdph build 2023-09-07 00:52:19 +03:00
Vaxry
61a71c65ac
internal: Formatter rework () 2023-09-06 12:51:36 +02:00
Mihai Fufezan
4ddcda93f5
Nix: remove hidpi patches 2023-09-04 21:12:27 +03:00
Vaxry
4a41d013a2
internal: Fix XDP multi-portal issues ()
* add a hyprland portals conf

* remove portal checks

* typo

* Nix: remove portal patch

---------

Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
2023-08-26 17:12:21 +02:00
Tristan Daniël Maat
4d14edd8a5 nix module: Fix attempted workaround for option name change
`system.stateVersion` is about *system state*, i.e., stuff that was
created by old software versions on users' machines, like SQL
databases that have moved to a different directory or such.

It will not help figure out whether an option has been renamed.
2023-08-23 13:32:06 +03:00
Mihai Fufezan
17d8e4750b
Nix: remove waybar completely
Get it from Nixpkgs instead.
2023-08-21 15:34:38 +03:00
Mihai Fufezan
19f3e927d9 Nix: deprecate waybar-hyprland
Now merged in Nixpkgs, no reason to keep it here.
2023-08-16 18:46:57 +03:00
Mihai Fufezan
78fa8adadc
Nix/module: fix system when config.allowAlias is false 2023-08-16 13:39:20 +03:00
Mihai Fufezan
a0cf890292
Nix/module: final fix 2023-08-14 11:53:58 +03:00
Mihai Fufezan
9ba6eab8db
ugh 2023-08-14 11:37:08 +03:00
Mihai Fufezan
9180fb08e2
Nix/module: fix package option 2023-08-14 11:12:57 +03:00
Mihai Fufezan
314f88de53
Nix: disable nixpkgs module in ours 2023-08-14 11:03:01 +03:00
Mihai Fufezan
aff4a1e237 Nix: don't warn against xdpw and xdph being present
It seems that, on NixOS at least, having both the Hyprland and the wlr
desktop portals does not result in unexpected behaviour. xdph will be
started and wlr ignored.
2023-08-14 10:39:57 +03:00
Mihai Fufezan
2650224c1f Nix: remove hidpi from modules 2023-08-14 10:39:57 +03:00
Mihai Fufezan
e510c6a7fc Nix: add deprecation messages for removed/renamed flags 2023-08-14 10:39:57 +03:00
Mihai Fufezan
c1bcbdb3dd Nix: remove HiDPI patches
- remove `hidpiXWayland` option
- rename `nvidiaPatches` -> `enableNvidiaPatches` for consistency
2023-08-14 10:39:57 +03:00
Jacob Birkett
d20837bef8
Nix: corrections for overlays, overrideable systems ()
* nix: overlays: move waybar-hyprland to own overlay

* flake: use legacyPackages for formatter

Run `nix fmt` for all files.

* flake: move default overlay to nix/overlays.nix

* nix: lib: remove lib

* nix: overlays: extras: explicitly include xdph overlays

* nix: use interpolation for versions

* nix: overlays: include deps with hyprland-packages

* flake: make systems overrideable

* flake: packages: inherit from overlaid pkgsFor
2023-08-12 15:22:37 +03:00
rewine
fe9453c643 Nix: enable systemd only when it's available on hostPlatform 2023-08-09 20:25:28 +03:00
Gonçalo Duarte
12cb109137 Nix: fix nvidia patch for dual gpu system
* this fix it most important for laptops with dgpu
 * remove post patch line wlroots.nix

Signed-off-by: Gonçalo Duarte <gonegrier.duarte@gmail.com>
2023-08-08 21:27:05 +03:00
Mihai Fufezan
bf0d8ab4a3
NixOS module: check system version for fonts 2023-07-29 23:05:35 +03:00
rewine
a805905a49
Nix: move wayland-scanner to nativeBuildInputs () 2023-07-29 16:31:01 +03:00
Okirshen
c36c30c17b Renamed deprecated value in nix config
See 83793ca898 for more info.
2023-07-27 11:36:35 +03:00
Mihai Fufezan
427321c5ab Nix: bump nixpkgs
Nix: bump wlroots
2023-07-25 10:27:41 +03:00
psentee
2bbe3aa122 nix: use final.hyprland instead of prev.hyprland in waybar-hyprland
Currently, waybar-hyprland package adds `prev.hyprland` to `$PATH`. This is nixpkgs' default hyprland, not hyprland injected by this overlay. I'd expect we want waybar-hyprland to depend on what's in `pkgs.hyprland` after this (and possibly user's other overlays) are applied – which is `final.hyprland`.
2023-07-23 23:19:57 +03:00
Mihai Fufezan
0af97636fa
Nix/HM module: solve conflict with upstream HM module 2023-07-21 15:55:56 +03:00
Mihai Fufezan
a58b70ca07 CI: update scripts 2023-07-20 11:20:22 +03:00
Mihai Fufezan
91e3c654d3 Nix: move patches to subdir 2023-07-20 11:20:22 +03:00
Jan Beich
8c9e2e1ff1
deps: update wlroots () 2023-07-18 12:13:59 +02:00
Mihai Fufezan
981c71e60a Nix CI: split inputs and wlroots updating
Now there are separate update scripts for wlroots and for all other
inputs.
2023-07-05 16:46:02 +03:00
Mihai Fufezan
64fc19cc81
Nix/portals.patch: conditionally check portals 2023-06-30 10:13:39 +03:00
Mihai Fufezan
62c75883d1
Nix: patch portals search dir 2023-06-27 00:51:04 +03:00
solopasha
1d902a4621 fix updating revision in wlroots.wrap
revision gets updated to the previous one, not current.
2023-06-15 23:32:52 +03:00
Michał
7f753cab9a
chore: fix typos ()
Some typos when spelling Hyprland
2023-06-07 20:18:39 +02:00
Ruby Iris Juric
74b49de883 Add hyprland to waybar-hyprland path as fallback for hyprctl 2023-05-27 15:35:25 +03:00
outfoxxed
642030f959
Fix not finding function symbols for hooking ()
Fixes no useful feedback about failing subcommand.
Fixes function hooks breaking when running under a path containing
spaces.

Replaced old usages with this function where possible.
Complex shell usages now use `execAndGetShell` which is equal to the
old function.
2023-05-16 23:39:14 +03:00
Mihai Fufezan
78826c6d18
meson & nix: install wlroots headers () 2023-05-16 20:50:18 +03:00
outfoxxed
5a3c144919 Add warning about setting hyprland config with home manager 2023-05-03 13:05:21 +03:00
outfoxxed
4fe5827598 Add plugin configuration to home manager module 2023-05-03 13:05:21 +03:00
Mihai Fufezan
2e28e88dfd
flake.lock: update nixpkgs
flake.nix, nix/overlays.nix: remove wayland-latest overlay (1.22 now in nixpkgs)
2023-05-03 00:15:58 +03:00
Jacob Birkett
80b2ac1cc5
Nix: fix recursion in package overlays ()
* nix: flake: fix improperly using prev.callPackage

* flake: cleanup with let blocks

* flake: make overlays use recursive packages

flake: separate overlays into multiple, combine into default

* nix: overlays: extract to own file

* flake: devShells: remove stdenv override

* overlays: hl-pkgs: xdph: remove needless overlay

Since the packages are now built with the overlays combined from inputs
and self, overriding specific dependencies (anywhere) is no longer
necessary.

* nix: overlays: extras: include xdph and share-picker

* nix: overlays: hl-pkgs: remove stdenv override
2023-05-02 20:54:29 +03:00
Ching Pei Yang
38bdbdb0f5
Plugin header overhaul ()
* meson: install headers

* Meson/CMake: add pkg-config file for headers

* makefile: install headers and pkgconfig

* CMake: move protocols to cmake

Co-authored-by: Ching Pei Yang <badnam3o.0@gmail.com>

---------

Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
Co-authored-by: vaxerski <43317083+vaxerski@users.noreply.github.com>
2023-04-27 00:59:16 +03:00
Mihai Fufezan
16d05a5c8b nix/*module: use mdDoc for documentation
Simplify and add more info to the docs.
2023-04-10 15:51:01 +03:00
Mihai Fufezan
7faead75bd
nix: update xdph
workflows/nix-update: update all inputs
2023-04-10 14:53:50 +03:00
Mihai Fufezan
10b9e9bbe5 nix/xwayland-hidpi: update patch 2023-04-08 00:01:48 +03:00
Oliver Ni
e994b0c8b8 Fix nix build options 2023-03-27 11:00:37 +03:00
Mihai Fufezan
cf51a31807 Nix: disable HiDPI for default package
NOTE: the package `hyprland-no-hidpi` was removed, and instead
`hyprland-hidpi` exists now.
2023-03-22 19:10:46 +02:00
Mihai Fufezan
5be42965ff Nix: rebase wlroots-hidpi patch 2023-03-22 19:10:46 +02:00
Mihai Fufezan
5ffe5dd594
Nix: add pango dep 2023-03-20 18:22:34 +02:00
Mihai Fufezan
1c67849bf1
Nix: fix meson patch again 2023-03-15 20:45:44 +02:00
Mihai Fufezan
595f2052c4
Nix: fix meson patch 2023-03-15 20:29:25 +02:00
Mihai Fufezan
0ad2d9f0b5 Nix: fix build on aarch64 2023-03-10 11:45:39 +02:00
Mihai Fufezan
5184b542b1
nix: show commit in hyprctl 2023-03-04 18:22:36 +02:00
Mihai Fufezan
c386c52cf9 Nix: fix hidpi patch 2023-03-04 15:51:54 +02:00
Mihai Fufezan
c1217066d1
Nix: fix hyprland-no-hidpi 2023-03-04 00:37:00 +02:00
Vaxry
8b81f41e52
Plugin System ()
---------

Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
2023-02-27 12:32:38 +00:00
pranaless
eb9fa8460f
fix typo () 2023-01-24 19:20:50 +02:00
Cole Mickens
31ab2349f9
nix: react to another stdenv change () 2023-01-18 10:37:56 +02:00
Mihai Fufezan
809b7181a8
nix: add hyprland-protocols through pkgconfig () 2023-01-07 20:25:20 +02:00
Mihai Fufezan
f3551021e0
Nix: add jq 2023-01-06 16:31:57 +02:00
jrun
0d14fd9136
add systemd support ()
* add systemd support
motivation for this is is proper ordering of related/bound/required
services to Hyprland (e.g. swaybg) that would need to have a compositor
ready.

this could possibly be a build-time option of course.

see also:
example/ files for example of services

Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>

* nix: add withSystemd flag

Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>
Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
Co-authored-by: Vaxerski <vaxry@vaxry.net>
2023-01-05 20:17:55 +01:00
Cole Mickens
0b26b1eed6 s/pkgs.system/pkgs.hostPlatform.system/g 2023-01-03 13:56:23 +02:00
Mihai Fufezan
d87d2dac0b
nix: update wlroots & fix updater 2022-12-24 02:20:02 +02:00
Gaoyang Zhang
8a23b66c39 nix: handle reloading of multiple/dead instances on home manager generation switch
Signed-off-by: Gaoyang Zhang <gy@blurgy.xyz>
2022-12-22 00:07:38 +02:00
Mihai Fufezan
781f0adad4
nix/hm-module: add disableAutoreload option 2022-12-19 23:39:37 +02:00
Jan Beich
2f6b37e103
Drop Pango (unused) ()
* Drop unused Pango dependency

* nix: explicitly depend on cairo (previously pulled via pango)

src/meson.build:4:0: ERROR: Dependency "cairo" not found, tried pkgconfig
2022-12-19 12:13:07 +00:00
Mihai Fufezan
27b8561d25
nix/hm-module: add nvidiaPatches option 2022-12-18 13:43:56 +02:00
Mihai Fufezan
e7940569dd
nix/wlroots: add nvidia patch 2022-12-17 21:41:22 +02:00
Mihai Fufezan
f59c9a805e
nix/module: add nvidiaPatches option
Also fixes wrong package passing.
2022-12-17 21:41:22 +02:00
Mihai Fufezan
516949380d
nix/hm-module: make config optional 2022-12-14 14:08:53 +02:00
Mihai Fufezan
11a1a6c271
nix: add xdph to flake and enable it in the nixos module 2022-12-09 16:25:57 +02:00
Mihai Fufezan
9fc143cf3d
Revert "nix: add cachix to nixos module"
This reverts commit 5b7fec481b.
Will clarify better how to enable Cachix, in the wiki.
2022-12-09 13:36:23 +02:00
Mihai Fufezan
5b7fec481b
nix: add cachix to nixos module 2022-12-07 19:18:15 +02:00
Vaxry
66fb083003
Implement window sharing with the hl toplevel export proto ()
* implement window sharing

Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
2022-12-05 17:05:15 +00:00
Mihai Fufezan
f71f04db9e nix: add xdph to nixos module 2022-12-05 03:13:31 +02:00
Mihai Fufezan
215c7bd3cb
nix: remove merged hwdata override 2022-12-04 21:24:34 +02:00
Narice
c03e4c36b0
Setting wayland environment variables at startup ()
* Nix modules: removed GDK_BACKEND env variable

* setting wayland environment variables at startup

setting XDG_BACKEND and _JAVA_AWT_WM_NONREPARENTING in main.cpp
removed these variables from nix modules recommended environemnt
removed XCURSOR_SIZE from nix modules as it is already set

* Making _JAVA_AWT_WM_NONREPARENTING not overwritten
2022-11-19 19:37:16 +00:00
Mihai Fufezan
1a14841a75
Nix: add hwdata overlay () 2022-11-13 19:32:15 +00:00
sioodmy
13befbd266 fix(nix): missing dependency 2022-11-11 14:43:45 +02:00
Mihai Fufezan
f978368a4e
Nix HM: Fix invalid escapes
Fixes 
2022-11-03 13:21:51 +02:00
Mihai Fufezan
0d7176792b
Nix HM: prevent race condition between dbus and systemd
Fixes 
2022-11-02 21:36:07 +02:00
Mihai Fufezan
b6e33830af
Nix & meson: 0.16.0 -> 0.17.0
Nix: make xwayland dependencies optional
2022-10-31 12:41:31 +02:00
Narice
7e7cb40909 Nix modules: fix environment variables 2022-10-14 16:19:14 +03:00
Mihai Fufezan
9370c7aa8a Nix modules: add recommendedEnvironment option 2022-09-09 17:01:24 +03:00
Mihai Fufezan
26910a8b63
Nix HM module: fix build error
Apparently HM doesn't like having `lib.mkDefault` near strings.

Fixes 
2022-09-07 13:11:03 +03:00
Mars
cf5426f2d8 Fix typo in module.nix 2022-09-07 11:48:08 +03:00
Mihai Fufezan
1d631c8a23 Nix modules: add common environment variables 2022-09-07 01:24:09 +03:00
Mihai Fufezan
1664f81cae
Nix: revert HM module import fix
fixes 
2022-09-03 23:22:39 +03:00
Mihai Fufezan
eee0cad4d0
Nix modules: fix imports 2022-09-03 02:20:20 +03:00
Fernando Ayats
c0a7dffcdc
nix: move wlroots and add nvidia patches () 2022-09-01 20:35:50 +03:00
Mihai Fufezan
bdd20c401d
Add HiDPI xwayland + wlroots patches () 2022-08-29 16:51:39 +03:00
Nicholas Cioli
df4c1c02a6
fix xwayland config option for nix ()
When building Hyprland in nix using the following home-manager recipe:

```nix
wayland.windowManager.hyprland = {
    enable = true;
    xwayland = false;
  };
```

The default nix configuration still makes reference to a compile argument `NO_XWAYLAND`, but the `meson_options.txt` only makes reference to `xwayland`. This causes the build to fail with:

```
meson.build:1:0: ERROR: Unknown options: "NO_XWAYLAND"
```

This change fixes that issue. This still doesn't allow you to build Hyprland without having XWayland installed (), but it should at least allow for valid nix configurations for when that issue gets resolved.
2022-08-27 21:45:48 +03:00
Fernando Ayats
fea6d7deb0 docs: install manpages with meson 2022-08-21 18:00:04 +02:00
Mihai Fufezan
c982312c07
Nix HM module: reload config-only 2022-08-15 00:47:56 +03:00
Mihai Fufezan
ed1b72f37d
Nix HM module: add XDG_SESSION_TYPE, fix reload 2022-08-14 23:45:55 +03:00
Fernando Ayats
c136078239
nix: use cleanSource () 2022-08-12 23:12:24 +03:00
Mihai Fufezan
59879e0bd1
Nix module: make package nullable part 3 2022-07-30 18:19:27 +03:00