Use Hyprland 0.29.1

Also make sure that the mesa version used for Hyprland
is the same as the one used by NixGL
pull/10/head
Tudor Roman 2023-09-08 17:17:41 +02:00
parent 3950fa6ec2
commit ef68f22875
Signed by: tudor
SSH Key Fingerprint: SHA256:3CwS9plgXBecpXImPGxDIaSktUXBejbV/zerZMqzzBk
4 changed files with 80 additions and 48 deletions

View File

@ -149,7 +149,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1689068808,
@ -172,11 +172,11 @@
]
},
"locked": {
"lastModified": 1692099905,
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
"lastModified": 1693208669,
"narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
"owner": "rycee",
"repo": "home-manager",
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
"rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
"type": "github"
},
"original": {
@ -191,11 +191,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1690635289,
"narHash": "sha256-ec77Yf7mqusmGkxrmYXEG4D0DqEcNRA3vFextWVQOVA=",
"lastModified": 1693839821,
"narHash": "sha256-ha9Cxqb81Yni217SoM/zFxE0nNz8IMtreTw4SlXw/D4=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "bef073cff65917ba2d888aa4dc39bd9868e2b0a4",
"rev": "74aa6b02ff4bd48aaee4da461a16c4cbaaa0ca7e",
"type": "github"
},
"original": {
@ -208,20 +208,21 @@
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_4",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1691078410,
"narHash": "sha256-t1Ksv5/xwRgi8oH9jyoIEuMHi9cYIZSg3yEJLYMb78Y=",
"lastModified": 1693740777,
"narHash": "sha256-j9ypIwZkotNZMyk8R/W002OzDHd0C0OHSKE7uOFpf2k=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "9654749244117f7f150c6f2a2ce4dede6e8cbb25",
"rev": "96d555e8e794627bfc561e294e148ab8a9961fcc",
"type": "github"
},
"original": {
"owner": "hyprwm",
"ref": "v0.28.0",
"ref": "v0.29.1",
"repo": "Hyprland",
"type": "github"
}
@ -231,14 +232,18 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1684265364,
"narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
@ -270,11 +275,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1692952286,
"narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
"lastModified": 1693718952,
"narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
"rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35",
"type": "github"
},
"original": {
@ -293,11 +298,11 @@
]
},
"locked": {
"lastModified": 1692543835,
"narHash": "sha256-1fR7+IhSSEHRbRW1w3nXb38/4kFfpmCDzMsK+ApqZCk=",
"lastModified": 1693841723,
"narHash": "sha256-L7v6XPjlgoELp8NWn297nAZkubmXr/4gr+UAEnC5mRE=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "faab3194692c5b6b351e33fc8d5e7f15f22d1d15",
"rev": "f060a305cd60ce032e174951eec390432eddaede",
"type": "github"
},
"original": {
@ -356,11 +361,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1690179384,
"narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
"lastModified": 1693985761,
"narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
"rev": "0bffda19b8af722f8069d09d8b6a24594c80b352",
"type": "github"
},
"original": {
@ -372,11 +377,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1692986144,
"narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
"lastModified": 1693771906,
"narHash": "sha256-32EnPCaVjOiEERZ+o/2Ir7JH9pkfwJZJ27SKHNvt4yk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
"rev": "da5adce0ffaff10f6d0fee72a02a5ed9d01b52fc",
"type": "github"
},
"original": {
@ -476,6 +481,21 @@
}
},
"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": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -492,11 +512,11 @@
},
"unstable": {
"locked": {
"lastModified": 1693003285,
"narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
"lastModified": 1693663421,
"narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
"rev": "e56990880811a451abd32515698c712788be5720",
"type": "github"
},
"original": {
@ -585,18 +605,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1690165843,
"narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=",
"lastModified": 1692976565,
"narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
"type": "gitlab"
}
},
@ -609,14 +629,18 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1685385764,
"narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"type": "github"
},
"original": {

View File

@ -34,7 +34,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:hyprwm/Hyprland/v0.28.0";
url = "github:hyprwm/Hyprland/v0.29.1";
};
hypr-contrib = {
url = "github:hyprwm/contrib";

View File

@ -25,17 +25,22 @@ with lib; {
wayland.windowManager.hyprland = {
enable = true;
xwayland = {
enable = true;
hidpi = true;
};
xwayland.enable = true;
package = let
system = pkgs.stdenv.hostPlatform.system;
# make sure Hyprland uses the same mesa as NixGL,
# which is the stable nixpkgs mesa.
mesa = pkgs.mesa;
origPkg = inputs.hyprland.packages.${system}.default.override {
enableXWayland = config.wayland.windowManager.hyprland.xwayland.enable;
hidpiXWayland = config.wayland.windowManager.hyprland.xwayland.hidpi;
inherit (config.wayland.windowManager.hyprland) nvidiaPatches;
mesa = mesa;
wlroots = inputs.hyprland.packages.${system}.wlroots-hyprland.override {
wlroots = pkgs.unstable.wlroots.override {
mesa = mesa;
};
};
};
nixGL = pkgs.nixgl.nixGLIntel;
in if cfg.nixGLSupport then (pkgs.runCommand "hyprland-nixgl-wrapper" {} ''
@ -104,6 +109,10 @@ with lib; {
enabled = false
}
xwayland {
force_zero_scaling = true
}
monitor = desc:LG Electronics LG HDR 4K 0x0008D101,preferred,0x0,2
# main monitor is 4k, but because it has 2x scaling, it takes 1920 logical pixels
monitor = eDP-1,preferred,1920x0,1

View File

@ -21,7 +21,7 @@ with lib; {
systemdTarget = if cfg.hyprland then "hyprland-session.target" else "";
in {
enable = true;
package = pkgs.waybar-hyprland;
package = pkgs.unstable.waybar;
systemd.enable = enableSystemd;
systemd.target = systemdTarget;
@ -31,7 +31,7 @@ with lib; {
layer = "top";
position = "top";
height = 45;
modules-left = [ "wlr/workspaces" ];
modules-left = [ "hyprland/workspaces" ];
modules-center = [ "clock" ];
modules-right = [ "tray" "battery" "pulseaudio" ];
@ -48,8 +48,7 @@ with lib; {
on-click = "pactl set-sink-mute 0 toggle";
};
"wlr/workspaces" = {
on-click = "activate";
"hyprland/workspaces" = {
all-outputs = true;
};