Compare commits
No commits in common. "bdeb5584defc07cc483397ccb69d768a942e879b" and "e58a47af3f383f6358309f80aae39b9a8ad86e77" have entirely different histories.
bdeb5584de
...
e58a47af3f
7 changed files with 27 additions and 52 deletions
|
@ -39,14 +39,6 @@ in
|
||||||
path = "${cfg.path}/gorgon";
|
path = "${cfg.path}/gorgon";
|
||||||
quota = "1T";
|
quota = "1T";
|
||||||
};
|
};
|
||||||
"stolas" = {
|
|
||||||
allowSubRepos = false;
|
|
||||||
authorizedKeysAppendOnly = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINC/mVYd3o7oA0dsA58CgkqR40CSfeuU+rikleSrSXFz dadada@gorgon"
|
|
||||||
];
|
|
||||||
path = "${cfg.path}/stolas";
|
|
||||||
quota = "1T";
|
|
||||||
};
|
|
||||||
"surgat" = {
|
"surgat" = {
|
||||||
allowSubRepos = false;
|
allowSubRepos = false;
|
||||||
authorizedKeysAppendOnly = [
|
authorizedKeysAppendOnly = [
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
../modules/profiles/laptop.nix
|
../modules/profiles/laptop.nix
|
||||||
./disks.nix
|
./disks.nix
|
||||||
# TODO ./paperless.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
@ -33,7 +32,7 @@
|
||||||
luks.devices = {
|
luks.devices = {
|
||||||
root = {
|
root = {
|
||||||
# TODO
|
# TODO
|
||||||
device = "/dev/disk/by-uuid/TODO";
|
device = "/dev/disk/by-uuid/todo";
|
||||||
allowDiscards = true;
|
allowDiscards = true;
|
||||||
# TODO lanzaboote + TPM2 unlock with PIN https://www.freedesktop.org/software/systemd/man/251/systemd-cryptenroll.html#--tpm2-with-pin=BOOL
|
# TODO lanzaboote + TPM2 unlock with PIN https://www.freedesktop.org/software/systemd/man/251/systemd-cryptenroll.html#--tpm2-with-pin=BOOL
|
||||||
#crypttabExtraOpts = [ "fido2-device=auto" ];
|
#crypttabExtraOpts = [ "fido2-device=auto" ];
|
||||||
|
@ -86,11 +85,13 @@
|
||||||
settings.max-jobs = lib.mkDefault 16;
|
settings.max-jobs = lib.mkDefault 16;
|
||||||
};
|
};
|
||||||
|
|
||||||
dadada.backupClient.backup1.enable = true;
|
# TODO dadada.backupClient.backup1.enable = true;
|
||||||
dadada.backupClient.backup2 = {
|
# dadada.backupClient.backup2 = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
repo = "u355513-sub5@u355513-sub5.your-storagebox.de:/home/backup";
|
# passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase".path;
|
||||||
};
|
# sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key".path;
|
||||||
|
# repo = "u355513-subX@u355513-subX.your-storagebox.de:/home/backup";
|
||||||
|
# };
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
adb.enable = true;
|
adb.enable = true;
|
||||||
|
@ -116,6 +117,11 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
browsing = true;
|
browsing = true;
|
||||||
};
|
};
|
||||||
|
paperless = {
|
||||||
|
# TODO migrate DB
|
||||||
|
enable = true;
|
||||||
|
passwordFile = config.age.secrets.paperless.path;
|
||||||
|
};
|
||||||
tlp.enable = false;
|
tlp.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -123,6 +129,19 @@
|
||||||
stateVersion = "25.05";
|
stateVersion = "25.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.tmpfiles.rules =
|
||||||
|
let
|
||||||
|
cfg = config.services.paperless;
|
||||||
|
in
|
||||||
|
[
|
||||||
|
(
|
||||||
|
if cfg.consumptionDirIsPublic then
|
||||||
|
"d '${cfg.consumptionDir}' 777 - - - -"
|
||||||
|
else
|
||||||
|
"d '${cfg.consumptionDir}' 770 ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
|
||||||
|
)
|
||||||
|
];
|
||||||
|
|
||||||
systemd.services = {
|
systemd.services = {
|
||||||
modem-manager.enable = lib.mkForce false;
|
modem-manager.enable = lib.mkForce false;
|
||||||
"dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false;
|
"dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false;
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
mountOptions = [ "umask=0077" ];
|
mountOptions = [ "umask=0077" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
# TODO tmpfs for nix/var/nix/builds
|
||||||
luks = {
|
luks = {
|
||||||
size = "100%";
|
size = "100%";
|
||||||
content = {
|
content = {
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
{ config }:
|
|
||||||
{
|
|
||||||
services.paperless = {
|
|
||||||
# TODO migrate DB
|
|
||||||
enable = true;
|
|
||||||
passwordFile = config.age.secrets.paperless.path;
|
|
||||||
};
|
|
||||||
systemd.tmpfiles.rules =
|
|
||||||
let
|
|
||||||
cfg = config.services.paperless;
|
|
||||||
in
|
|
||||||
[
|
|
||||||
(
|
|
||||||
if cfg.consumptionDirIsPublic then
|
|
||||||
"d '${cfg.consumptionDir}' 777 - - - -"
|
|
||||||
else
|
|
||||||
"d '${cfg.consumptionDir}' 770 ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
|
|
||||||
)
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -7,7 +7,6 @@ let
|
||||||
ninurta = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8TDCzjVVO7A4k6rp+srMj0HHc5gmUOlskTBOvhMkEc root@nixos";
|
ninurta = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8TDCzjVVO7A4k6rp+srMj0HHc5gmUOlskTBOvhMkEc root@nixos";
|
||||||
pruflas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBqZHu5ygTODgrNzcU9C2O+b8yCfVsnztV83qxXV4aA8 root@pruflas";
|
pruflas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBqZHu5ygTODgrNzcU9C2O+b8yCfVsnztV83qxXV4aA8 root@pruflas";
|
||||||
surgat = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOJ9UgAle5sX0pAawfRztckVwaQm2U8o0Bawv7cZfXE root@surgat";
|
surgat = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOJ9UgAle5sX0pAawfRztckVwaQm2U8o0Bawv7cZfXE root@surgat";
|
||||||
stolas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV1LSH8jeMnXJ/eqhJCebbwxenJmxNoeB6UGrBmRjZk root@stolas";
|
|
||||||
};
|
};
|
||||||
backupSecrets = hostName: {
|
backupSecrets = hostName: {
|
||||||
"${hostName}-backup-passphrase.age".publicKeys = [
|
"${hostName}-backup-passphrase.age".publicKeys = [
|
||||||
|
@ -89,4 +88,3 @@ in
|
||||||
// backupSecrets "pruflas"
|
// backupSecrets "pruflas"
|
||||||
// backupSecrets "surgat"
|
// backupSecrets "surgat"
|
||||||
// backupSecrets "agares"
|
// backupSecrets "agares"
|
||||||
// backupSecrets "stolas"
|
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
age-encryption.org/v1
|
|
||||||
-> ssh-ed25519 OgKXZA A8XAP2YQw/CnN//rHPM9m9p1A/l4IiWV1Qhc9+RHdxQ
|
|
||||||
mcpcULPCQUMtoCiTwiAU2AXD5UVrQkF5LxZqCJ3VEMA
|
|
||||||
-> ssh-ed25519 Otklkw UzdSM3CCvzQ4owHWWmrBfiC6NuBAu0onns6s4nlR9Vs
|
|
||||||
UQ4TBW/4O5rVi0xpS2lAS6M7zgUcWtGlXeL+i748KYE
|
|
||||||
--- tqrtKyZVDght0KJQZDSDVdnEL38KZjPA2xZ3LjeKlI0
|
|
||||||
ø2Šl£C@‘þô (<28>ãŽNë3‘-igÁaH?ÿ~üF‚‰ýnòÔqÁ¸·ÇcñÉ<C3B1>œçî<ûÛ¼ñ#Fš7ÔaB%®–Ž&t·}¢vr_<î
|
|
|
@ -1,8 +0,0 @@
|
||||||
age-encryption.org/v1
|
|
||||||
-> ssh-ed25519 OgKXZA gTx4Ozd2BU13T8GpiBxSCZdjAwJ/zb10xqW62QMTwms
|
|
||||||
M9y1f/ndVYnujqIDo0rocQEX/8Isg0vn97mQm8K83iE
|
|
||||||
-> ssh-ed25519 Otklkw 2hyKMpf/Z8wgBowMgxwb77cj9B5b0/a7q4hq3CxWp0M
|
|
||||||
jFLwfV72isKUdtr5m2n5303KZiJDKTJny9koUOHLLLg
|
|
||||||
--- GQfIExiJTJEQTnesTVqF3X7AcorV+SH8TQ9uo5xLwso
|
|
||||||
u`6^—ü |<7C>Ÿ&êµQ¢[KPF»ÏA†Æ‡ÑˆU*nŸ55†¶O–Øz›v…傺-C“0’Êr;6ÅJ¸‚²œC={<7B>'÷¼@Ôº9öO'b“½Æô#¬Rw-³õÔ(ØŠ<C398>RäjFÞ[=€ƒuD·3¨¸×vÚ<76>5bW¸xi†zï<>Í¢Å={þS; rÖù.ìÎO´ê´è2ÊÖ|˜É«¯ÉjÞtOrñº‰põžþK2à97˜æœÓY/ñŸÈèé?â8¼³‚&·øpÃÕP<C395>:g‡Çÿ<ÓÎh¡Þ*iKùRÚ¨¼É«ÛÏS<C38F>"Aíˆ+÷
+&%ð×9^„QRŠÍÿ]˜„âsô'–ðD•D‘•ŠB¦ž§·Å^¤›¡ÉÓí;<02>~ÈÎæO[
|
|
||||||
ÇÚˆ'[õ¨Ž®œú'kª'îb ßíO_Bž %z”#Åê{ÂÇ6LD«ò<C2AB>Û8é' ÔÖ³ê‘^ð<>õ2Y™BL©<02>ZWsó!¿ÓHi±³Xâ–³·¨”rÙížZ!ª\•”…jéÙ€Q€ÿÄ‚îÓ<>
|
|
Loading…
Add table
Add a link
Reference in a new issue