diff --git a/flake.nix b/flake.nix index 1aff92a..af1de52 100644 --- a/flake.nix +++ b/flake.nix @@ -23,24 +23,30 @@ system = "x86_64-linux"; in { - # nixosConfigurations.pc = nixpkgs.lib.nixosSystem { - # inherit system; - # specialArgs = { inherit inputs; }; - # modules = [ - # ./hosts/pc/configuration.nix - # home-manager.nixosModules.default + nixosConfigurations.test = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { + inherit inputs; + disk = "nvme-SAMSUNG_MZVLB256HBHQ-000H1_S4GNNX2RC66163"; + }; + modules = [ + ./hosts/test/configuration.nix + home-manager.nixosModules.default - # { - # home-manager = { - # useGlobalPkgs = true; - # useUserPackages = true; + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; - # backupFileExtension = "backup"; + backupFileExtension = "backup"; - # users.river = import ./home; - # }; - # } - # ]; - # }; + users.river = import ./home; + }; + } + + inputs.disko.nixosModules.disko + ./disks/normal.nix + ]; + }; }; } diff --git a/hosts/test/configuration.nix b/hosts/test/configuration.nix index 4fdb6fb..10c43b8 100644 --- a/hosts/test/configuration.nix +++ b/hosts/test/configuration.nix @@ -4,7 +4,7 @@ { imports = [ - ./hardware-configuration.nix + #./hardware-configuration.nix ../../modules/core ../../modules/networking ../../modules/virtualization diff --git a/modules/core/config.nix b/modules/core/config.nix index 702464d..bf92a17 100644 --- a/modules/core/config.nix +++ b/modules/core/config.nix @@ -90,6 +90,8 @@ in }; }; + system.stateVersion = "26.11"; + boot.loader = if cfg.bootloader.type == "grub" then { diff --git a/modules/virtualization/qemu.nix b/modules/virtualization/qemu.nix index 20feb5f..c848563 100644 --- a/modules/virtualization/qemu.nix +++ b/modules/virtualization/qemu.nix @@ -11,7 +11,6 @@ in config = lib.mkMerge [ (lib.mkIf cfg.qemu.enable { virtualisation = { - containers.enable = cfg.qemu.containers; libvirtd = { enable = true; qemu = { @@ -34,6 +33,10 @@ in programs.virt-manager.enable = true; }) + (lib.mkIf (cfg.qemu.enable && cfg.qemu.containers) { + virtualisation.containers.enable = true; + }) + (lib.mkIf cfg.qemu.enable { boot.kernelModules = cfg.qemu.bootModules; })