1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00

chore: and back again. there is no good choice

This commit is contained in:
oddlama 2025-02-02 01:11:53 +01:00
parent a0401a7970
commit cfc7de7967
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
4 changed files with 10 additions and 10 deletions

View file

@ -44,20 +44,20 @@ in
services.dbus.packages = [ pkgs.gcr ]; services.dbus.packages = [ pkgs.gcr ];
xdg.portal = { xdg.portal = {
wlr.enable = true;
enable = true; enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
config.common = { config.common = {
default = [ default = [
"wlr"
"gtk" "gtk"
"hyprland"
]; ];
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
"org.freedesktop.impl.portal.ScreenCast" = [ "xdg-desktop-portal-wlr" ]; "org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
"org.freedesktop.impl.portal.Screenshot" = [ "xdg-desktop-portal-wlr" ]; "org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ];
"org.freedesktop.portal.FileChooser" = [ "xdg-desktop-portal-gtk" ]; "org.freedesktop.portal.FileChooser" = [ "xdg-desktop-portal-gtk" ];
}; };
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
]; ];
}; };

View file

@ -63,8 +63,8 @@ lib.optionalAttrs (!minimal) {
# Autostart hyprland if on tty1 (once, don't restart after logout) # Autostart hyprland if on tty1 (once, don't restart after logout)
programs.zsh.initExtra = lib.mkOrder 9999 '' programs.zsh.initExtra = lib.mkOrder 9999 ''
if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]] && uwsm check may-start; then if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]] && uwsm check may-start; then
echo "Login shell detected. Starting sway..." echo "Login shell detected. Starting Hyprland..."
uwsm start -S -F sway uwsm start -S -F Hyprland
fi fi
''; '';
}; };

View file

@ -145,7 +145,7 @@ in
assigns = { assigns = {
"1" = [ "1" = [
{ class = "^firefox$"; } { app_id = "firefox"; }
]; ];
"5" = [ "5" = [
{ class = "^bottles$"; } { class = "^bottles$"; }

View file

@ -14,14 +14,14 @@
height = 28; height = 28;
modules-left = [ modules-left = [
"sway/workspaces" "hyprland/workspaces"
"tray" "tray"
"sway/mode" "hyprland/submap"
"privacy" "privacy"
#"custom/whisper_overlay" #"custom/whisper_overlay"
]; ];
modules-center = [ modules-center = [
"sway/window" "hyprland/window"
]; ];
modules-right = [ modules-right = [
"custom/scan_qr" "custom/scan_qr"