From 25c2516702a7a0cf061b827519164438d8c7cfa2 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Tue, 22 Jul 2025 20:29:23 -0400 Subject: use NIXOS_OZONE_WL instead of manually setting ozone flags --- home/neovim/init.lua | 2 +- modules/desktops/hyprland/env.nix | 1 + modules/desktops/sway/default.nix | 4 +++- options.nix | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/home/neovim/init.lua b/home/neovim/init.lua index 7bfbae4..203d7f2 100644 --- a/home/neovim/init.lua +++ b/home/neovim/init.lua @@ -319,7 +319,7 @@ require("nvim-highlight-colors").setup { enable_var_usage = true, } ---[[ TODO COMMENTS ]]-- +--[[ COMMENTS ]]-- require('todo-comments').setup() diff --git a/modules/desktops/hyprland/env.nix b/modules/desktops/hyprland/env.nix index 93d99fb..aff3f93 100644 --- a/modules/desktops/hyprland/env.nix +++ b/modules/desktops/hyprland/env.nix @@ -6,6 +6,7 @@ "XDG_SESSION_TYPE,wayland" "XDG_SESSION_DESKTOP,Hyprland" "MOZ_ENABLE_WAYLAND,1" + "NIXOS_OZONE_WL,1" "HYPRCURSOR_THEME,rose-pine-hyprcursor" "HYPRCURSOR_SIZE,24" diff --git a/modules/desktops/sway/default.nix b/modules/desktops/sway/default.nix index 9ee79de..be3766d 100644 --- a/modules/desktops/sway/default.nix +++ b/modules/desktops/sway/default.nix @@ -16,6 +16,8 @@ in { config = mkIf cfg.sway { desktops.wayland = true; + # TODO: set NIXOS_OZONE_WL env var + xdg.portal = { config = { sway.common = ["gtk" "wlr"]; @@ -39,7 +41,7 @@ in { enable = true; package = pkgs.swayfx; - # FIXME: this is bad, but swayfx cannot build if set :( + # TODO: get swayfx to work with check config checkConfig = false; xwayland = true; diff --git a/options.nix b/options.nix index 8202466..e598ced 100644 --- a/options.nix +++ b/options.nix @@ -30,8 +30,8 @@ autoRun = [ "wl-clip-persist -c both" "thunderbird" - "discord --enable-features=UseOzonePlatform --ozone-platform=wayland" - "element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland" + "discord" + "element-desktop" ]; stateVersion = "25.11"; -- cgit v1.2.3-freya