From db4e7809d142e757719b5f357505ade09ccfa56b Mon Sep 17 00:00:00 2001 From: Else Someone Date: Wed, 4 Mar 2026 01:41:33 +0200 Subject: [PATCH] uvms: start actually using the recompiled kernel ...still with an initrd, and very much not useful - bot it boots! --- pkgs/linux-uvm.nix | 406 +++++++++++++++++++-------------------- pkgs/uvms-guest/guest.py | 19 +- profiles/baseImage.nix | 5 +- 3 files changed, 224 insertions(+), 206 deletions(-) diff --git a/pkgs/linux-uvm.nix b/pkgs/linux-uvm.nix index ea077dd..adc05ff 100644 --- a/pkgs/linux-uvm.nix +++ b/pkgs/linux-uvm.nix @@ -27,206 +27,206 @@ let FS_DAX = yes; FUSE_DAX = yes; OVERLAY_FS = yes; - # OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW = yes; + OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW = yes; VIRTIO_BALLOON = yes; VIRTIO_BLK = yes; VIRTIO_CONSOLE = yes; - # VIRTIO_FS = yes; + VIRTIO_FS = yes; VIRTIO_MMIO = yes; VIRTIO_PCI = yes; VIRTIO = yes; - # FUSE_FS = yes; + FUSE_FS = yes; VSOCKETS = yes; # # libkurnfw a70c65d97eda1d53a55602bdef984aba82383097 - # DRM = yes; - # DRM_KMS_HELPER = yes; - # DRM_GEM_SHMEM_HELPER = yes; - # # Can't select??? + DRM = yes; + DRM_KMS_HELPER = yes; + DRM_GEM_SHMEM_HELPER = yes; + # Can't select??? # VIRTIO_GPU = yes; - # # VIRTIO_GPU_KMS = yes; + # VIRTIO_GPU_KMS = yes; DRM_VIRTIO_GPU = yes; # Based on compiled diff? BASE_SMALL = yes; # libkurnfw 33a72344da4938c41616d200372542b3f7eb4412 # # Based on compiled config diff with libkurnfw - # NO_HZ_COMMON = mkForce unset; + NO_HZ_COMMON = mkForce unset; NO_HZ_IDLE = mkForce yes; NO_HZ_FULL = mkForce unset; HZ_1000 = unset; HZ_250 = yes; # NixOS default: 1000 - # # LSM = "lockdown,yama,loadpin,safesetid,integrity,bpf"; + LSM = lib.kernel.freeform "lockdown,yama,loadpin,safesetid,integrity,bpf"; EXT4_FS = yes; # # EXT4_USE_FOR_EXT2 = yes; XFS_FS = yes; DEFAULT_SECURITY_APPARMOR = mkForce unset; - # HW_RANDOM = yes; - # HW_RANDOM_VIRTIO = yes; + HW_RANDOM = yes; + HW_RANDOM_VIRTIO = yes; # # libkurnfw - # POSIX_MQUEUE = mkForce no; + POSIX_MQUEUE = mkForce unset; # # libkurnfw 0ad58f60dc061e61f088a8b9b2758bea4a3bd41d - # HAVE_RELIABLE_STACKTRACE = mkForce unset; - # STACKDEPOT = mkForce unset; - # ARCH_WANT_FRAME_POINTERS = mkForce unset; - # FRAME_POINTER = mkForce unset; - # STACK_VALIDATION = mkForce unset; - # SLUB_DEBUG = mkForce unset; - # UNWINDER_FRAME_POINTER = mkForce unset; - # # UNWINDER_GUESS = mkForce yes; - # UNWINDER_ORC = mkForce unset; + HAVE_RELIABLE_STACKTRACE = mkForce unset; + STACKDEPOT = mkForce unset; + ARCH_WANT_FRAME_POINTERS = mkForce unset; + FRAME_POINTER = mkForce unset; + STACK_VALIDATION = mkForce unset; + SLUB_DEBUG = mkForce unset; + UNWINDER_FRAME_POINTER = mkForce unset; + # UNWINDER_GUESS = mkForce yes; + UNWINDER_ORC = mkForce unset; # # libkurnfw a5094ce1633889250482b812265c15d9a252f6a7 - # PROFILING = mkForce no; - # KEXEC_CORE = mkForce unset; # Still selected? - # KEXEC_FILE = mkForce unset; # Still selected? - # DEBUG_MISC = mkForce no; - # MAGIC_SYSRQ = mkForce no; - # DEBUG_FS = mkForce unset; # mkForce no; - # DEBUG_INFO_NONE = mkForce yes; + PROFILING = mkForce no; + KEXEC_CORE = mkForce unset; # Still selected? + KEXEC_FILE = mkForce unset; # Still selected? + DEBUG_MISC = mkForce no; + MAGIC_SYSRQ = mkForce no; + DEBUG_FS = mkForce unset; # mkForce no; + DEBUG_INFO_NONE = mkForce yes; - # KEXEC_JUMP = mkForce unset; - # DEBUG_INFO = mkForce unset; - # DEBUG_INFO_REDUCED = mkForce unset; - # DEBUG_LIST = mkForce unset; - # DEBUG_INFO_BTF = mkForce unset; - # DYNAMIC_DEBUG = mkForce unset; - # SUNRPC_DEBUG = mkForce unset; - # MAC80211_DEBUGFS = mkForce unset; - # CFG80211_DEBUGFS = mkForce unset; - # ACPI_DEBUG = mkForce unset; - # DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = mkForce unset; - # MODULE_ALLOW_BTF_MISMATCH = mkForce unset; - # CRC32_SELFTEST = mkForce unset; - # BLK_DEBUG_FS = mkForce unset; + KEXEC_JUMP = mkForce unset; + DEBUG_INFO = mkForce unset; + DEBUG_INFO_REDUCED = mkForce unset; + DEBUG_LIST = mkForce unset; + DEBUG_INFO_BTF = mkForce unset; + DYNAMIC_DEBUG = mkForce unset; + SUNRPC_DEBUG = mkForce unset; + MAC80211_DEBUGFS = mkForce unset; + CFG80211_DEBUGFS = mkForce unset; + ACPI_DEBUG = mkForce unset; + DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = mkForce unset; + MODULE_ALLOW_BTF_MISMATCH = mkForce unset; + CRC32_SELFTEST = mkForce unset; + BLK_DEBUG_FS = mkForce unset; - # # Conflicts: - # MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT = mkForce unset; - # KEXEC_HANDOVER = mkForce unset; - # MEM_ALLOC_PROFILING = mkForce unset; + # Conflicts: + MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT = mkForce unset; + KEXEC_HANDOVER = mkForce unset; + MEM_ALLOC_PROFILING = mkForce unset; # # libkurnfw d28d2632b704335c4065648afa490b63cfe49393 - # X86_MSR = mkForce no; - # PERF_EVENTS_AMD_UNCORE = mkForce unset; - # ARCH_MEMORY_PROBE = mkForce unset; - # X86_CHECK_BIOS_CORRUPTION = mkForce unset; - # X86_REROUTE_FOR_BROKEN_BOOT_IRQS = mkForce unset; - # MTRR = mkForce no; - # MTRR_SANITIZER = mkForce unset; - # X86_PAT = mkForce unset; - # X86_SGX = mkForce unset; - # MODIFY_LDT_SYSCALL = mkForce unset; - # ARCH_HAS_PKEYS = mkForce unset; - # ARCH_USES_HIGH_VMA_FLAGS = mkForce unset; + X86_MSR = mkForce no; + PERF_EVENTS_AMD_UNCORE = mkForce unset; + ARCH_MEMORY_PROBE = mkForce unset; + X86_CHECK_BIOS_CORRUPTION = mkForce unset; + X86_REROUTE_FOR_BROKEN_BOOT_IRQS = mkForce unset; + MTRR = mkForce no; + MTRR_SANITIZER = mkForce unset; + X86_PAT = mkForce unset; + X86_SGX = mkForce unset; + MODIFY_LDT_SYSCALL = mkForce unset; + ARCH_HAS_PKEYS = mkForce unset; + ARCH_USES_HIGH_VMA_FLAGS = mkForce unset; - # X86_INTEL_PSTATE = mkForce unset; - # X86_AMD_PSTATE = mkForce unset; - # X86_SGX_KVM = mkForce unset; - # UCLAMP_TASK = mkForce unset; + X86_INTEL_PSTATE = mkForce unset; + X86_AMD_PSTATE = mkForce unset; + X86_SGX_KVM = mkForce unset; + UCLAMP_TASK = mkForce unset; # # libkurnfw 8043cecb92f7384f648bfb2fde9e19653fe877e8 - # PM = mkForce unset; # want "no" but can't select? - # CPU_FREQ = mkForce unset; - # CPU_IDLE_GOV_LADDER = mkForce unset; + PM = mkForce unset; # want "no" but can't select? + CPU_FREQ = mkForce unset; + CPU_IDLE_GOV_LADDER = mkForce unset; INTEL_IDLE = mkForce unset; - # SCHED_MC_PRIO = mkForce unset; - # BLK_PM = mkForce unset; - # CPU_IDLE = yes; - # CPU_IDLE_GOV_HALTPOLL = yes; - # HALTPOLL_CPUIDLE = yes; + SCHED_MC_PRIO = mkForce unset; + BLK_PM = mkForce unset; + CPU_IDLE = yes; + CPU_IDLE_GOV_HALTPOLL = yes; + HALTPOLL_CPUIDLE = yes; # # Conflicts: - # PM_DEBUG = mkForce unset; - # PM_ADVANCED_DEBUG = mkForce unset; - # PM_WAKELOCKS = mkForce unset; - # TPMI = mkForce unset; - # INTEL_TPMI = mkForce unset; + PM_DEBUG = mkForce unset; + PM_ADVANCED_DEBUG = mkForce unset; + PM_WAKELOCKS = mkForce unset; + TPMI = mkForce unset; + INTEL_TPMI = mkForce unset; # # libkurnfw 63c4d29cd28ab73ea1c3a85c9df0c71a6101dd41 - # IA32_EMULATION = mkForce no; - # COMPAT_32BIT_TIME = mkForce no; + IA32_EMULATION = mkForce no; + COMPAT_32BIT_TIME = mkForce no; # # libkurnfw b085fa0f8958ea37f0e3c16dfec6cd7cc58c6b41 - # HIBERNATION = mkForce unset; - # SWAP = mkForce no; - # ZSWAP = mkForce unset; - # ZSWAP_COMPRESSOR_DEFAULT_ZSTD = mkForce unset; - # ZONE_DMA = mkForce no; - # VM_EVENT_COUNTERS = mkForce unset; # Still selected as a dep? - # PERCPU_STATS = mkForce no; + HIBERNATION = mkForce unset; + SWAP = mkForce no; + ZSWAP = mkForce unset; + ZSWAP_COMPRESSOR_DEFAULT_ZSTD = mkForce unset; + ZONE_DMA = mkForce no; + VM_EVENT_COUNTERS = mkForce unset; # Still selected as a dep? + PERCPU_STATS = mkForce no; # # libkurnfw 123090b6960cd0beb7fcb19e2fc383d24c6b74e9 - # XFRM_USER = mkForce unset; - # SYN_COOKIES = mkForce unset; - # TCP_CONG_ADVANCED = mkForce no; - # TCP_MD5SIG = mkForce no; - # NETLABEL = mkForce no; - # ETHTOOL_NETLINK = mkForce no; + XFRM_USER = mkForce unset; + SYN_COOKIES = mkForce unset; + TCP_CONG_ADVANCED = mkForce no; + TCP_MD5SIG = mkForce no; + NETLABEL = mkForce no; + ETHTOOL_NETLINK = mkForce no; # # libkurnfw b31a4ab84f13bde66497fd21b277503f7ad4b541 - # FW_LOADER = mkForce unset; + FW_LOADER = mkForce unset; # SOUND = mkForce unset; - # USB_SUPPORT = mkForce unset; - # MEMSTICK = mkForce unset; - # NEW_LEDS = mkForce unset; - # ACCESSIBILITY = mkForce unset; - # INFINIBAND = mkForce unset; - # INFINIBAND_ADDR_TRANS = mkForce unset; + USB_SUPPORT = mkForce unset; + MEMSTICK = mkForce unset; + NEW_LEDS = mkForce unset; + ACCESSIBILITY = mkForce unset; + INFINIBAND = mkForce unset; + INFINIBAND_ADDR_TRANS = mkForce unset; # UIO = mkForce unset; - # VFIO = mkForce unset; - # VIRTIO_PMEM = mkForce unset; - # VDPA = mkForce unset; - # HYPERV = mkForce unset; - # FB_HYPERV = mkForce unset; - # DRM_HYPERV = mkForce unset; - # KVM_HYPERV = mkForce unset; - # COMMON_CLK = mkForce unset; - # EXT2_FS = mkForce unset; - # EXT3_FS = mkForce unset; + VFIO = mkForce unset; + VIRTIO_PMEM = mkForce unset; + VDPA = mkForce unset; + HYPERV = mkForce unset; + FB_HYPERV = mkForce unset; + DRM_HYPERV = mkForce unset; + KVM_HYPERV = mkForce unset; + COMMON_CLK = mkForce unset; + EXT2_FS = mkForce unset; + EXT3_FS = mkForce unset; - # EXT3_FS_POSIX_ACL = mkForce unset; - # EXT3_FS_SECURITY = mkForce unset; + EXT3_FS_POSIX_ACL = mkForce unset; + EXT3_FS_SECURITY = mkForce unset; - # # libkrunfw e2fd98beb10f2fd9b827e188cc55ec0f90d44932 - # PAGE_SIZE_LESS_THAN_64KB = yes; - # PAGE_SIZE_LESS_THAN_256KB = yes; - # CHROME_PLATFORMS = mkForce unset; - # X86_PLATFORM_DEVICES = mkForce unset; - # SURFACE_PLATFORMS = mkForce unset; - # INTEL_UNCORE_FREQ_CONTROL = mkForce unset; - # INTEL_TURBO_MAX_3 = mkForce unset; + # libkrunfw e2fd98beb10f2fd9b827e188cc55ec0f90d44932 + PAGE_SIZE_LESS_THAN_64KB = yes; + PAGE_SIZE_LESS_THAN_256KB = yes; + CHROME_PLATFORMS = mkForce unset; + X86_PLATFORM_DEVICES = mkForce unset; + SURFACE_PLATFORMS = mkForce unset; + INTEL_UNCORE_FREQ_CONTROL = mkForce unset; + INTEL_TURBO_MAX_3 = mkForce unset; - # CHROMEOS_PSTORE = mkForce unset; - # CHROMEOS_LAPTOP = mkForce unset; - # CHROMEOS_TBMC = mkForce unset; + CHROMEOS_PSTORE = mkForce unset; + CHROMEOS_LAPTOP = mkForce unset; + CHROMEOS_TBMC = mkForce unset; - # CROS_EC = mkForce unset; - # CRYPTO_TEST = mkForce unset; - # NFS_SWAP = mkForce unset; - # CROS_EC_I2C = mkForce unset; - # CROS_EC_ISHTP = mkForce unset; - # CROS_EC_LPC = mkForce unset; - # CROS_EC_SPI = mkForce unset; + CROS_EC = mkForce unset; + CRYPTO_TEST = mkForce unset; + NFS_SWAP = mkForce unset; + CROS_EC_I2C = mkForce unset; + CROS_EC_ISHTP = mkForce unset; + CROS_EC_LPC = mkForce unset; + CROS_EC_SPI = mkForce unset; - # NET_SCH_BPF = mkForce unset; + NET_SCH_BPF = mkForce unset; - # UCLAMP_TASK_GROUP = mkForce unset; - # SCHED_CLASS_EXT = mkForce unset; - # DRM_NOUVEAU_SVM = mkForce unset; - # CROS_KBD_LED_BACKLIGHT = mkForce unset; + UCLAMP_TASK_GROUP = mkForce unset; + SCHED_CLASS_EXT = mkForce unset; + DRM_NOUVEAU_SVM = mkForce unset; + CROS_KBD_LED_BACKLIGHT = mkForce unset; - # # Based on compiled config diff with libkurnfw + # Based on compiled config diff with libkurnfw XEN = mkForce unset; - # XEN_EFI = mkForce unset; - # HVC_XEN = mkForce unset; - # HVC_XEN_FRONTEND = mkForce unset; + XEN_EFI = mkForce unset; + HVC_XEN = mkForce unset; + HVC_XEN_FRONTEND = mkForce unset; XEN_BACKEND = mkForce unset; XEN_BALLOON = mkForce unset; XEN_BALLOON_MEMORY_HOTPLUG = mkForce unset; @@ -234,7 +234,7 @@ let XEN_HAVE_PVMMU = mkForce unset; XEN_MCE_LOG = mkForce unset; XEN_PVH = mkForce unset; - # XEN_PVHVM = mkForce unset; + XEN_PVHVM = mkForce unset; XEN_SAVE_RESTORE = mkForce unset; XEN_SYS_HYPERVISOR = mkForce unset; PCI_XEN = mkForce unset; @@ -245,81 +245,81 @@ let REISERFS_FS_SECURITY = mkForce unset; REISERFS_FS_XATTR = mkForce unset; SWIOTLB_XEN = mkForce unset; - # SUSPEND = mkForce unset; - # ACPI = mkForce unset; - # ISA_DMA_API = mkForce unset; - # COMPAT = mkForce unset; - # COMPAT_32 = mkForce unset; - # KVM = mkForce unset; - # BLOCK_LEGACY_AUTOLOAD = mkForce unset; - # CMA = mkForce unset; + SUSPEND = mkForce unset; + ACPI = mkForce unset; + ISA_DMA_API = mkForce unset; + COMPAT = mkForce unset; + COMPAT_32 = mkForce unset; + KVM = mkForce unset; + BLOCK_LEGACY_AUTOLOAD = mkForce unset; + CMA = mkForce unset; FB = mkForce unset; FB_EFI = mkForce unset; FB_VESA = mkForce unset; SECURITY_APPARMOR = mkForce unset; - # SERIAL_8250 = mkForce unset; - # ISA_BUS = unset; - # X86_X32_ABI = unset; - # SCHED_AUTOGROUP = mkForce unset; # libkurnfw - # RAID6_PQ = mkForce unset; # libkurnfw: yes - # ARCH_HAS_FAST_MULTIPLIER = yes; - # GENERIC_NET_UTILS = yes; - # BITREVERSE = yes; + SERIAL_8250 = mkForce unset; + ISA_BUS = unset; + X86_X32_ABI = unset; + SCHED_AUTOGROUP = mkForce unset; # libkurnfw + RAID6_PQ = mkForce unset; # libkurnfw: yes + ARCH_HAS_FAST_MULTIPLIER = yes; + GENERIC_NET_UTILS = yes; + BITREVERSE = yes; - # # Conflicts - # IIO = mkForce unset; - # IIO_TRIGGERED_EVENT = mkForce unset; - # IIO_CONFIGFS = mkForce unset; - # IIO_KFIFO_BUF = mkForce unset; - # IIO_TRIGGER = mkForce unset; - # STAGING = mkForce unset; - # STAGING_MEDIA = mkForce unset; + # Conflicts + IIO = mkForce unset; + IIO_TRIGGERED_EVENT = mkForce unset; + IIO_CONFIGFS = mkForce unset; + IIO_KFIFO_BUF = mkForce unset; + IIO_TRIGGER = mkForce unset; + STAGING = mkForce unset; + STAGING_MEDIA = mkForce unset; - # LEGACY_PTYS = mkForce unset; - # NULL_TTY = mkForce unset; - # N_GSM = mkForce unset; - # SERIAL_NONSTANDARD = mkForce unset; - # TTY_PRINTK = mkForce unset; - # IPMI_HANDLER = mkForce unset; - # TELCLOCK = mkForce unset; - # TCG_TPM = mkForce unset; - # SERIAL_UARTLITE = mkForce unset; - # SERIAL_LANTIQ = mkForce unset; - # MWAVE = mkForce unset; - # SERIAL_CORE = mkForce unset; - # SERIAL_MCTRL_GPIO = mkForce unset; - # I2C = mkForce unset; + LEGACY_PTYS = mkForce unset; + NULL_TTY = mkForce unset; + N_GSM = mkForce unset; + SERIAL_NONSTANDARD = mkForce unset; + TTY_PRINTK = mkForce unset; + IPMI_HANDLER = mkForce unset; + TELCLOCK = mkForce unset; + TCG_TPM = mkForce unset; + SERIAL_UARTLITE = mkForce unset; + SERIAL_LANTIQ = mkForce unset; + MWAVE = mkForce unset; + SERIAL_CORE = mkForce unset; + SERIAL_MCTRL_GPIO = mkForce unset; + I2C = mkForce unset; - # # Interactively solving conflicts... + # Interactively solving conflicts... - # COMEDI = mkForce unset; + COMEDI = mkForce unset; - # NLS = mkForce yes; - # NLS_CODEPAGE_437 = mkForce yes; - # NLS_CODEPAGE_737 = mkForce unset; - # NLS_CODEPAGE_775 = mkForce unset; - # NLS_CODEPAGE_850 = mkForce unset; - # NLS_CODEPAGE_852 = mkForce unset; - # NLS_CODEPAGE_855 = mkForce unset; - # NLS_CODEPAGE_857 = mkForce unset; - # NLS_CODEPAGE_860 = mkForce unset; - # NLS_CODEPAGE_861 = mkForce unset; - # NLS_CODEPAGE_862 = mkForce unset; - # NLS_CODEPAGE_863 = mkForce unset; - # NLS_CODEPAGE_864 = mkForce unset; - # NLS_CODEPAGE_865 = mkForce unset; - # NLS_CODEPAGE_866 = mkForce unset; - # NLS_CODEPAGE_869 = mkForce unset; - # NLS_CODEPAGE_936 = mkForce unset; - # NLS_CODEPAGE_950 = mkForce unset; - # NLS_CODEPAGE_932 = mkForce unset; - # NLS_CODEPAGE_949 = mkForce unset; - # NLS_CODEPAGE_874 = mkForce unset; - # NLS_ISO8859_8 = mkForce unset; - # NLS_CODEPAGE_1250 = mkForce unset; - # NLS_CODEPAGE_1251 = mkForce unset; + NLS = mkForce yes; + NLS_CODEPAGE_437 = mkForce yes; + NLS_CODEPAGE_737 = mkForce unset; + NLS_CODEPAGE_775 = mkForce unset; + NLS_CODEPAGE_850 = mkForce unset; + NLS_CODEPAGE_852 = mkForce unset; + NLS_CODEPAGE_855 = mkForce unset; + NLS_CODEPAGE_857 = mkForce unset; + NLS_CODEPAGE_860 = mkForce unset; + NLS_CODEPAGE_861 = mkForce unset; + NLS_CODEPAGE_862 = mkForce unset; + NLS_CODEPAGE_863 = mkForce unset; + NLS_CODEPAGE_864 = mkForce unset; + NLS_CODEPAGE_865 = mkForce unset; + NLS_CODEPAGE_866 = mkForce unset; + NLS_CODEPAGE_869 = mkForce unset; + NLS_CODEPAGE_936 = mkForce unset; + NLS_CODEPAGE_950 = mkForce unset; + NLS_CODEPAGE_932 = mkForce unset; + NLS_CODEPAGE_949 = mkForce unset; + NLS_CODEPAGE_874 = mkForce unset; + NLS_ISO8859_8 = mkForce unset; + NLS_CODEPAGE_1250 = mkForce unset; + NLS_CODEPAGE_1251 = mkForce unset; - # ZSMALLOC = mkForce unset; + ZSMALLOC = mkForce unset; }; }; in diff --git a/pkgs/uvms-guest/guest.py b/pkgs/uvms-guest/guest.py index 04914a9..9fd9397 100644 --- a/pkgs/uvms-guest/guest.py +++ b/pkgs/uvms-guest/guest.py @@ -28,7 +28,22 @@ class Processes: res = {} text = run.get("text", False) env = { - **os.environ, + **{ + k: v + for k, v in os.environ.items() + # if any( + # k.startswith(prefix) + # for prefix in ( + # "XDG_", + # "NIX_", + # "RUST_", + # "WAYLAND_", + # "DBUS_", + # "HOME", + # "PS", + # ) + # ) + }, "PATH": ":".join( [ *os.environ.get("PATH", "").split(":"), @@ -36,6 +51,8 @@ class Processes: "EXTRA_PATH", [], ), + "/run/wrappers/bin", + "/run/current-system/sw/bin", ], ), } diff --git a/profiles/baseImage.nix b/profiles/baseImage.nix index 9d9b5ae..2f9029a 100644 --- a/profiles/baseImage.nix +++ b/profiles/baseImage.nix @@ -209,6 +209,7 @@ in ]; }; + environment.profileRelativeSessionVariables.PATH = lib.mkForce [ "/bin\${PATH:+:}$PATH" ]; environment.variables = env; systemd.globalEnvironment = env; @@ -264,8 +265,8 @@ in Group = "users"; ExecStart = "${lib.getExe uvmsPkgs.uvms-guest}"; ExecStop = [ - "/run/current-system/sw/bin/echo GUEST DOWN" - "/run/current-system/sw/bin/systemctl poweroff" + "/run/current-system/sw/bin/echo GUEST DOWN" + "/run/current-system/sw/bin/systemctl poweroff" ]; StandardOutput = "journal+console"; StandardError = "journal+console";