Compare commits
7 Commits
000eeec743
...
249e0758dc
Author | SHA1 | Date |
---|---|---|
|
249e0758dc | |
|
369c4a4502 | |
|
cc27858ea9 | |
|
f2ee5e10fc | |
|
4e0cdbfe4c | |
|
d7b1e228df | |
|
f37bfdbe03 |
|
@ -44,11 +44,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759580034,
|
"lastModified": 1759439645,
|
||||||
"narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
|
"narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
|
"rev": "879bd460b3d3e8571354ce172128fbcbac1ed633",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
disko.nixosModules.disko
|
|
||||||
./hosts/vm/configuration.nix
|
./hosts/vm/configuration.nix
|
||||||
|
disko.nixosModules.disko
|
||||||
home-manager.nixosModules.home-manager {
|
home-manager.nixosModules.home-manager {
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
|
@ -18,12 +18,6 @@
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
|
||||||
virtualisation.vmVariantWithDisko = {
|
|
||||||
virtualisation.fileSystems."/".neededForBoot = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
disko.devices.disk.main.device = "/dev/vda";
|
|
||||||
|
|
||||||
# These are needed for ZFS
|
# These are needed for ZFS
|
||||||
|
|
||||||
networking.hostId = "25698a58";
|
networking.hostId = "25698a58";
|
||||||
|
|
|
@ -1,42 +1 @@
|
||||||
# USAGE in your configuration.nix.
|
import ../../modules/disko.zfs-encrypted-root.nix
|
||||||
# Update devices to match your hardware.
|
|
||||||
# {
|
|
||||||
# imports = [ ./disko-config.nix ];
|
|
||||||
# disko.devices.disk.main.device = "/dev/sda";
|
|
||||||
# }
|
|
||||||
{
|
|
||||||
disko.devices = {
|
|
||||||
disk = {
|
|
||||||
main = {
|
|
||||||
type = "disk";
|
|
||||||
content = {
|
|
||||||
type = "gpt";
|
|
||||||
partitions = {
|
|
||||||
boot = {
|
|
||||||
size = "1M";
|
|
||||||
type = "EF02"; # for grub MBR
|
|
||||||
};
|
|
||||||
ESP = {
|
|
||||||
size = "1G";
|
|
||||||
type = "EF00";
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
format = "vfat";
|
|
||||||
mountpoint = "/boot";
|
|
||||||
mountOptions = [ "umask=0077" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
root = {
|
|
||||||
size = "100%";
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
format = "ext4";
|
|
||||||
mountpoint = "/";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue