Fix disko swap for cert-store
This commit is contained in:
parent
e30c7efef6
commit
26eb1164d1
12 changed files with 70 additions and 21 deletions
|
@ -2,7 +2,7 @@ keys:
|
||||||
- &vili-bw age1pvkuvcc38pke3euzsjzpgp6s6v3jykug2e69rplytdy7gxntm5jsraxhvp
|
- &vili-bw age1pvkuvcc38pke3euzsjzpgp6s6v3jykug2e69rplytdy7gxntm5jsraxhvp
|
||||||
- &helium age1xp02dggk2e6csvxg2q5nfts4tjhd05vthrcvvk2l67m3tgs3vugqshg24q
|
- &helium age1xp02dggk2e6csvxg2q5nfts4tjhd05vthrcvvk2l67m3tgs3vugqshg24q
|
||||||
- &lithium age1yrfr0q72nqa842t0mzckeemfww28qzcd3wqmrd8mvzwvgpzssvlq9ruzlk
|
- &lithium age1yrfr0q72nqa842t0mzckeemfww28qzcd3wqmrd8mvzwvgpzssvlq9ruzlk
|
||||||
- &cert-store age1z66g62uxyhjvs44hu34zu7e8nx2r3ry7mrdeacx85g9jjhw9nquqy9esn7
|
- &cert-store age1hy7uunj0lnjv6uyqf7s5t5dnc8e0u48x30jva05sxykqtplqe44sf4acxc
|
||||||
- &cert-store-age age1cws8uzhg9qyxpjnw9w0mvalvqu3ttnnrn5r3eeczk4wcj86vnqgslzmzjp
|
- &cert-store-age age1cws8uzhg9qyxpjnw9w0mvalvqu3ttnnrn5r3eeczk4wcj86vnqgslzmzjp
|
||||||
- &ci age18k4drn9kuhu5qk8cqfd390nv9r0pq0qql6s76hkhzefxskwnscxsqm78q4
|
- &ci age18k4drn9kuhu5qk8cqfd390nv9r0pq0qql6s76hkhzefxskwnscxsqm78q4
|
||||||
- &forgejo age1mfvue6vjj445dtly39k5vlcnhpfdf0ujumm6v8degk2lvaa9avcsl2eeg7
|
- &forgejo age1mfvue6vjj445dtly39k5vlcnhpfdf0ujumm6v8degk2lvaa9avcsl2eeg7
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ lib, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
environment.persistence."/persist".enable = true;
|
environment.persistence."/persist".enable = true;
|
||||||
swapDevices = lib.mkForce [ ];
|
|
||||||
imports = [
|
imports = [
|
||||||
../../shared/base.nix
|
../../shared/base.nix
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 2 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../../shared/base.nix
|
../../shared/base.nix
|
||||||
../../shared/hardware/vm.nix
|
../../shared/hardware/vm.nix
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 2 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../../shared/base.nix
|
../../shared/base.nix
|
||||||
../../shared/hardware/vm.nix
|
../../shared/hardware/vm.nix
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 2 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../../shared/base.nix
|
../../shared/base.nix
|
||||||
../../shared/hardware/nvidia.nix
|
../../shared/hardware/nvidia.nix
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 2 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
custom.nextcloud_domain = "idacloud.sinerva.eu";
|
custom.nextcloud_domain = "idacloud.sinerva.eu";
|
||||||
services.nextcloud.settings.trusted_domains = [ "idacloud.vsinerva.fi" ];
|
services.nextcloud.settings.trusted_domains = [ "idacloud.vsinerva.fi" ];
|
||||||
custom.collabora_domain = "idacollab.sinerva.eu";
|
custom.collabora_domain = "idacollab.sinerva.eu";
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 2 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
custom.nextcloud_domain = "nextcloud.vsinerva.fi";
|
custom.nextcloud_domain = "nextcloud.vsinerva.fi";
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 2 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../../shared/base.nix
|
../../shared/base.nix
|
||||||
../../shared/hardware/vm.nix
|
../../shared/hardware/vm.nix
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 2 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../../shared/base.nix
|
../../shared/base.nix
|
||||||
../../shared/hardware/vm.nix
|
../../shared/hardware/vm.nix
|
||||||
|
|
|
@ -5,20 +5,20 @@ sops:
|
||||||
- recipient: age1pvkuvcc38pke3euzsjzpgp6s6v3jykug2e69rplytdy7gxntm5jsraxhvp
|
- recipient: age1pvkuvcc38pke3euzsjzpgp6s6v3jykug2e69rplytdy7gxntm5jsraxhvp
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKczdMTHNtaDdCVG5XNWV3
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4RDIvZVNibVRQV24zNm9V
|
||||||
SGhoYTRyNnh3TUJKYmhvTlh3dlU4SThjRmwwCjE0a1ltMEJ1UjdTaUhGVHc5cHhn
|
a1Q5SU5UakZ4eDA2RWQxbXduZ3JsMHUyNlhBCkYyUmpON0htZ3RyNWJXYUVHMWpv
|
||||||
V1NZWko2Mm4wWnRmdFZ3TVdSNGVjd0kKLS0tIGhXN0NvKzFiS3llN3QwYjRCNU85
|
NUd5ZVZmMzFMQk5PR3gzbEowUmV2Q1kKLS0tIEJIUDkraERVcG9SMWFUblhXam42
|
||||||
enVpUDZhNEd4OCsySDZnSmIrRGlNaW8KTDI/B+JR5FO3h1kjEzC7PGn0WCsFKO6F
|
SHlycUJvd0RNNDNBY3REc2VhN0RpNlkKij54wD3j8yDeurHOTL9IwnkXiCqJMePK
|
||||||
Efgr1f5PdyaNZOGgnWm1GarH9WeFSPX57q+p+z6xU+DU7xv72oH6Uw==
|
PVxSF1VLLEUSiPaZpXKhUD4ghz/YwjBDsbVORh1btpol2LKq63ChUw==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
- recipient: age1z66g62uxyhjvs44hu34zu7e8nx2r3ry7mrdeacx85g9jjhw9nquqy9esn7
|
- recipient: age1hy7uunj0lnjv6uyqf7s5t5dnc8e0u48x30jva05sxykqtplqe44sf4acxc
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5MFcyWU1FTTBHa2YxeGVZ
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZcFVNTGhBcDhEZW9DVHFW
|
||||||
NG93RVFCUVNpNWJQVVp5QXpUbzl0cFV5SDFRCjFiQjcrN0JkRTVNSFRtelVqa3g1
|
Y3hhSWo4V3JKbmFnelZZUnFWcGNQM29rS2lFClBLUlArUGcxb2kvR3dEaVJoR0pS
|
||||||
bnE2QldHeHV6Mm1UR01EcG16MXZzaVkKLS0tIDF5QkVhVVNIbllHSExXRVYzSW0y
|
cWpvME10M01BNENXQWtjcWdPYU5PVEUKLS0tIDYrUTAvT21CQ1d1REFsUlFINi9m
|
||||||
dEw0eC9vQ09UYUxVYlByZ3U1MW5RQTAKjRYBemgMpjuO7kIgWWY/dIngE+oWJoaI
|
WmVyUDFxNEhhZEhhcTg2QmlacjZGY2MKn3fLG9OMtKmZ71PXJLqpEonlWHNd5zTR
|
||||||
8WJ1n7QqrOo5Q3tBFcSbQc0dR5AGSo5itZzPBsDjS7e4fIz3DrPJOQ==
|
cwvrSNArR5neDMdlVQlh9pHweSWQKP6MQ5ilbTnH5ksoTP+Or36aBQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-06-22T21:06:19Z"
|
lastmodified: "2025-06-22T21:06:19Z"
|
||||||
mac: ENC[AES256_GCM,data:721h9RrvnmUmIIpp02tLqlkF0Nx4Fmy36pMagqg9wo7xP8gtauEwE8FYOQWsrqo6vJTv1G+nzMRoorRrRodPuvYHBzxvxgNVacU4bzD5zN9v+wz/HEgbB+YIDKeOAY3/8Sjf5BrZdaN/75GNJUtYX8EVpUy9m9Y/WqtP3OWHTsA=,iv:jYXah33gFURc0+AbaHoBpsoWhBNJaBkie7Hc8Gz8qco=,tag:j96I6pH4xSUhocEpEr586Q==,type:str]
|
mac: ENC[AES256_GCM,data:721h9RrvnmUmIIpp02tLqlkF0Nx4Fmy36pMagqg9wo7xP8gtauEwE8FYOQWsrqo6vJTv1G+nzMRoorRrRodPuvYHBzxvxgNVacU4bzD5zN9v+wz/HEgbB+YIDKeOAY3/8Sjf5BrZdaN/75GNJUtYX8EVpUy9m9Y/WqtP3OWHTsA=,iv:jYXah33gFURc0+AbaHoBpsoWhBNJaBkie7Hc8Gz8qco=,tag:j96I6pH4xSUhocEpEr586Q==,type:str]
|
||||||
|
|
|
@ -18,6 +18,14 @@
|
||||||
mountOptions = [ "umask=0077" ];
|
mountOptions = [ "umask=0077" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
swap = {
|
||||||
|
size = "2G";
|
||||||
|
content = {
|
||||||
|
type = "swap";
|
||||||
|
discardPolicy = "both";
|
||||||
|
randomEncryption = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
zfs = {
|
zfs = {
|
||||||
size = "100%";
|
size = "100%";
|
||||||
content = {
|
content = {
|
||||||
|
|
|
@ -1,12 +1,5 @@
|
||||||
{ lib, modulesPath, ... }:
|
{ lib, modulesPath, ... }:
|
||||||
{
|
{
|
||||||
swapDevices = [
|
|
||||||
{
|
|
||||||
device = "/var/lib/swapfile";
|
|
||||||
size = 2 * 1024;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
services.qemuGuest.enable = true;
|
services.qemuGuest.enable = true;
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue