Compare commits

...

3 Commits

Author SHA1 Message Date
shobu
eaf515e178 permission for whisparr
All checks were successful
/ perform flake analysis (push) Successful in 1m26s
/ build hive configuration (push) Successful in 8m51s
2026-01-14 08:22:59 +01:00
shobu
2a73531342 Merge remote-tracking branch 'origin/disk' 2026-01-13 22:33:34 +01:00
637433e101 disk
All checks were successful
/ perform flake analysis (push) Successful in 37s
2026-01-13 22:33:20 +01:00
4 changed files with 66 additions and 18 deletions

18
flake.lock generated
View File

@@ -49,11 +49,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1767637959, "lastModified": 1768336726,
"narHash": "sha256-+gBU5Cj9QNpHLQ5PHJoWNQft7TMsBM6X+tDQg+/B2P0=", "narHash": "sha256-Os4qn0S0bv7MauXGz16ozyOYZuMrA2FJuXNjDnr5yps=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "038af507772593b904b5c3efc306f89cbdf2b6fb", "rev": "c46cd7f57a8ae3b121866485c91ec078c4dd970e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -267,11 +267,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1767147099, "lastModified": 1767838769,
"narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=", "narHash": "sha256-KCLU6SUU80tEBKIVZsBrSjRYX6kn1eVIYI3fEEqOp24=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "01f571579edd64433f97c4294137fbc366deef4b", "rev": "4da21f019f6443f513f16af7f220ba4db1cdfc04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -587,11 +587,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1767640445, "lastModified": 1768127708,
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@@ -54,6 +54,12 @@ in
"transmission" "transmission"
]; ];
users.users.whisparr.extraGroups = [
"jellyfin"
"starr"
"transmission"
];
users.users.shobu.extraGroups = [ users.users.shobu.extraGroups = [
"jellyfin" "jellyfin"
"starr" "starr"

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 = {
"/" = { "/" = {