From bde398cb8c3dd49ec9d726ef9bef8e6c99766c46 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Sat, 19 Oct 2024 20:53:35 -0400 Subject: [PATCH] got portals working again for screensharing --- home-config/hypr/autostart.sh | 18 ++++- home-config/nix-home-manager/flake.lock | 98 +------------------------ home-config/nix-home-manager/flake.nix | 7 +- home-config/nix-home-manager/home.nix | 8 +- 4 files changed, 25 insertions(+), 106 deletions(-) diff --git a/home-config/hypr/autostart.sh b/home-config/hypr/autostart.sh index 6e64202..77ebae8 100755 --- a/home-config/hypr/autostart.sh +++ b/home-config/hypr/autostart.sh @@ -14,6 +14,20 @@ swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 -- syncthing serve --no-browser & -wl-clip-persist -c regular & +# Kill any orphans of this +killall wl-clip-persist +wl-clip-persist -c regular --reconnect-tries 5 & -kanshi -c ~/.config/hypr/kanshi.conf +kanshi -c ~/.config/hypr/kanshi.conf & + +# Start the portals + +sleep 0.5 +killall -e xdg-desktop-portal-hyprland +killall xdg-desktop-portal-gtk +killall xdk-desktop-portal + +~/.nix-profile/libexec/xdg-desktop-portal-hyprland & +~/.nix-profile/libexec/xdg-desktop-portal-gtk & +sleep 2 +XDG_DESKTOP_PORTAL_DIR="/home/ryan/.nix-profile/share/xdg-desktop-portal/portals" ~/.nix-profile/libexec/xdg-desktop-portal & diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 8a67541..8885a8c 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -207,67 +207,14 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprlock", - "hyprutils" - ], - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlock": { - "inputs": { - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1721563228, - "narHash": "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "dba9d8b5175a6f23463035aafc6b0c741f9b73a5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "ref": "v0.4.1", - "repo": "hyprlock", - "type": "github" - } - }, "hyprpicker-git": { "inputs": { - "hyprutils": "hyprutils_3", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1727732210, @@ -309,31 +256,6 @@ } }, "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -449,7 +371,6 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", - "hyprlock": "hyprlock", "hyprpicker-git": "hyprpicker-git", "nixgl": "nixgl", "nixpkgs": "nixpkgs" @@ -485,21 +406,6 @@ "type": "github" } }, - "systems_3": { - "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" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 9eb13bf..6429214 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -16,17 +16,13 @@ url = "github:hyprwm/hyprland/v0.44.1"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprlock = { - url = "github:hyprwm/hyprlock/v0.4.1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nixgl = { url = "github:nix-community/nixGL"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, hyprlock, nixgl, ... }@inputs: + outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -47,7 +43,6 @@ _module.args = { inherit hyprland; inherit nixgl; - inherit hyprlock; }; } ]; diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index c572a6f..a886c6a 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, hyprland, hyprlock, nixgl, ... }: +{ config, pkgs, hyprland, nixgl, ... }: { # Home Manager needs a bit of information about you and the paths it should @@ -45,11 +45,15 @@ gdu spotify-player hyprpicker + hyprlock + xwayland + xdg-desktop-portal + xdg-desktop-portal-gtk # Flakes specific things defined in flake.nix hyprland.packages.${pkgs.system}.default + hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland nixgl.packages.${pkgs.system}.nixGLIntel - hyprlock.packages.${pkgs.system}.default # Fonts! noto-fonts