Move nutty-noon to bcachefs
This commit is contained in:
parent
7a0750ca44
commit
ec6df19104
GPG key ID:
AB2BD8DAF2E37122
3 changed files with 38 additions and 123 deletions
|
|
@ -1,7 +1,7 @@
|
|||
keys:
|
||||
- &lotte 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
|
||||
- &nixos-8gb-fsn1-1 age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
|
||||
- &nutty-noon age1zgxkntdp99dkvw7z29jjmgrzlla2ha542zrs3262dwat27a34asqckfkrl
|
||||
- &nutty-noon age1n7c6dp8xn3vl63l8qevun24v3mtggkve0svsrs2lsg992m99jgwq84aw45
|
||||
- &thinkrac age1e7tqq7ezjtwsunt6plvstevg32p97cmqpejpj20gmrkfe0l7gv9se08zf7
|
||||
creation_rules:
|
||||
- path_regex: secrets/nixos-8gb-fsn1-1\.yaml$
|
||||
|
|
|
|||
|
|
@ -21,12 +21,7 @@
|
|||
config.boot.kernelPackages.zenpower
|
||||
];
|
||||
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.devNodes = "/dev/";
|
||||
|
||||
services.zfs.trim.enable = true;
|
||||
services.zfs.autoScrub.enable = true;
|
||||
services.zfs.autoScrub.pools = [ "ssd" "hdd" ];
|
||||
boot.supportedFilesystems = [ "bcachefs" ];
|
||||
|
||||
boot.initrd.luks.devices = {
|
||||
ssd = {
|
||||
|
|
@ -38,95 +33,15 @@
|
|||
};
|
||||
};
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "ssd/nixos";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/mapper/ssd:/dev/mapper/hdd";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{
|
||||
device = "ssd/nixos/nix";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/etc" =
|
||||
{
|
||||
device = "ssd/nixos/etc";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var" =
|
||||
{
|
||||
device = "ssd/nixos/var";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/lib" =
|
||||
{
|
||||
device = "ssd/nixos/var/lib";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" =
|
||||
{
|
||||
device = "ssd/nixos/var/log";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/spool" =
|
||||
{
|
||||
device = "ssd/nixos/var/spool";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{
|
||||
device = "ssd/userdata/home";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/root" =
|
||||
{
|
||||
device = "ssd/userdata/home/root";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/home/tank" =
|
||||
{
|
||||
device = "ssd/userdata/home/tank";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/home/darkkirb/hdd" =
|
||||
{
|
||||
device = "hdd/userdata/home/darkkirb/hdd";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/root/hdd" =
|
||||
{
|
||||
device = "hdd/userdata/home/root/hdd";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/CA0B-E049";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/CA0B-E049";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
|
|
@ -181,11 +96,11 @@
|
|||
];
|
||||
nix.buildMachines = lib.mkForce [
|
||||
{
|
||||
hostName = "build-nas";
|
||||
systems = [ "x86_64-linux" ];
|
||||
maxJobs = 12;
|
||||
speedFactor = 1;
|
||||
supportedFeatures = [ "gccarch-znver1" "ca-derivations" ];
|
||||
hostName = "build-nas";
|
||||
systems = [ "x86_64-linux" ];
|
||||
maxJobs = 12;
|
||||
speedFactor = 1;
|
||||
supportedFeatures = [ "gccarch-znver1" "ca-derivations" ];
|
||||
}
|
||||
{
|
||||
maxJobs = 16;
|
||||
|
|
|
|||
|
|
@ -1,47 +1,47 @@
|
|||
network:
|
||||
wireguard:
|
||||
privkey: ENC[AES256_GCM,data:gDYnx/fRY7pFHH3QEJxoxMwGe+h4E79cJ6FNmDMBcvAJC//QY2twMjkuOOw=,iv:Mer7rLKTLYkMUeLMTEengBWMdeuSseHq40j0/PzDsAY=,tag:/eDnpEh3U+5i0rjI/C6EnQ==,type:str]
|
||||
privkey: ENC[AES256_GCM,data:Vnw0DzDgJimKGsCwZRQkEhD32rJwLcedvFWDF7Mf5O69Lw45QoKxDaZZwIo=,iv:UhU0z1KeuwFwA/EjBg17NDWBhmscPpwNYXIB7uNBnuw=,tag:hoIeSg3WKPHafYkPtVu4Rg==,type:str]
|
||||
services:
|
||||
hydra:
|
||||
gitea_token: ENC[AES256_GCM,data:ttzfqtxrVH3lyQHbrOP7cqaPGbbxo978W2FMtl8SZxFNGF0k3i/lcA==,iv:IlmryQoyU8LSOhM3yej9vt8tq8qSAASLnS9r7EJoXwI=,tag:4B0vYN0uMOpmAxjDuaw8Pw==,type:str]
|
||||
gitea_token: ENC[AES256_GCM,data:tpfYiDtbi1TnuJxzT5OQUJpoyYD9M4ahaqf+B5/i9sVs8z1kuQMQHQ==,iv:YJYOwYibHi2DNNvFLmMiphNHPhIVEIQOkpHkyvxQmOc=,tag:Ct89x5dwtwVLoVPNfy31yg==,type:str]
|
||||
security:
|
||||
restic:
|
||||
password: ENC[AES256_GCM,data:HLaaeITkzp+7LkD0EggKHpVJmzI=,iv:YsgJ8RiuVlZ0etnjD+un1H8qDI00jyctM5aBW6b/mow=,tag:H6+iOvbYRKtTrmuh7zmTWw==,type:str]
|
||||
password: ENC[AES256_GCM,data:ddKNt7QjKt90lV9A3SRi4t0bwL0=,iv:YTmQ0OZ+Ka3O7y15oFlcgDJEwwJKUoTfyRb4hBMbxGo=,tag:1cmjXZ0KKvJTWXohl8UFnA==,type:str]
|
||||
acme:
|
||||
dns: ENC[AES256_GCM,data:08qtPbnPmc8BYg8UoXCbNGRwLEc3uRq4kDgCaX2DgEaYpMInwAY/KQiQBpNfyeKhIU+5IlWp1nD5Nil27Ell7Gz8Gn7YjJoIU9QR55aLvH7kHA6H5ojfAk2bBzqr/BU6byti7jWvSsSz66GPzJU9YK+RfR6fxPTgB46wKmFBxJKG1Nvep4TXkeweTYkTLWvcLw1qE4E5UNtv36KbWsRXil0ZrLwQKdiAiLJltdRRRGASNXgBVKqBWUUM5+I0tTznfFvlOZh7a5m5sEyJYyD/OTpr4uRPzVHl4g==,iv:FjC4mjo+aK5gbPDWEWBkil6lnFHPCsn+5RnjqAF8NBU=,tag:/WdAnX8pP1HwwNyTN622qA==,type:str]
|
||||
dns2: ENC[AES256_GCM,data:TU5VOI4k3rhB4kSQRmcKxHK3oyLEKEYFyTkgwLEAVuiGme+fu0HMbGaomoGBWZa3ITU1WgyP0u2FuPrwfMBSqsxKpiIg+KlqGYQ27bKTOVFDQZbeCUE1wxdhp1n977x+4nRG8QSjWdRkQ2M8mD0CAwmhPoGWVgzU1DiW4I/efDEJ727oY1UwsRizZVG3XK8c8Z6Jec8iBMuTVAXNXRcrMG6QdsXunEUSiD3cPkGwRnyG45r3oToLynyM0/E8LjBMJX5GOjyJ9o+urkF0bgeKIJ1Ns9+C10s0kA==,iv:FDAGMzy+V6o4zSMgP8oUFzRCHiBGRCS8VdfOCoYu1vk=,tag:rC/1RXlPzvCYgQOFkUWyCQ==,type:str]
|
||||
cloudflare: ENC[AES256_GCM,data:4msfkxlL3QDvdroYQJdZv5BHukp/TRM7EFBszOdVkVA0T1V6gqQCibdIM794nSTAABKPODjYcKg71p2a9Q3aBg2n4JbN8ez1jPhlGEuWUN0aapIJ+F8yN9Dt4E1sb26c6BSAArYmd/WKBaEVF4OxMzYEbCcnjJJZ9zHoi02/EMyDjUosy4XyHxEqOa6ikKuJJF0ewUhL9zHWZ84xHE5JU4vKhegWWMQIH7k1W1tUAuNXb8uJHhWuQ6Q=,iv:2ksR8uPpHOMTagd1b/vuWAgstN0Badrta3cJFk60gTQ=,tag:uD7IA2hBKIX1wR6O2DL02g==,type:str]
|
||||
dns: ENC[AES256_GCM,data:VQsFxA1NKfAoQpeXbCRrQJRFuxi2sKpr8n6DU0scbBQToynumy/21tEpghPKWLP/kFLC1WXDos4Wy9THtjhh8KYpa9QjHxpzzY2XJQSVJKE5im6pCQJhromt5hoSoBa1yI+GYGEmA/k5L3FG/i3jjMgkDpnOLow6Kk0GkdkL0HljJKImvSviM6TLkhcbW3MfiW5W8xJh11KmWGFX7Yteu1gCVF5fUHRwT/XoM/ADfWJSkP/9NOXGcdC6NX55Z4YsG8ew7H62aJBV2JmNGOH9vMI4EV/++u6s9Q==,iv:Cw4PW4e94sLoVbj1xdxdilp4zR4qxzhKcn3b9VkmgEI=,tag:RNvpsUy/lKgquRzHe/ObCg==,type:str]
|
||||
dns2: ENC[AES256_GCM,data:cFqhvKMbgQa3VfCVdWi6CCEe6zJSIEKu/p7wCEmAIttw8RVRwFh+0EkwPPSUU9qGz2KjeNlLhU09uIiAR18W7rZVYIos86sumIsKDx17+m0Y4jTl65yNpbK9/bgl5Ki/KmYIkteJPlC0WA3urSmLLU+ta5hKrlaQz7rW/4k33oTgUFz0iIp4GZRU6Cuy3aJkibj0rsPlS3iTnRRSi6apvaD2IkwPVqQda82Ocq2ZXcMW7eU9/VyG8QvcFtaef4PY3YeRBz4c3laGBXfsmemm/nhYaZe0fzWRUA==,iv:AdshgaCZ2cYiRtT6DAM5IpQK0pnFSvMwmzObA96O3Vs=,tag:MOnmX74gcWT6N6HTL0p6ow==,type:str]
|
||||
cloudflare: ENC[AES256_GCM,data:H5gugcClNe1y1mSv10j4qjZUvYfoO5I9EXn52gaRdkh3OHu1gMivreGKbMLmpjQfqz6Fbp3po3hxw1BBvUs9Tfj+2sXj5YrOjEfr4awAhhsb+7McKVS3ok0vgCr4t/bfnSxlJYSOsLaBtGVzPt5yrlwylYa/z1SSmXBT1vY5bszF0i5f/Hg43TpvUqUnS2ckgLgGq1NewoI25oUYl/Iswen6Y0LK3tuyxWZgsE/wPPuxezjSOqvyZKQ=,iv:ouVcVX6aqiCGbAyYk5FMaUPN8X2DqWh6In3Rxh7p7ts=,tag:9iCG9rIhuuR+8Ry23FwL+g==,type:str]
|
||||
email:
|
||||
lotte@chir.rs: ENC[AES256_GCM,data:7XsLQMZex88Pdh25FI3GwUmjHA==,iv:e/YhtFBnLZBVfngnR3n2WS1c1FNlSN8grLzEpcRFW38=,tag:TQNx+tgtMyUcJZ3/bQOXtw==,type:str]
|
||||
mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:6+yoCDtAqlXX4fZLR73TyNKqXz6kKTwqK1JnKwTnoRJvjXjpCJ3zC8bHgIXfQFNPxaWQN85N21qSGp9ahbljKw==,iv:XtysXD6fL4XNVC7JNhH8eU3J8/x4uL8pSBQV5jQN4yE=,tag:VKZeLMnFNst69OWS97fjYg==,type:str]
|
||||
lotte@chir.rs: ENC[AES256_GCM,data:3hRtixj3vPxJ+DkEUVSGD1wiYg==,iv:RyfBwu2glu9jVXVJQdngySZEBu0lzsqeGzbrsCYmqEI=,tag:0vp7kQdIirlbKoLpiBpErA==,type:str]
|
||||
mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:nFFTbbTj9UhFe5MSEG0GgITqideEh51byYESVGQ59bbdi/lckVnP84zAU87EaDPWBx+5csep+k7eosMZQBiOlQ==,iv:bxDzRUZPop768+VvDIBwVOB4NR20QGmuxu9g1MT29OI=,tag:LPSOz4T4Hgf7FQhNaAs+Aw==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1zgxkntdp99dkvw7z29jjmgrzlla2ha542zrs3262dwat27a34asqckfkrl
|
||||
- recipient: age1n7c6dp8xn3vl63l8qevun24v3mtggkve0svsrs2lsg992m99jgwq84aw45
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjdkdOSmEwc0FwTXduTTR0
|
||||
LzY4L014Vmd2ZlNZQ3dxREFTajk0L1V4MnlvCksxRkNBSzNvVjJkd0ZqQ1pQdFVL
|
||||
ZmV6eVZucnVWYTBtcVN1RXNTVVViUkUKLS0tIDhpZ3d0Zjl3MFRRVFI2cnp4RVpK
|
||||
VW5LZnh5QnNwTHdVTEM4L0FRS2cwNUkKKCs+yd3J6hSRCjv9OwefPhSLS48vPAla
|
||||
DbzaS7ec6uAgW1tvw/AucDv+w38EqpBHPD/FxwbxJPadRw5JtxCx8w==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhT1BCa2hnbnZ0VEVIalJN
|
||||
TFFxd2Z5UHd4aFZxd3pxUjBGczBHdHJJV2dVClNyTTdiTTBxSmRYRHdQeW5uVi9l
|
||||
N2VFam04cTEyc0hhL3M1TGVQR0xmaGMKLS0tIEFZMlJEMk9xekVOTDROU01rT2xi
|
||||
dkZHa1pGNmNDU3U4SFRQNTZPZ21HeUEKdqTjc9KfD38zrMi/FDq+ipBWjdHM9zwY
|
||||
15E2yPPb1lTATP4nxoC67u/8yyauFEJiQsJQa4VVlOahrNjciVMY4Q==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2022-03-12T12:40:46Z"
|
||||
mac: ENC[AES256_GCM,data:473D15Z4bq3w8o/fgPp3PowjrHDGC65s0hhrFKmORS3GUv+7mGUQLAuRwmjmUSi3gFIn2/9c3XUyebHLu+gNY6JpXpjTc4Kj67JfZn3tFev6xJ88CdrgaJV1O0W94ZgX4szaB24FZnh76hOsgfeYICm0VaT41rS76sSTIldAfN4=,iv:hIcRArnKmYAVm+DcQnGw1vl1OuqUiw8wSZLn3YJCFSU=,tag:YJeZ2VI3VhkLkzjqCXw3Lg==,type:str]
|
||||
lastmodified: "2022-03-26T12:25:41Z"
|
||||
mac: ENC[AES256_GCM,data:yuYdX1S2kzO+kjchLuTAkwOxd/sy91SUV8X4dVaubXKKx2ClZoO6RaevKX4nuSUwnkf6gIDACu7VFeeOzo/l48RvP1t4bQIf0ei9VVVTibWKAqB9yWZnHXYPFQFLYyV/0x+nAXMf7j/LpQgQ8kxrydmhA3pSGO03Ndm2sBswwSg=,iv:AG0EmG+umszdh1crdvv3nkvy493mnXLCseojdzPoxds=,tag:w558TQukzCUApFkHmeFqyA==,type:str]
|
||||
pgp:
|
||||
- created_at: "2022-02-02T17:49:32Z"
|
||||
- created_at: "2022-03-26T12:25:40Z"
|
||||
enc: |
|
||||
-----BEGIN PGP MESSAGE-----
|
||||
|
||||
hF4DAAAAAAAAAAASAQdAogEX3IxfgWX5CZ6O9SesBrNzU3v4E3CP0KSTGweNFygw
|
||||
aR4ElXwbrECJ7mbC/ZhCa3eqgd6JONt0GIjEUp9kwdfmuw4qP+eKdEgj/B8Re+qf
|
||||
0l4BXk4TcZzxpATYqfNxSJjAe2ZMhbT58leLwiuV+mL+Q6LWZRsSK/423kynnwGW
|
||||
hDh3g5pTDVyFSiZOOF/uWwW6fbP7Qy/s+M5AdemxU3gQZe86WQGQ4IWnXiPMzVxS
|
||||
=SPlO
|
||||
hF4DAAAAAAAAAAASAQdAZqm0Z5ICOFn3mB8gOq0P/tUbUXYbdBsaK+HaugVX/Fgw
|
||||
tmNxcago0RFIpcKj/qPutSfYlM4J4j/tfL/Pwmaazn3HFveKAYq3WIEMGGWDLsOe
|
||||
0l4BPca19jP+nSMw5f8CLgucx0Kj2ONY8vzZpiHiEn0qdRN5oJFfyG5dervCeZiF
|
||||
vsKV6PR5VdnDaBhHsGckddcKxJEP3+ITy8DVVMaTM/AX+VPTBCUBU7l7KCf/VbZX
|
||||
=t2DM
|
||||
-----END PGP MESSAGE-----
|
||||
fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.7.1
|
||||
version: 3.7.2
|
||||
|
|
|
|||
Loading…
Reference in a new issue