yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'disable state home for now' (#740) from Mic92-main into main

Browse Source
This commit is contained in:
clan-bot
2024-01-17 10:03:48 +00:00
parent 5ce7819229 1d2f003210
commit bd5ad0dc31
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nixosModules/clanCore/state.nix
View File

@@ -1,7 +1,8 @@
{ lib, ... }: { lib, ... }:
{ {
# defaults # defaults
config.clanCore.state.HOME.folders = [ "/home" ]; # FIXME: currently broken, will be fixed soon
#config.clanCore.state.HOME.folders = [ "/home" ];
# interface # interface
options.clanCore.state = lib.mkOption { options.clanCore.state = lib.mkOption {

5
pkgs/clan-cli/clan_cli/vms/run.py
View File

@@ -225,10 +225,7 @@ def run_vm(
disk_img=disk_img, disk_img=disk_img,
) )
if vm.wayland: packages = ["nixpkgs#qemu"]
packages = ["git+https://git.clan.lol/clan/clan-core.git#qemu-wayland"]
else:
packages = ["nixpkgs#qemu"]
env = os.environ.copy() env = os.environ.copy()
if vm.graphics and not vm.wayland: if vm.graphics and not vm.wayland: