Compare commits

..

No commits in common. "1736c8dc077817bcedc7963b9966eff32a1cf807" and "e220ebdae6feb22995b54a9c1060c1e844dd4b27" have entirely different histories.

11 changed files with 15 additions and 57 deletions

View File

@ -85,11 +85,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1679992839, "lastModified": 1678729503,
"narHash": "sha256-q3mABQYZeIvznM4tjfcgN4pxI2uJ5HkPF47TZODlNdU=", "narHash": "sha256-j+h4Bdqbe+qjzhxdhkRmVgSx2lxJ8HnKeYcAhhnd1zM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "deb2f59b5c1fd11bec00600517ba7f51984c3090", "rev": "24c1a6335e3da6a3ecf82f33ac50c2ad66aee346",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,11 +116,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1679865578, "lastModified": 1678654296,
"narHash": "sha256-sYQmxxqIYL3QFsRYjW0AufhGur8qWfwoOGPGHRJZlGc=", "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4361baa782dc3d3b35fd455a1adc370681d9187c", "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1679878071, "lastModified": 1678703398,
"narHash": "sha256-7U5sTaebhjtlTYQI+q1FrbS2YXAhEsbLIcqirQ/kXJk=", "narHash": "sha256-Y1mW3dBsoWLHpYm+UIHb5VZ7rx024NNHaF16oZBx++o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44302d48a0b26421d23ee375ade3e47f9aab21df", "rev": "67f26c1cfc5d5783628231e776a81c1ade623e0b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -76,7 +76,6 @@
epkgs.org-download epkgs.org-download
epkgs.org-gcal epkgs.org-gcal
epkgs.org-ql epkgs.org-ql
epkgs.org-present
epkgs.org-roam epkgs.org-roam
epkgs.org-roam-ui epkgs.org-roam-ui
epkgs.pass epkgs.pass

View File

@ -35,6 +35,7 @@
billbee-api-key = { billbee-api-key = {
file = ../../secrets/billbee-api-key.age; file = ../../secrets/billbee-api-key.age;
mode = "770"; mode = "770";
owner = "n8n";
}; };
traefik-env = { traefik-env = {
@ -42,18 +43,11 @@
mode = "770"; mode = "770";
owner = "traefik"; owner = "traefik";
}; };
minio-root-cred = {
file = ../../secrets/minio-root-cred.age;
mode = "770";
};
searx-environmentFile = { searx-environmentFile = {
file = ../../secrets/searx-environmentFile.age; file = ../../secrets/searx-environmentFile.age;
mode = "770"; mode = "770";
owner = "searx"; owner = "searx";
}; };
wg-easy-environmentFile = { wg-easy-environmentFile = {
file = ../../secrets/wg-easy-environmentFile.age; file = ../../secrets/wg-easy-environmentFile.age;
mode = "770"; mode = "770";

View File

@ -0,0 +1,5 @@
{
services.netbird = {
enable = true;
};
}

View File

@ -5,7 +5,6 @@
./gitea.nix ./gitea.nix
./invidious.nix ./invidious.nix
./mariadb.nix ./mariadb.nix
./minio.nix
./n8n.nix ./n8n.nix
./postgres.nix ./postgres.nix
./searx.nix ./searx.nix

View File

@ -4,7 +4,6 @@
enable = true; enable = true;
package = pkgs.unstable.gitea; package = pkgs.unstable.gitea;
rootUrl = "https://code.lanakk.com"; rootUrl = "https://code.lanakk.com";
lfs.enable = true;
dump = { dump = {
enable = true; enable = true;
interval = "03:30:00"; interval = "03:30:00";

View File

@ -1,11 +0,0 @@
{ config, ... }: {
services.minio = {
enable = true;
region = "eu-central-1";
consoleAddress = ":9001";
browser = true;
rootCredentialsFile = config.age.secrets.minio-root-cred.path;
dataDir = [ "/var/backup/s3" ];
};
}

View File

@ -11,7 +11,4 @@
systemd.services.n8n.environment = { systemd.services.n8n.environment = {
BILLBEE_API_KEY = config.age.secrets.billbee-api-key.path; # TODO env file for systemd service BILLBEE_API_KEY = config.age.secrets.billbee-api-key.path; # TODO env file for systemd service
}; };
systemd.services.traefik.serviceConfig = {
EnvironmentFile="${config.age.secrets.traefik-env.path}";
};
} }

View File

@ -81,10 +81,6 @@
[{ url = "http://localhost:3012/"; }]; [{ url = "http://localhost:3012/"; }];
syncthing.loadBalancer.servers = syncthing.loadBalancer.servers =
[{ url = "http://localhost:8384/"; }]; [{ url = "http://localhost:8384/"; }];
minio.loadBalancer.servers =
[{ url = "http://localhost:9000/"; }];
minio-console.loadBalancer.servers =
[{ url = "http://localhost:9001/"; }];
}; };
routers = { routers = {
api = { api = {
@ -145,24 +141,6 @@
service = "matomo"; service = "matomo";
entrypoints = "websecure"; entrypoints = "websecure";
}; };
minio = {
rule = "Host(`s3.lanakk.com`)";
tls = {
certResolver = "godaddy";
domains = "s3.lanakk.com";
};
service = "minio";
entrypoints = "websecure";
};
minio-console = {
rule = "Host(`minio.lanakk.com`)";
tls = {
certResolver = "godaddy";
domains = "minio.lanakk.com";
};
service = "minio-console";
entrypoints = "websecure";
};
searx = { searx = {
rule = "Host(`search.lanakk.com`)"; rule = "Host(`search.lanakk.com`)";
tls = { tls = {

View File

@ -19,6 +19,4 @@ in {
"littlelink-m3tam3re-env.age".publicKeys = [ root ]; "littlelink-m3tam3re-env.age".publicKeys = [ root ];
"traefik-env.age".publicKeys = [ root ]; "traefik-env.age".publicKeys = [ root ];
"minio-root-cred.age".publicKeys = [ root ];
} }

Binary file not shown.