summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Soto <alejandro@34project.org>2024-06-06 19:30:19 -0600
committerAlejandro Soto <alejandro@34project.org>2024-06-06 19:30:19 -0600
commitd49529cc6a210479550c0a704cc55775df7ea746 (patch)
tree623501bca8c22040943fe15799c51a52bb2bb300
parent2563e3b8d9475e819dee0ddc0e48847b897a8e78 (diff)
hv: initial commit
-rw-r--r--flake.nix22
-rw-r--r--sys/default.nix4
-rw-r--r--sys/hv/default.nix5
3 files changed, 16 insertions, 15 deletions
diff --git a/flake.nix b/flake.nix
index c4bb3b4..e9d620d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,13 @@
hm-isolation.url = "/home/ale/hm-isolation";
nixvirt = {
- url = "/home/ale/NixVirt";
- inputs.nixpkgs.follows = "nixpkgs";
+ url = "github:AshleyYakeley/NixVirt";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+
+ #FIXME: Por qué existe esto?
+ nixpkgs-ovmf.follows = "nixpkgs";
+ };
};
};
@@ -57,7 +62,6 @@
inherit pkgs system;
modules = modules ++ [
nixpkgs.nixosModules.notDetected
- impermanence.nixosModule
];
specialArgs = {
@@ -78,16 +82,18 @@
dmz = nixosSystem {
modules = [ ./dmz ];
};
+
+ hv = nixosSystem {
+ modules = [ ./hv ];
+ };
};
homeConfigurations =
let
registry = { ... }: {
- config.nix.registry = {
- "nixpkgs".flake = nixpkgs;
- "unstable".flake = unstable;
- "nur".flake = nur;
- };
+ config.nix.registry = mapAttrs (_: value: {
+ flake = value;
+ }) flakes;
};
home = platform: home-manager.lib.homeManagerConfiguration {
diff --git a/sys/default.nix b/sys/default.nix
index 38a9e06..b96fa14 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -1,11 +1,11 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, flakes, pkgs, ... }:
with lib; {
imports = [
+ (flakes.impermanence.nixosModule)
../env
./auth.nix
./boot.nix
./fs
- ./hv
./net.nix
./nspawn.nix
./options.nix
diff --git a/sys/hv/default.nix b/sys/hv/default.nix
deleted file mode 100644
index 9c52f42..0000000
--- a/sys/hv/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- virtualisation.libvirt = {
- enable = true;
- };
-}