Merge branch 'nixos-23.11'

This commit is contained in:
Felix Buehler 2023-11-29 22:38:57 +01:00
commit ad523b3a88
15 changed files with 128 additions and 143 deletions

View file

@ -19,7 +19,7 @@
};
system = {
stateVersion = "23.05";
stateVersion = "23.11";
autoUpgrade.enable = true;
};
}

View file

@ -1,6 +1,6 @@
users:
felix:
password: ENC[AES256_GCM,data:mrG5gb0wbjA2S0sd,iv:86PZWbVR2BkB6+c9KrtnFh1j/kJtiFJXlXEQMFqEmZA=,tag:WUXrp4+/KW+X+wUp0omqdg==,type:str]
password: ENC[AES256_GCM,data:nmGfgkhZrR+fUlsAJ55rxoRQbMbcGW31phFnCjvC5iI7bgkgH+ppo1ZFBsneCQoOp6TwScxDqyUIjUPY0bz5/iwIQy7+7Y/g+A==,iv:i7r7BVDV3MuIxndUrduRLZvSqvS50wdzSYLPWRZWRL0=,tag:nhWPG8TSvKntLdtrex1aZQ==,type:str]
wifi:
bismarck: ENC[AES256_GCM,data:6mcU+o6GiBelKq5Av2hJdHigf+yyQRO/qXV0DbGeri00CaO1cjjGka86C/t0NAoh8EaJeLPd6lZQspeUTIdqJMleQLhmq1zk1qGw65fvEphCsWkKUsUd6flWODdmll80mmYLpllX6hmZ8I/Of7EVZPn4WEiw4M2HB1UCw5+M0W2H0MJrjlskafbL9+uYtMeoUikXVMTYNAkX3+9+MZi3KzDMEc6JVt1fQZHjXkdeKx+2iVsaXEtXL72Dbj3ihlpA+WRhgZOmrrbablYde71mpzSuQ/yqeTZT+2NCMUmkYaj0dGz4FW0gJMPzjHjji8CopeOK7/CQM/MMWGFJXR2Xdea8X/YdDoVAz34WraGylYzK9e7a1C+s37mekt6c/bvuiQ==,iv:DH0LDw1pZ5m9RScJ3+IhjUb5JroLLOJ3jru7DwCKXv0=,tag:r57fz+W2nEybNqOc8eEDFA==,type:str]
borgbackup:
@ -48,8 +48,8 @@ sops:
a1BjcjVaM01UV0o5bTFTVTE5QUZKMmsKPAGYDf1FVtp4+Z/KUrI6z0aZYEwN1DYa
jKtA1IUXrmdaRllN0SfC+YjMXTk7IoJvrjagCv9Zo0zEKasfO8PL4g==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-07-25T19:49:06Z"
mac: ENC[AES256_GCM,data:YJDe8T2DljJZX80Q5dMgh5nn+oNO5f9lU8KxbjtfMdXsu5aFCB/IykSMXLO9Yji4QeUMdiTsmAhDl+xWonK7BjDorNF7Culq3zo/g36WkAekGFlgp4i0lnHf182noX46sApwFDj9gRx+Ozhn/BsoVADhNkOfP91XJH09UOLyHxM=,iv:qWnS2m9ifuLKdX2+7b053/OHNgIjb9GK7EIft00Qu7E=,tag:XAtQdRP5pEP3xYoGLqbnNA==,type:str]
lastmodified: "2023-11-13T22:36:19Z"
mac: ENC[AES256_GCM,data:jmclk98sHpnrO4Nj/ZiG+3gVmG6UvoClZR/FPYFgaBpJBk/W1zXXuH+wAb+dh3M5H3x030QFbNj/3006JZIlBCkarRggvJ1vQvC8XKlIFyTnGeY+1gXER/ssj22y/0RkF2HpOr68Sg51edcL5hiHtfAokxMuiouUkdRxV3KK3lY=,iv:FAdXDOw1r718fogIfFyzYplyFp/kmL9VHvO+RFyMPuM=,tag:HlZPTyZpmrvzT6pCgWLW9Q==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
version: 3.8.1

View file

@ -18,66 +18,66 @@
openDefaultPorts = true;
key = config.sops.secrets."syncthing/key".path;
cert = config.sops.secrets."syncthing/cert".path;
extraOptions = {
settings = {
options = {
urAccepted = 3;
};
};
devices = {
"thinkman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
devices = {
"thinkman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
};
"birdman" = {
id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
};
"newton" = {
id = "5RISLVO-U5A5A7N-5BRYF2X-FTPNAI6-LOQDIMP-MVSM663-6W6VYBL-L7626A6";
};
};
"birdman" = {
id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
};
"newton" = {
id = "5RISLVO-U5A5A7N-5BRYF2X-FTPNAI6-LOQDIMP-MVSM663-6W6VYBL-L7626A6";
};
};
folders = {
"Computer" = {
id = "djdxo-1akub";
path = "/data/computer";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Phone" = {
id = "4hds7-gpypp";
path = "/data/phone";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Music" = {
id = "mphdq-n6q7y";
path = "/data/music";
watch = false;
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Pictures" = {
id = "cujyo-yiabu";
path = "/data/photos";
watch = false;
devices = [
"thinkman"
"newton"
];
};
"Aria2" = {
id = "jjnzq-pgzua";
path = "/data/tmp/aria2";
devices = [
"thinkman"
];
folders = {
"Computer" = {
id = "djdxo-1akub";
path = "/data/computer";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Phone" = {
id = "4hds7-gpypp";
path = "/data/phone";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Music" = {
id = "mphdq-n6q7y";
path = "/data/music";
fsWatcherEnabled = false;
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Pictures" = {
id = "cujyo-yiabu";
path = "/data/photos";
fsWatcherEnabled = false;
devices = [
"thinkman"
"newton"
];
};
"Aria2" = {
id = "jjnzq-pgzua";
path = "/data/tmp/aria2";
devices = [
"thinkman"
];
};
};
};
};