diff --git a/flake.lock b/flake.lock index 3e6b917..0afb4d6 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1784368054, - "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=", + "lastModified": 1786464219, + "narHash": "sha256-WKqWL8r7CyTDYueTr2ffJ9ya50dellv6IR1JX5PghDY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0", + "rev": "f3d1804205e8158c15595cdda1b566f93349ffae", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1776511930, - "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", + "lastModified": 1786464181, + "narHash": "sha256-2alOMkLjXANh7unkZnYnCF2K2rApZaOLMoQ3o+VX2CY=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "39435900785d0c560c6ae8777d29f28617d031ef", + "rev": "e4ed7c08123df5af460a0a70961380cbfb872f76", "type": "github" }, "original": { @@ -411,11 +411,11 @@ ] }, "locked": { - "lastModified": 1782566056, - "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", + "lastModified": 1786464367, + "narHash": "sha256-k58p4wbzIXWyRWrW84pP8tD+iaZSSYiiM+fr0Auk4oU=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", + "rev": "7c895c44e3ca6d28ed68ddd80ec02b02b925e7fc", "type": "github" }, "original": { @@ -441,16 +441,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1785170029, - "narHash": "sha256-8CKDx282HhxlD1pwXPnC4uK29Abn1Jsnh7LgPzeIXxI=", + "lastModified": 1786555543, + "narHash": "sha256-sZWUA497m3OuyZqt1KUa5cPR43Zk1X/L3qZa64mIxDs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5c9377c15f85c50648f35ca5a213754f95b93ca0", + "rev": "1256bd180e7677aadd715e59351c09fb16e48efc", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.56.1", + "ref": "1256bd1", "repo": "Hyprland", "type": "github" } @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1784196523, - "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=", + "lastModified": 1786464504, + "narHash": "sha256-7sHwM86KILQyHDHDuE2SDBlQ2jvZ0EW3hY7sW009/cg=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0", + "rev": "4c30cf3097ea963c0e250749ee0c59f8b08816d6", "type": "github" }, "original": { @@ -572,11 +572,11 @@ ] }, "locked": { - "lastModified": 1777320127, - "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", + "lastModified": 1786464129, + "narHash": "sha256-339AkTlpMYSIvFuG0rnR+8Yg4/AZKeJalshJavlnKfg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", + "rev": "9508458be316a0d70d37ebed1ab725ccd10411ff", "type": "github" }, "original": { @@ -624,11 +624,11 @@ ] }, "locked": { - "lastModified": 1782554491, - "narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=", + "lastModified": 1785930473, + "narHash": "sha256-DitTu625BhEYpZjtjxtGpjrEJwPwW+X/+jJvhSZNSJM=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35", + "rev": "af515b69dfbe366dc7873aa1475cb2f4db3ebad7", "type": "github" }, "original": { @@ -649,11 +649,11 @@ ] }, "locked": { - "lastModified": 1784323413, - "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=", + "lastModified": 1786464080, + "narHash": "sha256-W1hxvumEM57yV+QwsZ4QdAHEqOkr7e4S8VAkLX60qDE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5f03477ab3a005ff27c527486f551883535aea2f", + "rev": "c157fe1e3092b980cc69315a6631f89aff09dcce", "type": "github" }, "original": { @@ -674,11 +674,11 @@ ] }, "locked": { - "lastModified": 1777159683, - "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", + "lastModified": 1786464033, + "narHash": "sha256-QM8Qe4/L8lpdVN4bgwahmi+jyyc4fisseDMe4afcDxA=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", + "rev": "62e62c1ca23da17612c6890d4ad2064f575643db", "type": "github" }, "original": { @@ -703,11 +703,11 @@ ] }, "locked": { - "lastModified": 1778410714, - "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", + "lastModified": 1786464294, + "narHash": "sha256-ZQsZ2WvBdkboCIyh8LStDPdAIARmxzn0XMNxxoOhjPE=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", + "rev": "4ce7cd6b6128c1ac41caf23c58a30a26b327f9dd", "type": "github" }, "original": { @@ -718,11 +718,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1784356753, - "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", + "lastModified": 1786247143, + "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", + "rev": "279b4a8275f032c566576b3f181fa0f27197f588", "type": "github" }, "original": { @@ -1121,11 +1121,11 @@ ] }, "locked": { - "lastModified": 1784371182, - "narHash": "sha256-S8A1lezEalltWcCp3gAic5lssS0xTSISK6fKODefhOk=", + "lastModified": 1786464334, + "narHash": "sha256-/TBQT5rhBB2Dm4HoZzhGDaCwYmRTs3W3DPhMXFWc/BU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "08d99f727944dd15e4740090305e31c5fb92a50a", + "rev": "9f0e9ff02739cd538d39bd706422dc50e9ca60dd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5545416..509c130 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ }; hyprland = { - url = "github:hyprwm/Hyprland/v0.56.1"; + url = "github:hyprwm/Hyprland/1256bd1"; # inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/host.nix b/modules/host.nix index 7a20a5d..bab7d60 100644 --- a/modules/host.nix +++ b/modules/host.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, inputs, ... }: { imports = [ ./host/bluetooth.nix ./host/bootloader.nix @@ -21,6 +21,7 @@ programs = { dconf.enable = true; hyprland.enable = true; + hyprland.package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; }; xdg.portal = { @@ -28,7 +29,6 @@ xdgOpenUsePortal = true; extraPortals = with pkgs; [ - xdg-desktop-portal-hyprland xdg-desktop-portal-gtk xdg-desktop-portal-termfilechooser ]; diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix index 434df97..7358103 100644 --- a/modules/user/hyprland.nix +++ b/modules/user/hyprland.nix @@ -45,6 +45,7 @@ in { xwayland.enable = true; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + portalPackage = null; plugins = with inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}; [ # hyprbars # Version mismatch ]; @@ -206,26 +207,4 @@ in { }; }; - xdg.portal = { - enable = true; - - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-termfilechooser - ]; - - config = { - common = { - default = [ "hyprland" "gtk" ]; - "org.freedesktop.impl.portal.FileChooser" = [ "termfilechooser" "gtk" ]; - "org.freedesktop.impl.portal.Settings" = [ "gtk" ]; - }; - - hyprland = { - default = [ "hyprland" "gtk" ]; - "org.freedesktop.impl.portal.FileChooser" = [ "termfilechooser" "gtk" ]; - "org.freedesktop.impl.portal.Settings" = [ "gtk" ]; - }; - }; - }; }