From 4cb71a90ae58892cfa55e08eb464ae62f55f23bc Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Thu, 14 Dec 2023 10:30:38 +0100 Subject: [PATCH] chore(flake): drop xdg-desktop-portal-hyprland (is now part of hyprland) --- flake.lock | 79 +----------------------------------------- flake.nix | 4 --- hosts/murex-pecten.nix | 2 +- 3 files changed, 2 insertions(+), 83 deletions(-) diff --git a/flake.lock b/flake.lock index 65f0a90..95acfb2 100644 --- a/flake.lock +++ b/flake.lock @@ -936,31 +936,6 @@ "type": "github" } }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "nixpkgs" - ], - "systems": [ - "xdg-desktop-portal-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "jovian-nixos": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -1556,22 +1531,6 @@ "type": "github" } }, - "nixpkgs_16": { - "locked": { - "lastModified": 1694183432, - "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1677383253, @@ -1921,8 +1880,7 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", "qmk-udev-rules": "qmk-udev-rules", "sops-nix": "sops-nix", - "treefmt-nix": "treefmt-nix_4", - "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" + "treefmt-nix": "treefmt-nix_4" } }, "sops-nix": { @@ -2006,21 +1964,6 @@ "type": "github" } }, - "systems_5": { - "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": "nixpkgs_5" @@ -2116,26 +2059,6 @@ "type": "gitlab" } }, - "xdg-desktop-portal-hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": "nixpkgs_16", - "systems": "systems_5" - }, - "locked": { - "lastModified": 1699146051, - "narHash": "sha256-L29h9vE6t97Vx/5FsRmDb+RnKcbnyJtilflJtb4++Vs=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "b2fc1110963fa583ad5348a9dc0101bd58ceac7a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index e4edb9e..cbb0bbe 100644 --- a/flake.nix +++ b/flake.nix @@ -46,9 +46,6 @@ url = "github:hyprwm/contrib"; inputs.nixpkgs.follows = "nixpkgs"; }; - xdg-desktop-portal-hyprland = { - url = "github:hyprwm/xdg-desktop-portal-hyprland"; - }; qmk-udev-rules = { url = "github:qmk/qmk_firmware"; @@ -64,7 +61,6 @@ outputs = inputs @ {flake-parts, ...}: let # Overlays useful to most of my systems overlaysSharedByAll = [ - inputs.xdg-desktop-portal-hyprland.overlays.default inputs.hyprland-contrib.overlays.default (_: super: { # Add my mensa tool diff --git a/hosts/murex-pecten.nix b/hosts/murex-pecten.nix index 4cb9930..0c6f35b 100644 --- a/hosts/murex-pecten.nix +++ b/hosts/murex-pecten.nix @@ -70,7 +70,7 @@ xdg.portal = { enable = true; - extraPortals = with pkgs; [xdg-desktop-portal-gtk xdg-desktop-portal-hyprland]; + extraPortals = with pkgs; [xdg-desktop-portal-gtk]; }; hardware = {