diff --git a/modules/core/infra/syncthing.nix b/modules/core/infra/syncthing.nix index 1506c2f..f2aea0b 100644 --- a/modules/core/infra/syncthing.nix +++ b/modules/core/infra/syncthing.nix @@ -37,6 +37,7 @@ "hytale" = mkFolder "/home/bug/.local/share/Hytale/UserData/Saves"; "ssh" = mkFolder "/home/bug/.ssh"; "cloudflared" = mkFolder "/home/bug/.cloudflared"; + "copyparty" = mkFolder "/home/bug/copyparty"; }; }; }; diff --git a/modules/services/copyparty.nix b/modules/services/copyparty.nix index 3441fac..7e2f710 100644 --- a/modules/services/copyparty.nix +++ b/modules/services/copyparty.nix @@ -22,7 +22,7 @@ accounts = { bug = { - passwordFile = "/home/bug/mailserver/bug.passwd"; + passwordFile = "/home/bug/copyparty/bug.passwd"; }; }; @@ -32,11 +32,11 @@ volumes = { "/" = { - path = "/home/copyparty"; + path = "/home/bug/copyparty/public/"; access = { r = "*"; - rw = [ "bug" ]; + rwda = [ "bug" ]; }; flags = { @@ -45,12 +45,33 @@ }; }; + "/nix" = { + path = "/home/bug/nix/"; + + access = { + r = "*"; + }; + + flags = { + fk = 4; + scan = 60; + }; + }; + + "/box" = { + path = "/"; + + access = { + rwda = [ "bug" ]; + }; + }; + "/Music" = { path = "/home/bug/Music/"; access = { r = "*"; - rw = [ "bug" ]; + rwda = [ "bug" ]; }; flags = { diff --git a/modules/services/gitea/gitea.nix b/modules/services/gitea/gitea.nix index d59954c..2469cbf 100644 --- a/modules/services/gitea/gitea.nix +++ b/modules/services/gitea/gitea.nix @@ -1,4 +1,4 @@ -{ den, ... }: { +{ den.aspects.gitea = { # includes = [ den.aspects.gitea-mirrors ]; diff --git a/modules/services/invidious.nix b/modules/services/invidious.nix index ed0b435..fb68135 100644 --- a/modules/services/invidious.nix +++ b/modules/services/invidious.nix @@ -1,4 +1,4 @@ -{ den, lib, ... }: { +{ lib, ... }: { den.aspects.invidious = { nixos = { pkgs, config, ... }: let companionPort = 8282; @@ -12,48 +12,48 @@ virtualisation.oci-containers.backend = lib.mkDefault "podman"; virtualisation.oci-containers.containers.invidious-companion = { - image = "quay.io/invidious/invidious-companion:latest"; - extraOptions = [ "--network=host" "--pull=always" ]; + image = "quay.io/invidious/invidious-companion:latest"; + extraOptions = [ "--network=host" "--pull=always" ]; - environment = { - SERVER_SECRET_KEY = companionKey; - HOST = "127.0.0.1"; - PORT = toString companionPort; - SERVER_BASE_URL = "http://127.0.0.1:${toString companionPort}"; + environment = { + SERVER_SECRET_KEY = companionKey; + HOST = "127.0.0.1"; + PORT = toString companionPort; + SERVER_BASE_URL = "http://127.0.0.1:${toString companionPort}"; - # HTTP_PROXY = "http://proxy.example:3128"; - # HTTPS_PROXY = "http://proxy.example:3128"; - # NO_PROXY = "127.0.0.1,localhost"; - }; + # HTTP_PROXY = "http://proxy.example:3128"; + # HTTPS_PROXY = "http://proxy.example:3128"; + # NO_PROXY = "127.0.0.1,localhost"; + }; }; services.invidious = { - enable = true; - package = pkgs.invidious; + enable = true; + package = pkgs.invidious; - address = "127.0.0.1"; - port = port; + address = "127.0.0.1"; + port = port; - nginx.enable = false; - sig-helper.enable = false; + nginx.enable = false; + sig-helper.enable = false; - settings = { - domain = "tube.bug.tools"; - https_only = false; - external_port = port; + settings = { + domain = "tube.bug.tools"; + https_only = false; + external_port = port; - invidious_companion = [ - { private_url = "http://127.0.0.1:${toString companionPort}${companionPath}"; } - ]; + invidious_companion = [ + { private_url = "http://127.0.0.1:${toString companionPort}${companionPath}"; } + ]; - invidious_companion_key = companionKey; - }; + invidious_companion_key = companionKey; + }; }; systemd.services.invidious = let dep = "podman-invidious-companion.service"; in { - wants = [ dep ]; - after = [ dep ]; - requires = [ dep ]; + wants = [ dep ]; + after = [ dep ]; + requires = [ dep ]; }; }; }; diff --git a/modules/services/mailserver.nix b/modules/services/mailserver.nix index bb73a1b..15d53df 100644 --- a/modules/services/mailserver.nix +++ b/modules/services/mailserver.nix @@ -44,8 +44,7 @@ "fc2@bug.tools" "counter@bug.tools" "claude@bug.tools" - "bitcraft@bug.tools" - + "rumble@bug.tools" ]; }; diff --git a/modules/software/compatibility/nix-alien.nix b/modules/software/compatibility/nix-alien.nix index 95683ca..24d5216 100644 --- a/modules/software/compatibility/nix-alien.nix +++ b/modules/software/compatibility/nix-alien.nix @@ -3,8 +3,8 @@ nixos = { environment.systemPackages = let nix-alien = import ( - builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master" - ) { }; + fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master" + ){}; in [ nix-alien.nix-alien ];