alpine: maintenance done

This commit is contained in:
Tristan 2025-06-02 10:02:11 +01:00
parent e5c16d34c6
commit 1e8c120e77
6 changed files with 19 additions and 20 deletions

View file

@ -85,19 +85,19 @@
./hardware/alpine.nix ./hardware/alpine.nix
./nixos/services/anki.nix ./nixos/services/anki.nix
./nixos/services/forgejo.nix ./nixos/services/forgejo.nix
# ./nixos/services/vaultwarden.nix ./nixos/services/vaultwarden.nix
# ./nixos/services/jellyfin.nix ./nixos/services/jellyfin.nix
./nixos/services/prometheus.nix ./nixos/services/prometheus.nix
./nixos/services/grafana.nix ./nixos/services/grafana.nix
./nixos/services/loki.nix ./nixos/services/loki.nix
# ./nixos/services/synapse/. ./nixos/services/synapse/.
# ./nixos/services/mautrix/whatsapp.nix ./nixos/services/mautrix/whatsapp.nix
# ./nixos/services/mautrix/signal.nix ./nixos/services/mautrix/signal.nix
# ./nixos/services/nextcloud.nix ./nixos/services/nextcloud.nix
./nixos/services/ntfy.nix ./nixos/services/ntfy.nix
./nixos/services/authentik.nix ./nixos/services/authentik.nix
# ./nixos/services/monero.nix # ./nixos/services/monero.nix
# ./nixos/services/arr.nix ./nixos/services/arr.nix
]; ];
}; };

View file

@ -29,26 +29,26 @@ in {
}; };
fileSystems."/mnt/disk1" = { fileSystems."/mnt/disk1" = {
enable = false; enable = true;
device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63"; device = "/dev/disk/by-label/disk1-25";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/mnt/disk2" = { fileSystems."/mnt/disk2" = {
enable = false; enable = true;
device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2"; device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/mnt/disk3" = { fileSystems."/mnt/disk3" = {
enable = false; enable = true;
device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831"; device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/mnt/parity1" = { fileSystems."/mnt/parity1" = {
enable = false; enable = true;
device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713"; device = "/dev/disk/by-label/parity25";
fsType = "ext4"; fsType = "ext4";
}; };
@ -59,7 +59,7 @@ in {
]; ];
fileSystems."/mnt/storage" = { fileSystems."/mnt/storage" = {
enable = false; enable = true;
device = "/mnt/disk1:/mnt/disk2:/mnt/disk3"; device = "/mnt/disk1:/mnt/disk2:/mnt/disk3";
fsType = "fuse.mergerfs"; fsType = "fuse.mergerfs";
depends = ["/mnt/disk1" "/mnt/disk2" "/mnt/disk3"]; depends = ["/mnt/disk1" "/mnt/disk2" "/mnt/disk3"];
@ -98,7 +98,7 @@ in {
networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"]; networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"];
services.snapraid = { services.snapraid = {
enable = false; enable = true;
contentFiles = [ contentFiles = [
"/mnt/disk1/SnapRAID.content" "/mnt/disk1/SnapRAID.content"
"/mnt/disk2/SnapRAID.content" "/mnt/disk2/SnapRAID.content"
@ -137,7 +137,6 @@ in {
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
virtualHosts = { virtualHosts = {
"cerysb.art".globalRedirect = "instagram.com/cerys.bcreates";
"*.tristans.cloud" = { "*.tristans.cloud" = {
globalRedirect = "tristans.cloud"; globalRedirect = "tristans.cloud";
}; };

View file

@ -27,7 +27,6 @@ in {
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.tmp = { boot.tmp = {
useTmpfs = lib.mkDefault true; useTmpfs = lib.mkDefault true;
cleanOnBoot = true;
}; };
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

View file

@ -1,4 +1,5 @@
{ {
users.groups.media = {};
services.jellyfin = { services.jellyfin = {
enable = true; enable = true;
group = "media"; # access to user stuff group = "media"; # access to user stuff

View file

@ -2,7 +2,7 @@
inherit (config.services) prometheus; inherit (config.services) prometheus;
nodes = [ nodes = [
"alpine" "alpine"
"framework-13" "100.106.49.128"
"zenix" "zenix"
]; ];
addPort = ip: "${ip}:${toString prometheus.exporters.node.port}"; addPort = ip: "${ip}:${toString prometheus.exporters.node.port}";
@ -82,7 +82,7 @@ in {
# ntfy = { # ntfy = {
# baseurl = "https://up.tristans.cloud"; # baseurl = "https://up.tristans.cloud";
# notification = { # notification = {
# topic = "alertmanager"; # topic = "alert";
# }; # };
# }; # };
# }; # };

View file

@ -4,7 +4,7 @@
in { in {
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;
# backupDir = "/mnt/storage/backups/vaultwarden"; backupDir = "/mnt/storage/backups/vaultwarden";
}; };
services.nginx.virtualHosts.${domain} = { services.nginx.virtualHosts.${domain} = {
forceSSL = true; forceSSL = true;