disk
All checks were successful
/ perform flake analysis (push) Successful in 37s

This commit is contained in:
2026-01-13 22:33:20 +01:00
parent 5c1dec5c27
commit 637433e101
2 changed files with 51 additions and 9 deletions

View File

@@ -65,6 +65,26 @@
); );
in in
{ {
nixosConfigurations = {
sin = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
disko.nixosModules.disko
agenix.nixosModules.default
./hosts/sin/configuration.nix
./hosts/sin/hardware-configuration.nix
]
++ [
# modules
./modules/gitea/sin
];
specialArgs = {
inherit inputs;
};
};
};
colmenaHive = colmena.lib.makeHive { colmenaHive = colmena.lib.makeHive {
meta = { meta = {
nixpkgs = import nixpkgs { nixpkgs = import nixpkgs {
@@ -118,6 +138,7 @@
]; ];
deployment.targetHost = "192.168.1.14"; deployment.targetHost = "192.168.1.14";
deployment.allowLocalDeployment = true;
}; };
}; };
devShells = forEachSupportedSystem ( devShells = forEachSupportedSystem (

View File

@@ -50,18 +50,39 @@
}; };
}; };
data1 = { # data1 = {
# type = "disk";
# device = "/dev/sda";
# content = {
# type = "gpt";
# partitions = {
# crypt_p1 = {
# size = "100%";
# content = {
# type = "luks";
# name = "p_data1"; # device-mapper name when decrypted
# # Remove settings.keyFile if you want to use interactive password entry
# settings = {
# allowDiscards = true;
# keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00";
# keyFileSize = 4096;
# };
# };
# };
# };
# };
# };
data = {
type = "disk"; type = "disk";
device = "/dev/sda"; device = "/dev/sdc";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
crypt_p1 = { crypt_p = {
size = "100%"; size = "100%";
content = { content = {
type = "luks"; type = "luks";
name = "p_data1"; # device-mapper name when decrypted name = "p_data";
# Remove settings.keyFile if you want to use interactive password entry
settings = { settings = {
allowDiscards = true; allowDiscards = true;
keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00"; keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00";
@@ -72,17 +93,17 @@
}; };
}; };
}; };
data2 = { data1 = {
type = "disk"; type = "disk";
device = "/dev/sdb"; device = "/dev/sdb";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
crypt_p2 = { crypt_p = {
size = "100%"; size = "100%";
content = { content = {
type = "luks"; type = "luks";
name = "p_data2"; name = "p_data1";
# Remove settings.keyFile if you want to use interactive password entry # Remove settings.keyFile if you want to use interactive password entry
settings = { settings = {
allowDiscards = true; allowDiscards = true;
@@ -93,7 +114,7 @@
type = "btrfs"; type = "btrfs";
extraArgs = [ extraArgs = [
"-d raid0" "-d raid0"
"/dev/mapper/p_data1" # Use decrypted mapped device, same name as defined in disk1 "/dev/mapper/p_data3" # Use decrypted mapped device, same name as defined in disk1
]; ];
subvolumes = { subvolumes = {
"/" = { "/" = {