chore: merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Ahwx 2025-10-03 15:25:02 +02:00
commit e256b86334
7 changed files with 47 additions and 25 deletions

View file

@ -3,7 +3,7 @@
imports =
[ (import ./docker.nix) ]
++ [ (import ./hardware.nix) ]
++ [ (import ./displaylink.nix) ]
# ++ [ (import ./displaylink.nix) ]
# ++ [(import ./printing.nix)]
++ [ (import ./xserver.nix) ]
++ [ (import ./network.nix) ]

View file

@ -1,12 +1,13 @@
{ ... }:
{
imports =
[(import ./hardware.nix)]
++ [(import ./network.nix)]
++ [(import ./program.nix)]
++ [(import ./sshd.nix)]
++ [(import ./security.nix)]
++ [(import ./services.nix)]
++ [(import ./system.nix)]
++ [(import ./user.nix)];
[ (import ./hardware.nix) ]
++ [ (import ./network.nix) ]
++ [ (import ./program.nix) ]
++ [ (import ./sshd.nix) ]
++ [ (import ./security.nix) ]
++ [ (import ./services.nix) ]
++ [ (import ./system.nix) ]
++ [ (import ./user.nix) ]
++ [ (import ./virtualization.nix) ];
}

View file

@ -12,6 +12,8 @@
libvirtd.enable =
if (host == "violet") then
true
else if (host == "dandelion") then
true
else if (host == "sakura") then
true
else if (host == "yoshino") then
@ -36,7 +38,7 @@
# { };
users.groups.libvirtd.members =
if (config.virtualisation.waydroid.enable == true) then [ username ] else [ ];
if (config.virtualisation.libvirtd.enable == true) then [ username ] else [ ];
# Enable qemu etc
environment.systemPackages = with pkgs; [