Fixing merge mistake, adding sway env vars

This commit is contained in:
n0th1ng 2024-12-27 14:14:29 +01:00
commit 45aa41aac6

View file

@ -62,14 +62,13 @@ in
git git
]; ];
}; };
<<<<<<< HEAD
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
config = { config = {
startup = [ startup = [
{ {
command = "firefox-esr --kiosk c3nav.de"; command = "firefox-esr --kiosk c3nav.de"; always = true;
} }
]; ];
fonts = { fonts = {
@ -86,11 +85,6 @@ in
''; '';
}; };
=======
wayland.windowManager.sway.config.startup = [
{ command = "firefox-esr --kiosk c3nav.de"; always = true; }
];
>>>>>>> f295282 (Attempt to fix the hardcoded device)
programs = { programs = {
firefox = { firefox = {
enable = true; enable = true;
@ -172,10 +166,16 @@ in
}; };
}; };
}; };
programs.sway = { programs.sway = {
enable = true; enable = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland
export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export _JAVA_AWT_WM_NONREPARENTING=1
export MOZ_ENABLE_WAYLAND=1
'';
}; };
nix = { nix = {