From 4989bab8327a03f7a016d27e52dab7564faded91 Mon Sep 17 00:00:00 2001 From: willemml Date: Mon, 30 Dec 2024 06:57:32 -0800 Subject: [PATCH] Updates for vulkan support on asahi --- flake.lock | 56 +++++++++++++++++++++-------------------- flake.nix | 3 ++- home/linux/hyprland.nix | 3 ++- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index e501fcc..b08e56d 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1733553297, - "narHash": "sha256-DwKpay17BJ8XhWn2PVhNEUS98qql2LZ/z37ZbGwdZCM=", + "lastModified": 1735540357, + "narHash": "sha256-XbIfjxEOM6JmLCILozlFEUrfCpXvQNo9l+VAU7FCahI=", "owner": "nix-community", "repo": "fenix", - "rev": "8519a70a1a81db2dd22316f94c25d7510218169e", + "rev": "92bb57bf88e4b8e6b4fe4e79fbfff2fc3f04df88", "type": "github" }, "original": { @@ -324,11 +324,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -442,6 +442,7 @@ "url": "https://github.com/hyprwm/Hyprland" }, "original": { + "rev": "b1e5cc66bdb20b002c93479490c3a317552210b3", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -607,11 +608,11 @@ ] }, "locked": { - "lastModified": 1733024876, - "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -629,11 +630,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733377410, - "narHash": "sha256-tZ9JEAaHIs3TPdRZeZzHsnJmUilkcnVaUTvyprbRb1A=", + "lastModified": 1735172763, + "narHash": "sha256-a6n8RsiAolz6p24Fsr/gTndx9xr9USpKqKK6kzBeXQc=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "e8c07c3ae199b55a8c1c35a7c067c5cef9c7e929", + "rev": "3daf0637409689d7a1304cedc50d20542bc47905", "type": "github" }, "original": { @@ -644,11 +645,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -720,16 +721,17 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733581538, - "narHash": "sha256-4YPhGhk1ibt9TDVGuGa48dunYeBge77TsKgUhOtCUN8=", + "lastModified": 1734978744, + "narHash": "sha256-R80xsDCKZOPJv5T+fB5G1ZVgS/51tJgUenGmGFjZat4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b4c443417c34b54cc1fe337d26c033adf9458fde", + "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", + "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", "type": "github" } }, @@ -767,11 +769,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -798,11 +800,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1733499879, - "narHash": "sha256-EP/qkXR1CN4vIi5atysuKsQBXuolYnU3rVdLxUv0XqM=", + "lastModified": 1735485512, + "narHash": "sha256-B9tZfdCnZF7Qo/Ys/LgKtUlzIr38c9fDYgo/XcS8Gtc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "17720acb90105cbd736d3e78d736eb5d41af89a5", + "rev": "59bc7b49d0ad319de8c477c63da552cbc8a05e4c", "type": "github" }, "original": { @@ -847,11 +849,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733510476, - "narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=", + "lastModified": 1735524788, + "narHash": "sha256-R4i8VCdSGLWHt6cL5p2Cmlh9MRodZsYO8moUjvxYb54=", "owner": "danth", "repo": "stylix", - "rev": "e309d64fe7f203274a7913e1d2b74307d15ba122", + "rev": "a4ed4168fb83289374f24cb8a039c6983637a076", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 434d93b..81eb649 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Willem's Nix configurations"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/b74a56e2acce8fe88a575287a20ac196d8d01938"; darwin.url = "github:willemml/nix-darwin?ref=feat/networking.hosts"; #darwin.url = "git+file:///Users/willem/dev/nix-darwin"; @@ -18,6 +18,7 @@ hyprland = { type = "git"; url = "https://github.com/hyprwm/Hyprland"; + rev = "b1e5cc66bdb20b002c93479490c3a317552210b3"; submodules = true; }; diff --git a/home/linux/hyprland.nix b/home/linux/hyprland.nix index 6a0001b..beb00ff 100644 --- a/home/linux/hyprland.nix +++ b/home/linux/hyprland.nix @@ -31,7 +31,6 @@ in { qt6ct rofi-wayland xdg-desktop-portal - xdg-desktop-portal-gtk inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ] ++ ( @@ -71,6 +70,8 @@ in { wayland.windowManager.hyprland = { enable = true; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + settings = { cursor.no_hardware_cursors = true; debug.disable_logs = false;