diff --git a/roles/desktop.nix b/roles/desktop.nix index b5a63d8..f4f8786 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -4,8 +4,9 @@ { config, lib, pkgs, ... }: let - unstable = import {}; + unstable = import { config.allowUnfree = true; }; in { + programs.sway = { enable = true; extraPackages = with pkgs; [ @@ -42,14 +43,26 @@ in { ]; environment.systemPackages = with pkgs; [ + # firefox also needs: + # + # gfx.webrenderer.enabled = true + # widget.wayland-dmabuf-vaapi.enabled = true + # + # check in `about:support` that + # * Composing -> Webrenderer + unstable.firefox-bin + libva + libva-utils + mesa + librsvg unstable.mypaint unstable.mypaint-brushes hicolor-icon-theme numix-icon-theme + alacritty - firefox mumble neofetch inkscape @@ -64,12 +77,13 @@ in { executable = true; text = '' #! ${pkgs.bash}/bin/bash - - export MOZ_ENABLE_WAYLAND=1 - export QT_QPA_PLATFORM=wayland-egl - export QT_WAYLAND_FORCE_DPI=physical - export SDL_VIDEODRIVER=wayland - export _JAVA_AWT_WM_NOREPARENTING=1 + + export _JAVA_AWT_WM_NOREPARENTING=1 + export MOZ_ENABLE_WAYLAND=1 + export QT_AUTO_SCREEN_SCALE_FACTOR=0 + export QT_WAYLAND_FORCE_DPI=96 + export QT_QPA_PLATFORM=wayland-egl + export SDL_VIDEODRIVER=wayland exec ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway ''; } @@ -85,4 +99,8 @@ in { }; services.printing.enable = true; + + hardware.opengl = { + enable = true; + }; } diff --git a/roles/dev.nix b/roles/dev.nix index c132318..2710627 100644 --- a/roles/dev.nix +++ b/roles/dev.nix @@ -5,8 +5,6 @@ let unstable = import {}; - mozilla = import {}; - in { environment.systemPackages = with pkgs; [ emacs