switch thinkrac back to zfs
This commit is contained in:
parent
9f018b5ec8
commit
4b9ffd8017
GPG key ID:
AB2BD8DAF2E37122
4 changed files with 94 additions and 28 deletions
|
|
@ -2,7 +2,7 @@ keys:
|
|||
- &lotte 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
|
||||
- &nixos-8gb-fsn1-1 age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
|
||||
- &nutty-noon age1wfftrnyngg7nxcwvt7m590fwx3w7p4kkrjn9uprjq0u3k3ym4s3qqzkmzm
|
||||
- &thinkrac age1e7tqq7ezjtwsunt6plvstevg32p97cmqpejpj20gmrkfe0l7gv9se08zf7
|
||||
- &thinkrac age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
|
||||
creation_rules:
|
||||
- path_regex: secrets/nixos-8gb-fsn1-1\.yaml$
|
||||
key_groups:
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
{
|
||||
name = "better-cpp-syntax";
|
||||
publisher = "jeff-hykin";
|
||||
version = "1.15.3";
|
||||
version = "1.15.13";
|
||||
sha256 = "sha256-ugn7nERz/IZ37mD/WWOWHcaB7nMLkeN+cCTCGCUHpOo=";
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,13 @@
|
|||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
boot.supportedFilesystems = [ "bcachefs" ];
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.devNodes = "/dev/";
|
||||
|
||||
services.zfs.trim.enable = true;
|
||||
services.zfs.autoScrub.enable = true;
|
||||
services.zfs.autoScrub.pools = [ "tank" ];
|
||||
|
||||
|
||||
boot.initrd.luks.devices = {
|
||||
disk = {
|
||||
|
|
@ -28,15 +34,75 @@
|
|||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/mapper/disk";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
device = "tank/nixos";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "tank/nixos/nix";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/etc" = {
|
||||
device = "tank/nixos/etc";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var" = {
|
||||
device = "tank/nixos/var";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/lib" = {
|
||||
device = "tank/nixos/var/lib";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" = {
|
||||
device = "tank/nixos/var/log";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/spool" = {
|
||||
device = "tank/nixos/var/spool";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "tank/userdata/home";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/root" = {
|
||||
device = "tank/userdata/root";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/home/darkkirb" = {
|
||||
device = "tank/userdata/home/darkkirb";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/build" = {
|
||||
device = "tank/build";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/EE61-E55F";
|
||||
fsType = "vfat";
|
||||
};
|
||||
device = "/dev/disk/by-uuid/EE61-E55F";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
networking.interfaces.enp0s31f6.useDHCP = true;
|
||||
system.stateVersion = "21.11";
|
||||
|
|
|
|||
|
|
@ -1,40 +1,40 @@
|
|||
network:
|
||||
wireguard:
|
||||
privkey: ENC[AES256_GCM,data:kOLxOtrgm/nqF7cgPr/zvC6eoKxyE/Az0A+oKVJLR/q/+cFT2zAnPRbH5Sw=,iv:WS9dcjvL7+7iCFXzRXI5SkJvGG5QGrwytX2WuF69hWY=,tag:g3TbRMwI1Y3EILP+JJQsnQ==,type:str]
|
||||
privkey: ENC[AES256_GCM,data:A/yMLqnSLVI4ApewHOdsctmGA0MoF6GBf/BFkhRAHnTHn+qLop206YKQzj4=,iv:JiYJ4D7J4Xh6t0vznJgYs79u5kd2CxjOyyJLw9GPHdE=,tag:TGxYZeEzTeRbfeNMHXw5DQ==,type:str]
|
||||
security:
|
||||
restic:
|
||||
password: ENC[AES256_GCM,data:mfcqwB6SXObhVM/58RN0pDGGjec=,iv:xTKeWiDBv4y8AuKoNVI8bharQQyCgcYNbipNhKPXg2A=,tag:vtiOUgVX1raA1EqJOSFX0A==,type:str]
|
||||
password: ENC[AES256_GCM,data:ojN22sxRaaSjBJaLOf6S0frOrRY=,iv:ZIssZTxvyBU3WZmuhJ/kb5M72BNFDpOV5Hdxc2D5BCM=,tag:B1u1NJQr6gLCRjvfqGDjsw==,type:str]
|
||||
email:
|
||||
lotte@chir.rs: ENC[AES256_GCM,data:pzPsPcjWawGkBwgKfj0EQOq38g==,iv:mjK4ML6OS1S+sPCEr73KtpFaibUgRdBnr2PJnRsrECc=,tag:CCcCts6sqzoNLQhac7JM2Q==,type:str]
|
||||
mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:sWi6EFI+ayLzdA85ouJUECZaDOFESG4LWm4f1494MmKdYYushm2zDu8JzgRneyi0x77kPGdq1WLzQuiYXGwjbg==,iv:YghBY2PtHPP0EOM0Pz4gK41X3GTMo5fLdsyk0Z984ZI=,tag:nrD+KYD3WFt7BTFFO0+D2g==,type:str]
|
||||
lotte@chir.rs: ENC[AES256_GCM,data:MywN+Etfri4TQQ8M01+RS4sLCA==,iv:s4hW8oGPs7PwdtiBlkuRmAJPjHjBonHWdNTrtA+aJLQ=,tag:3Xp2kHMgtRDmItpa+fJ0Fw==,type:str]
|
||||
mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:iLQwJoW4sRF35M3dEIxKrqsAsJND0wVlfue9uGfZgr+filTkmfNsnzamg7eBfacURuJrHmGDXCMcjuH15GwONA==,iv:5zAeYL2YS4J38TXl0t1mLDxjAPdf4IpGogEuzYd+xJM=,tag:FMKvuq69uZrv1nUI/2erYg==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1e7tqq7ezjtwsunt6plvstevg32p97cmqpejpj20gmrkfe0l7gv9se08zf7
|
||||
- recipient: age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBielAyUlNIQVMvbk1QYlVW
|
||||
d2lDL28wcE9wYXlZRmhGUXNkRktFTXNaRWljCjhUS01PUFR0WGVxSmhhVi9zSW5Y
|
||||
c2pZWXdmYllVdUlhSWhWV3VVVmNDR00KLS0tIFZyTDZ5Z1kzMS95cVN6MFZJZVdr
|
||||
K202bTd4ZWVRdGU5MnlUZ1lWMzJSRWcKezCUzdpd2ooQdfC7MaL2A4gThU2cPdNY
|
||||
erdUEVNUZ8DnVXFx2WqrbR6nXduWxOxehLr0i80g6cwlwicpyJK7YA==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwRzNyWFc5dmVuTGxmWEJL
|
||||
RUJsKy91bmliZDV2M1V3U05ZU29lcks0VlNvCmI3R1lxZTRFdDZiNXNna0I3OXRt
|
||||
R3VWWktKaUs4K2o1RE9FbFlablpNcW8KLS0tIEJGMml4VGl5WFJoa1VnbVBDeWVr
|
||||
aHAxNitXREU0ZkZNUmorSFY2c3JPU0UK2rnyV/tDnn8nWYodDe7sgVdjfg14slBO
|
||||
DV5oMPB91c5IZ0S1/Sv1oAUcri/dKHKDljxP7HU5yG5kxVeEzqx4Jw==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2022-03-25T11:05:16Z"
|
||||
mac: ENC[AES256_GCM,data:T3o28jRiIepB8MzB+96OGDR0nCBvGv9dzV8/tZPO3ITcLGgojPDtwf01pvu9NCE1ycfw3OUcI77KseUNhbWTKkxNW1fNBglhZ8japm0GMMWpt1PqT4rpEHV21R2JRn8VzyMk/F4VYELBdTApZdhh2AU+crbhv0FfB7Cqq81+CIA=,iv:7MNcM+PYHpncPyU6QU/lclOZY1mWzLgrg04Y/AOHuek=,tag:gx81Sx109PL/8DG9hrydPg==,type:str]
|
||||
lastmodified: "2022-04-13T06:20:10Z"
|
||||
mac: ENC[AES256_GCM,data:dBGn5AHOhr2E+cJIArFIl8qSmtXDzU/2g+05twszjVhvtc0Z+182LYshgm9jPbBY94n2b8V3W+T3OsBfpQo+SkIedqbe5xfG/eqN5ltHHb1Ypa5HeTdpdkYbtL39RicGOuQPsBuyZOga1+q+yYrburPIbuKFmq/mMxPI/qv/Lfw=,iv:mKXN0k3YgiayBe8GFwkrzF4gWPdOKHO7bFhVBsHDggc=,tag:HDb7P4e5eIvqzWbdrrhbgQ==,type:str]
|
||||
pgp:
|
||||
- created_at: "2022-03-25T11:05:16Z"
|
||||
- created_at: "2022-04-13T06:20:10Z"
|
||||
enc: |
|
||||
-----BEGIN PGP MESSAGE-----
|
||||
|
||||
hF4DAAAAAAAAAAASAQdAm3Im0SSazjs6gJIh2KUI+r9FG+rjqU5O6BefHGOGh3gw
|
||||
bYrXYQZwEKeaDcO22cRrx/T8tcP2B0g/EzycJFhbUgKbB8QPAmQuwfmqSnZH7J2Z
|
||||
0lwBlwaSYO+kJlWW8i5abOZonNBvAwuFiWqznfYu3uOmTqj6CGu7s3wGONUen7Cf
|
||||
hf1+buVQBRcD3oNEuUl6s0V4xy9qxPNHmm/2Vl+XwfauoujkAQY9xCAhFPqbUA==
|
||||
=L6SY
|
||||
hF4DAAAAAAAAAAASAQdAVWYdBZxIscpX4L82Pomx0cTZWbLwBQhaFGxIlaBaB30w
|
||||
Zq7L8lWuuZfn3hjWKhpyRTLL9UgFafzTdbLfhQS5+s/QqS7WnOlNmIJnAIOYzQTq
|
||||
0lwBWwAtSgPlTvJOZetgRyBQja1ru6YNB9c5eEHb5xxWZCYSh1vss5OU4LsX7Mlr
|
||||
KGyF4E3xPYrRb34VAgPeL/6FziKRm19MmVq8HCod1ombUYDMI6Gvw2HJXIPwTQ==
|
||||
=jdZc
|
||||
-----END PGP MESSAGE-----
|
||||
fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.7.1
|
||||
version: 3.7.2
|
||||
|
|
|
|||
Loading…
Reference in a new issue