Skip to content

Commit

Permalink
gui-vm: Change kernel to linux latest and fix path issue
Browse files Browse the repository at this point in the history
* Change kernel version to linuxPackages_latest which is 6.10.2
* Addresses SP-4919 - Temporary folder in gui-vm / host home directory

Signed-off-by: Vunny Sodhi <[email protected]>
  • Loading branch information
vunnyso authored and brianmcgillion committed Sep 13, 2024
1 parent d3e54c0 commit cfcfe93
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
3 changes: 3 additions & 0 deletions modules/desktop/graphics/labwc.config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ let
runtimeInputs = [
pkgs.systemd
pkgs.dbus
pkgs.brightnessctl
];

text =
Expand All @@ -52,6 +53,8 @@ let
systemctl --user reset-failed
systemctl --user stop ghaf-session.target
systemctl --user start ghaf-session.target
# By default set system brightness to 100% which can be configured later
brightnessctl set 100%
''
+ cfg.extraAutostart;
};
Expand Down
2 changes: 0 additions & 2 deletions modules/desktop/profiles/graphics.nix
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ in
WLR_NO_HARDWARE_CURSORS = if (cfg.renderer == "pixman") then 1 else 0;
# 24 is default value set in labwc
XCURSOR_SIZE = 24;
# To Fix "Fontconfig error : No writable cache directories" during new session login
XDG_CACHE_HOME = "$(mktemp -d)";
XKB_DEFAULT_LAYOUT = "us,ara,fi";
XKB_DEFAULT_OPTIONS = "grp:alt_shift_toggle";
# Set by default in labwc, but possibly not in other compositors
Expand Down
6 changes: 1 addition & 5 deletions modules/microvm/virtualization/microvm/guivm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,7 @@ in
if config.ghaf.guest.kernel.hardening.graphics.enable then
pkgs.linuxPackagesFor guest_graphics_hardened_kernel
else
# TODO: with pkgs.linuxPackages_latest (6.10.2) default brightness
# value of ghaf system will change from 96000 (max brightness) to
# 4800 (5% of max brightness) which need to be debugged
# so, currently align Kernel version which is used by ghaf-host
config.boot.zfs.package.latestCompatibleLinuxPackages;
pkgs.linuxPackages_latest;

# We need this patch to avoid reserving Intel graphics stolen memory for vm
# https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12103
Expand Down

0 comments on commit cfcfe93

Please sign in to comment.