peprolinbot/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

FIx environment variables

Browse source
This commit is contained in:
Pedro Rey Anca 2024-07-21 13:10:42 +02:00
parent 7ba6eafa7d
commit 392a96f32f
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/core/default.nix
View file

@ -20,6 +20,5 @@
++ [(import ./system.nix)] ++ [(import ./system.nix)]
++ [(import ./user.nix)] ++ [(import ./user.nix)]
++ [(import ./wayland.nix)] ++ [(import ./wayland.nix)]
++ [(import ./variables.nix)]
++ [(import ./virtualisation.nix)]; ++ [(import ./virtualisation.nix)];
} }

4
modules/core/variables.nix
View file

@ -1,4 +0,0 @@
{...}: {
environment.sessionVariables.NIXOS_OZONE_WL = "1";
environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es";
}

2
modules/core/wayland.nix
View file

@ -25,4 +25,6 @@
background.path = pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; background.path = pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath;
}; };
}; };
environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es";
} }

3
modules/home/hyprland/config.nix
View file

@ -3,9 +3,6 @@
settings = { settings = {
# autostart # autostart
exec-once = [ exec-once = [
"systemctl --user import-environment &"
"hash dbus-update-activation-environment 2>/dev/null &"
"dbus-update-activation-environment --systemd --all &"
"nm-applet &" "nm-applet &"
"wl-clip-persist --clipboard both &" "wl-clip-persist --clipboard both &"
"bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'" "bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'"

12
modules/home/hyprland/variables.nix
View file

@ -1,4 +1,8 @@
{...}: { {
lib,
config,
...
}: {
home.sessionVariables = { home.sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
ELECTRON_OZONE_PLATFORM_HINT = "auto"; ELECTRON_OZONE_PLATFORM_HINT = "auto";
@ -13,16 +17,18 @@
WLR_DRM_NO_ATOMIC = "1"; WLR_DRM_NO_ATOMIC = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_AUTO_SCREEN_SCALE_FACTOR = "1";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORM = "xcb"; QT_QPA_PLATFORM = "wayland";
QT_QPA_PLATFORMTHEME = "qt5ct"; QT_QPA_PLATFORMTHEME = "qt5ct";
QT_STYLE_OVERRIDE = "kvantum"; QT_STYLE_OVERRIDE = "kvantum";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan"; WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan";
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
XDG_SESSION_TYPE = "wayland"; XDG_SESSION_TYPE = "wayland";
SDL_VIDEODRIVER = "wayland"; SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland"; CLUTTER_BACKEND = "wayland";
GTK_THEME = "Dracula"; GTK_THEME = "Dracula";
}; };
wayland.windowManager.hyprland.systemd.variables = ["--all"];
wayland.windowManager.hyprland.settings.env = lib.attrsets.mapAttrsToList (name: value: "${name},${builtins.toString value}") config.home.sessionVariables;
} }