sin_serhao/homelab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/disk'

Browse Source
This commit is contained in:
shobu
2026-01-13 22:33:34 +01:00
parent 7173c81006 637433e101
commit 2a73531342
2 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
flake.nix
View File

@@ -65,6 +65,26 @@
);
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 {
meta = {
nixpkgs = import nixpkgs {
@@ -118,6 +138,7 @@
];
deployment.targetHost = "192.168.1.14";
deployment.allowLocalDeployment = true;
};
};
devShells = forEachSupportedSystem (

39
hosts/sin/luks-btrfs-raid.nix
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";
device = "/dev/sda";
device = "/dev/sdc";
content = {
type = "gpt";
partitions = {
crypt_p1 = {
crypt_p = {
size = "100%";
content = {
type = "luks";
name = "p_data1"; # device-mapper name when decrypted
# Remove settings.keyFile if you want to use interactive password entry
name = "p_data";
settings = {
allowDiscards = true;
keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00";
@@ -72,17 +93,17 @@
};
};
};
data2 = {
data1 = {
type = "disk";
device = "/dev/sdb";
content = {
type = "gpt";
partitions = {
crypt_p2 = {
crypt_p = {
size = "100%";
content = {
type = "luks";
name = "p_data2";
name = "p_data1";
# Remove settings.keyFile if you want to use interactive password entry
settings = {
allowDiscards = true;
@@ -93,7 +114,7 @@
type = "btrfs";
extraArgs = [
"-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 = {
"/" = {