diff --git a/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf b/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf index 770e0ce..a261c3f 100644 --- a/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf +++ b/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf @@ -1,13 +1,11 @@ # Disable CPUTYPE optimizations when compiling gcc48 because tigerlake is not included in gcc4.8 # -# Disable CPUTYPE optimizations when compiling ripgrep because the build is failing https://github.com/BurntSushi/ripgrep/issues/1721 -# -# Disable CPUTYPE optimizations for firefox due to failing build. +# Disable CPUTYPE optimizations for qt6-base because FreeBSD 13 is on Clang 14 which does not yet support zen4 (added in Clang 16) so qt6 is incorrectly flagging my CPU as not supporting AVX512. # # Example from bottom of /usr/share/examples/etc/make.conf -.if ${.CURDIR:N*/lang/gcc48*} && ${.CURDIR:N*/lang/gcc10*} && ${.CURDIR:N*/textproc/ripgrep*} && ${.CURDIR:N*/www/firefox*} +.if ${.CURDIR:N*/lang/gcc48*} && ${.CURDIR:N*/lang/gcc10*} && ${.CURDIR:N*/devel/qt6-base*} CPUTYPE?=tigerlake -#CPUTYPE?=x86-64-v3 +# CPUTYPE?=x86-64-v4 .endif OPTIMIZED_CFLAGS=YES BUILD_OPTIMIZED=YES diff --git a/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-pkglist b/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-pkglist index 5f8230f..fcaafd9 100644 --- a/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-pkglist +++ b/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-pkglist @@ -40,8 +40,8 @@ multimedia/libva-utils multimedia/libvdpau-va-gl multimedia/mpv multimedia/pwcview -multimedia/v4l_compat multimedia/v4l-utils +multimedia/v4l_compat multimedia/vdpauinfo multimedia/webcamd multimedia/wf-recorder @@ -57,6 +57,7 @@ ports-mgmt/pkg-provides ports-mgmt/portshaker ports-mgmt/poudriere print/texlive-full +security/cfssl security/doas security/git-crypt security/gnupg @@ -112,6 +113,8 @@ x11-fonts/noto-emoji x11-fonts/noto-extra x11-fonts/source-sans-ttf x11-fonts/sourcecodepro-ttf +x11-themes/adwaita-qt5 +x11-themes/adwaita-qt6 x11-wm/sway x11/alacritty x11/grim diff --git a/ansible/roles/poudrierenginx/files/nginx.conf b/ansible/roles/poudrierenginx/files/nginx.conf index 5fc33c2..72da82a 100644 --- a/ansible/roles/poudrierenginx/files/nginx.conf +++ b/ansible/roles/poudrierenginx/files/nginx.conf @@ -9,6 +9,10 @@ http { include mime.types; default_type application/octet-stream; + types { + text/plain log; + } + sendfile on; tcp_nopush on; tcp_nodelay on; diff --git a/ansible/roles/sway/files/launch_sway_freebsd.bash b/ansible/roles/sway/files/launch_sway_freebsd.bash index eac166f..0a728a7 100644 --- a/ansible/roles/sway/files/launch_sway_freebsd.bash +++ b/ansible/roles/sway/files/launch_sway_freebsd.bash @@ -11,6 +11,9 @@ export WLR_RENDERER=vulkan # Enable wayland support for firefox export MOZ_ENABLE_WAYLAND=1 +# Enable dark theme +# export QT_STYLE_OVERRIDE=adwaita-dark + # Wayland seems enabled by default for qt5 with qt5-wayland installed but if a proprietary program bundles their own qt then I may have to set QT_QPA_PLATFORM="wayland;xcb" # Wayland does not seem enabled for gtk apps and setting GDK_BACKEND=wayland did not change that. diff --git a/ansible/roles/sway/files/launch_sway_linux.bash b/ansible/roles/sway/files/launch_sway_linux.bash index 0d9901c..233fc3f 100644 --- a/ansible/roles/sway/files/launch_sway_linux.bash +++ b/ansible/roles/sway/files/launch_sway_linux.bash @@ -9,4 +9,7 @@ export XDG_CURRENT_DESKTOP=sway export MOZ_ENABLE_WAYLAND=1 #export WLR_RENDERER=vulkan +# Enable dark theme +# export QT_STYLE_OVERRIDE=adwaita-dark + exec sway -d &> $HOME/.config/swaylog diff --git a/ansible/roles/sway/files/settings.ini b/ansible/roles/sway/files/settings.ini new file mode 100644 index 0000000..29322c1 --- /dev/null +++ b/ansible/roles/sway/files/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-application-prefer-dark-theme=1 diff --git a/ansible/roles/sway/tasks/common.yaml b/ansible/roles/sway/tasks/common.yaml index 6ee6850..1034901 100644 --- a/ansible/roles/sway/tasks/common.yaml +++ b/ansible/roles/sway/tasks/common.yaml @@ -20,6 +20,8 @@ - dbus # for desktop notifications - jq - vulkan-validation-layers # For vulkan support in sway + # - adwaita-qt5 # For dark theme + # - adwaita-qt6 # For dark theme state: present - name: Install scripts diff --git a/ansible/roles/sway/tasks/peruser.yaml b/ansible/roles/sway/tasks/peruser.yaml index fe18284..378de3f 100644 --- a/ansible/roles/sway/tasks/peruser.yaml +++ b/ansible/roles/sway/tasks/peruser.yaml @@ -14,6 +14,7 @@ - ".config/xdg-desktop-portal-wlr" - ".config/mako" - ".config/wlogout" + - .config/gtk-3.0 - name: Copy files copy: @@ -35,6 +36,8 @@ dest: .config/electron-flags.conf - src: mako_config dest: .config/mako/config + - src: settings.ini + dest: .config/gtk-3.0/settings.ini - name: Configure dotfiles (conf directory) copy: