From 66ca59be6b8709caf6a45b0ede44b75cd4956b6c Mon Sep 17 00:00:00 2001 From: zackartz Date: Sat, 20 Apr 2024 15:25:28 -0400 Subject: [PATCH] 437 current 2024-04-20 15:25:26 24.05.20240420.c0f9060 6.8.6-zen1 * --- flake.lock | 62 ++++++++++++++++++++++--------- modules/rice/hyprland/default.nix | 3 +- 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 1852f30..467f0ea 100644 --- a/flake.lock +++ b/flake.lock @@ -257,6 +257,7 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], @@ -265,11 +266,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1713561395, - "narHash": "sha256-jZSX8By3Ztd3ZShAIYYbKp0Z+ThIjZ+TfAxYdIiSKIc=", + "lastModified": 1713640602, + "narHash": "sha256-ne/dj6Q126nZR4ATFQ64up3E8c5ONWMgjSPw9v9EJ04=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b52a49b4c4c344784b3085cb93d3882d3ce9b4bb", + "rev": "4ad739ec63c9a11f0537a884ae2a4c56d6bab10b", "type": "github" }, "original": { @@ -290,11 +291,11 @@ ] }, "locked": { - "lastModified": 1713283897, - "narHash": "sha256-/0OPK/bDr8/Lf7r8kzDD/yP1kySbJ8gPmV3CdUbVTFM=", + "lastModified": 1713607544, + "narHash": "sha256-nbqQmhvYbDVC/5YiZLSGj5r14cOk2k6TGPpP2TtCfhI=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "00d147d7f6ad2ecfbf75efe4a8402723c72edd98", + "rev": "9971fec974a9d94a2a1b1d68d5ada5fc59fec053", "type": "github" }, "original": { @@ -353,6 +354,31 @@ "type": "github" } }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1713612394, + "narHash": "sha256-uWA8iPYzrdpCT9d8I9YHrxkjBdooqOZIH6ZOHoQiOUc=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "f58a3f56e89857dc7ab7166cff2f971345026634", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "kb-gui": { "inputs": { "flake-utils": [ @@ -391,11 +417,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1713476725, - "narHash": "sha256-OBDeB3+2hgWqABtqg+PwfjbWzL49dmJeG32qOEzhtUY=", + "lastModified": 1713535781, + "narHash": "sha256-B1U81MX7LRSS2RxWZBG5vRzbPx79ZlCuNb86XmMe+3U=", "owner": "neovim", "repo": "neovim", - "rev": "13ebfafc958c6feb4d908eed913c6dc3c6f05b4e", + "rev": "52d2851ca4e747146c30e1996c08bf504d99fe95", "type": "github" }, "original": { @@ -414,11 +440,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713485028, - "narHash": "sha256-bl1EURik5le68rLBcHsfLKyPtEPlumhcA5kKOx88zkQ=", + "lastModified": 1713571438, + "narHash": "sha256-QUmqR1AJ+Qq3bURNwTrW2ozJE/JOQFtzUR0AmqZPT9Q=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "403633f6af2703c057707b31b1ca6bec00bdaaca", + "rev": "d41022aae3c6852462bae53ccd120d3d936a0d3d", "type": "github" }, "original": { @@ -499,11 +525,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713349283, - "narHash": "sha256-2bjFu3+1zPWZPPGqF+7rumTvEwmdBHBhjPva/AMSruQ=", + "lastModified": 1713442664, + "narHash": "sha256-LoExypse3c/uun/39u4bPTN4wejIF7hNsdITZO41qTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2e359fb3162c85095409071d131e08252d91a14f", + "rev": "d764f230634fa4f86dc8d01c6af9619c7cc5d225", "type": "github" }, "original": { @@ -515,11 +541,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713556196, - "narHash": "sha256-yLwZTfcGV1GiArH/ckTFeXU5UYpJCRAOkq2/EvbmHNg=", + "lastModified": 1713597487, + "narHash": "sha256-bD+FqUZidTjHblGjK+2LpIaHBmo1THF1HW3o4ZBqmrw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d31751f63b898f225ee5ac325c1586149d168f53", + "rev": "c0f9060ec3937d5a7cf3ce6c698e14d989b453e5", "type": "github" }, "original": { diff --git a/modules/rice/hyprland/default.nix b/modules/rice/hyprland/default.nix index 099ab1e..105e2e4 100644 --- a/modules/rice/hyprland/default.nix +++ b/modules/rice/hyprland/default.nix @@ -4,8 +4,7 @@ inputs, theme, ... -}: -with lib; let +}: let mkService = lib.recursiveUpdate { Unit.PartOf = ["graphical-session.target"]; Unit.After = ["graphical-session.target"];