Compare commits
	
		
			7 Commits 
		
	
	
		
			249e0758dc
			...
			000eeec743
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
									
								
								 | 
						000eeec743 | |
| 
							
							
								
									
								
								 | 
						54b228381d | |
| 
							
							
								
									
								
								 | 
						ee62f092e5 | |
| 
							
							
								
									
								
								 | 
						6007760092 | |
| 
							
							
								
									
								
								 | 
						f8fddbba14 | |
| 
							
							
								
									
								
								 | 
						f824649f85 | |
| 
							
							
								
									
								
								 | 
						c4fe75a1b9 | 
| 
						 | 
				
			
			@ -44,11 +44,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1759439645,
 | 
			
		||||
        "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=",
 | 
			
		||||
        "lastModified": 1759580034,
 | 
			
		||||
        "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633",
 | 
			
		||||
        "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,8 +17,8 @@
 | 
			
		|||
    nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
 | 
			
		||||
      system = "x86_64-linux";
 | 
			
		||||
      modules = [
 | 
			
		||||
        ./hosts/vm/configuration.nix
 | 
			
		||||
        disko.nixosModules.disko
 | 
			
		||||
        ./hosts/vm/configuration.nix
 | 
			
		||||
        home-manager.nixosModules.home-manager {
 | 
			
		||||
          home-manager.useGlobalPkgs = true;
 | 
			
		||||
          home-manager.useUserPackages = true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,6 +18,12 @@
 | 
			
		|||
 | 
			
		||||
  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
 | 
			
		||||
 | 
			
		||||
  networking.hostId = "25698a58";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +1,42 @@
 | 
			
		|||
import ../../modules/disko.zfs-encrypted-root.nix
 | 
			
		||||
# USAGE in your configuration.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