diff --git a/flake.nix b/flake.nix index 4ca7d21..7649751 100644 --- a/flake.nix +++ b/flake.nix @@ -85,19 +85,19 @@ ./hardware/alpine.nix ./nixos/services/anki.nix ./nixos/services/forgejo.nix - # ./nixos/services/vaultwarden.nix - # ./nixos/services/jellyfin.nix + ./nixos/services/vaultwarden.nix + ./nixos/services/jellyfin.nix ./nixos/services/prometheus.nix ./nixos/services/grafana.nix ./nixos/services/loki.nix - # ./nixos/services/synapse/. - # ./nixos/services/mautrix/whatsapp.nix - # ./nixos/services/mautrix/signal.nix - # ./nixos/services/nextcloud.nix + ./nixos/services/synapse/. + ./nixos/services/mautrix/whatsapp.nix + ./nixos/services/mautrix/signal.nix + ./nixos/services/nextcloud.nix ./nixos/services/ntfy.nix ./nixos/services/authentik.nix # ./nixos/services/monero.nix - # ./nixos/services/arr.nix + ./nixos/services/arr.nix ]; }; diff --git a/hardware/alpine.nix b/hardware/alpine.nix index b7b2718..17e78eb 100644 --- a/hardware/alpine.nix +++ b/hardware/alpine.nix @@ -29,26 +29,26 @@ in { }; fileSystems."/mnt/disk1" = { - enable = false; - device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63"; + enable = true; + device = "/dev/disk/by-label/disk1-25"; fsType = "ext4"; }; fileSystems."/mnt/disk2" = { - enable = false; + enable = true; device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2"; fsType = "ext4"; }; fileSystems."/mnt/disk3" = { - enable = false; + enable = true; device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831"; fsType = "ext4"; }; fileSystems."/mnt/parity1" = { - enable = false; - device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713"; + enable = true; + device = "/dev/disk/by-label/parity25"; fsType = "ext4"; }; @@ -59,7 +59,7 @@ in { ]; fileSystems."/mnt/storage" = { - enable = false; + enable = true; device = "/mnt/disk1:/mnt/disk2:/mnt/disk3"; fsType = "fuse.mergerfs"; depends = ["/mnt/disk1" "/mnt/disk2" "/mnt/disk3"]; @@ -98,7 +98,7 @@ in { networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"]; services.snapraid = { - enable = false; + enable = true; contentFiles = [ "/mnt/disk1/SnapRAID.content" "/mnt/disk2/SnapRAID.content" @@ -137,7 +137,6 @@ in { recommendedOptimisation = true; recommendedGzipSettings = true; virtualHosts = { - "cerysb.art".globalRedirect = "instagram.com/cerys.bcreates"; "*.tristans.cloud" = { globalRedirect = "tristans.cloud"; }; diff --git a/nixos/default.nix b/nixos/default.nix index c71a9f7..5dd3992 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -27,7 +27,6 @@ in { boot.loader.efi.canTouchEfiVariables = true; boot.tmp = { useTmpfs = lib.mkDefault true; - cleanOnBoot = true; }; networking.networkmanager.enable = true; diff --git a/nixos/services/jellyfin.nix b/nixos/services/jellyfin.nix index 583a411..91c4347 100644 --- a/nixos/services/jellyfin.nix +++ b/nixos/services/jellyfin.nix @@ -1,4 +1,5 @@ { + users.groups.media = {}; services.jellyfin = { enable = true; group = "media"; # access to user stuff diff --git a/nixos/services/prometheus.nix b/nixos/services/prometheus.nix index 5b747e1..9e18f22 100644 --- a/nixos/services/prometheus.nix +++ b/nixos/services/prometheus.nix @@ -2,7 +2,7 @@ inherit (config.services) prometheus; nodes = [ "alpine" - "framework-13" + "100.106.49.128" "zenix" ]; addPort = ip: "${ip}:${toString prometheus.exporters.node.port}"; @@ -82,7 +82,7 @@ in { # ntfy = { # baseurl = "https://up.tristans.cloud"; # notification = { - # topic = "alertmanager"; + # topic = "alert"; # }; # }; # }; diff --git a/nixos/services/vaultwarden.nix b/nixos/services/vaultwarden.nix index 0e7b99d..dddb0ef 100644 --- a/nixos/services/vaultwarden.nix +++ b/nixos/services/vaultwarden.nix @@ -4,7 +4,7 @@ in { services.vaultwarden = { enable = true; - # backupDir = "/mnt/storage/backups/vaultwarden"; + backupDir = "/mnt/storage/backups/vaultwarden"; }; services.nginx.virtualHosts.${domain} = { forceSSL = true;