Portals are working in flatpak now (specifically openUri)!! yay

This commit is contained in:
Nate Anderson 2025-06-16 13:24:53 -06:00
parent 9c1298ce8b
commit c7439fa85d
4 changed files with 27 additions and 12 deletions

12
flake.lock generated
View File

@ -78,11 +78,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1749285348, "lastModified": 1749794982,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +94,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749237914, "lastModified": 1750005367,
"narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -78,7 +78,10 @@
lsp-ai lsp-ai
python3 python3
cmake cmake
claude-code
# proto
protobuf
protoc-gen-dart
# Go stuff # Go stuff
go go
delve delve
@ -124,6 +127,7 @@
fd fd
fzf fzf
lsd lsd
lsof
ripgrep ripgrep
tre-command tre-command
gtop gtop

View File

@ -13,7 +13,8 @@ in
config = lib.mkIf config.hyprhome.enable { config = lib.mkIf config.hyprhome.enable {
wayland.windowManager.hyprland.enable = true; # enable Hyprland wayland.windowManager.hyprland.enable = true; # enable Hyprland
# wayland.windowManager.hyprland.package = hyprland; # enable Hyprland # wayland.windowManager.hyprland.package = null; # enable Hyprland
# wayland.windowManager.hyprland.portalPackage = null; # enable Hyprland
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
"$mod" = "Super"; "$mod" = "Super";
"$terminal" = "ghostty"; "$terminal" = "ghostty";
@ -22,6 +23,11 @@ in
# Autostart # Autostart
exec-once = exec-once =
[ [
###Start dbus ###
# Starting it early may help with app launch times
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
#
"swaylock -C ~/.config/swaylock/boot-config" "swaylock -C ~/.config/swaylock/boot-config"
"swaybg -i ~/.config/hypr/va_background.png" "swaybg -i ~/.config/hypr/va_background.png"
"nwg-panel" "nwg-panel"
@ -211,6 +217,7 @@ in
# force_introspection = 2; # force_introspection = 2;
}; };
}; };
# import variables
wayland.windowManager.hyprland.systemd.variables = ["--all"]; wayland.windowManager.hyprland.systemd.variables = ["--all"];
home.pointerCursor = { home.pointerCursor = {
@ -254,6 +261,9 @@ in
pavucontrol pavucontrol
syncthingtray syncthingtray
tailscale-systray tailscale-systray
# include portals here for flatpak
xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
] ]
config.hyprhome.homePackages config.hyprhome.homePackages
]; ];

View File

@ -21,6 +21,7 @@ in
catppuccin.flavor = "macchiato"; catppuccin.flavor = "macchiato";
catppuccin.accent = "lavender"; catppuccin.accent = "lavender";
programs.hyprland.enable = true; programs.hyprland.enable = true;
programs.hyprland.withUWSM = true;
# programs.hyprland.package = unstable.hyprland; # programs.hyprland.package = unstable.hyprland;
# programs.hyprland.portalPackage = pkgs.xdg-desktop-portal-hyprland; # programs.hyprland.portalPackage = pkgs.xdg-desktop-portal-hyprland;
# programs.steam.enable = true; # programs.steam.enable = true;
@ -68,15 +69,15 @@ in
}; };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
xdgOpenUsePortal = true; # wlr.enable = true;
config = { config = {
common.default = [ "gtk" ]; common = {
hyprland.default = [ "hyprland" "gtk" ]; default = [ "hyprland" "gtk" ];
};
}; };
extraPortals = with pkgs; [ extraPortals = with pkgs; [
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
]; ];
}; };