Compare commits

..

No commits in common. "8c8587e59a76cb9c183d47e2480702fc0e23280b" and "9704df774d37a0bb2193386b130298859b9fe22b" have entirely different histories.

12 changed files with 5 additions and 90 deletions

View File

@ -17,14 +17,15 @@
xdg.mimeApps.enable = true; xdg.mimeApps.enable = true;
home.sessionVariables = { home.sessionVariables = {
QT_QPA_PLATFORMTHEME = "qt5ct";
WEBKIT_DISABLE_COMPOSITING_MODE = "1"; WEBKIT_DISABLE_COMPOSITING_MODE = "1";
EDITOR = "emacs"; EDITOR = "emacs";
VISUAL = "emacs"; VISUAL = "emacs";
XDG_CONFIG_HOME = "\${HOME}/.config"; XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_DATA_HOME = "\${HOME}/.local/share";
PATH = [ "\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" ];
}; };
home.sessionPath = [ "\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" ];
home.packages = with pkgs; [ home.packages = with pkgs; [
alacritty alacritty

View File

@ -1,7 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
nextcloud-client
libreoffice libreoffice
neomutt neomutt
tutanota-desktop tutanota-desktop

View File

@ -60,10 +60,6 @@
file = ../../secrets/littlelink-lanakk-env.age; file = ../../secrets/littlelink-lanakk-env.age;
mode = "770"; mode = "770";
}; };
littlelink-m3tam3re-env = {
file = ../../secrets/littlelink-m3tam3re-env.age;
mode = "770";
};
}; };
identityPaths = [ "/home/m3tam3re/.ssh/lkk-nix-1" ]; identityPaths = [ "/home/m3tam3re/.ssh/lkk-nix-1" ];
}; };

View File

@ -5,7 +5,6 @@
./little-link.nix ./little-link.nix
./matomo.nix ./matomo.nix
./nextcloud.nix ./nextcloud.nix
./nginx.nix
./wordpress.nix ./wordpress.nix
./wireguard.nix ./wireguard.nix
]; ];

View File

@ -7,7 +7,7 @@
}; };
virtualisation.oci-containers.containers."littlelink_m3tam3re" = { virtualisation.oci-containers.containers."littlelink_m3tam3re" = {
image = "ghcr.io/techno-tim/littlelink-server"; image = "ghcr.io/techno-tim/littlelink-server";
environmentFiles = [ config.age.secrets.littlelink-m3tam3re-env.path ]; environmentFiles = [ config.age.secrets.littlelink-lanakk-env.path ];
ports = [ "3011:3000" ]; ports = [ "3011:3000" ];
extraOptions = [ "--ip=10.88.0.21" ]; extraOptions = [ "--ip=10.88.0.21" ];
}; };

View File

@ -1,8 +0,0 @@
{ config, outputs, ... }: {
virtualisation.oci-containers.containers."http-images" = {
image = "docker.io/nginx:alpine";
ports = [ "3012:80" ];
volumes = [ "/opt/service-data/http-images:/usr/share/nginx/html"];
extraOptions = [ "--ip=10.88.0.22" ];
};
}

View File

@ -8,7 +8,6 @@
./n8n.nix ./n8n.nix
./postgres.nix ./postgres.nix
./searx.nix ./searx.nix
./syncthing.nix
./traefik.nix ./traefik.nix
]; ];
} }

View File

@ -1,20 +0,0 @@
{ config, pkgs, ... }: {
services.syncthing = {
enable = true;
openDefaultPorts = true;
guiAddress = "0.0.0.0:8384";
overrideDevices = true;
overrideFolders = true;
devices = {
"LK-DATA" = {
id = "BI7CMZF-2SGQMXW-RG47HRG-FEH454J-ZTCE544-BXNSCSJ-PXCE7A7-R4CX2Q3";
};
};
folders = {
"Bildvorschauen" = {
path = "/opt/service-data/http-images";
devices = [ "LK-DATA" ];
};
};
};
}

View File

@ -11,13 +11,6 @@
dnsChallenge = { provider = "godaddy"; }; dnsChallenge = { provider = "godaddy"; };
}; };
}; };
lets-encrypt = {
acme = {
email = "dev@lanakk.com";
storage = "/var/lib/traefik/acme.json";
tlsChallenge = {};
};
};
}; };
api = { }; api = { };
entryPoints = { entryPoints = {
@ -46,15 +39,6 @@
replacement = "https://\${1}/remote.php/dav"; replacement = "https://\${1}/remote.php/dav";
}; };
}; };
nextcloud_headers = {
headers = {
referrerPolicy = "no-referrer";
stsSeconds = "31536000";
forceSTSHeader = true;
stsPreload = true;
stsIncludeSubdomains = true;
};
};
}; };
services = { services = {
baserow.loadBalancer.servers = [{ url = "http://localhost:3001/"; }]; baserow.loadBalancer.servers = [{ url = "http://localhost:3001/"; }];
@ -77,10 +61,6 @@
[{ url = "http://localhost:3010/"; }]; [{ url = "http://localhost:3010/"; }];
littlelink-m3tam3re.loadBalancer.servers = littlelink-m3tam3re.loadBalancer.servers =
[{ url = "http://localhost:3011/"; }]; [{ url = "http://localhost:3011/"; }];
http-images.loadBalancer.servers =
[{ url = "http://localhost:3012/"; }];
syncthing.loadBalancer.servers =
[{ url = "http://localhost:8384/"; }];
}; };
routers = { routers = {
api = { api = {
@ -132,15 +112,6 @@
service = "matomo"; service = "matomo";
entrypoints = "websecure"; entrypoints = "websecure";
}; };
matomo-weltkarte-pinnwand = {
rule = "Host(`stats.weltkarte-pinnwand.com`)";
tls = {
certResolver = "godaddy";
domains = "stats.weltkarte-pinnwand.com";
};
service = "matomo";
entrypoints = "websecure";
};
searx = { searx = {
rule = "Host(`search.lanakk.com`)"; rule = "Host(`search.lanakk.com`)";
tls = { tls = {
@ -167,7 +138,7 @@
}; };
service = "nextcloud"; service = "nextcloud";
entrypoints = "websecure"; entrypoints = "websecure";
middlewares = "nextcloud_redirectregex,nextcloud_headers"; middlewares = "nextcloud_redirectregex";
}; };
wireguard = { wireguard = {
rule = "Host(`wg.lanakk.com`)"; rule = "Host(`wg.lanakk.com`)";
@ -207,30 +178,9 @@
service = "littlelink-lanakk"; service = "littlelink-lanakk";
entrypoints = "websecure"; entrypoints = "websecure";
}; };
http-images = {
rule = "Host(`media.lanakk.com`)";
tls = {
certResolver = "godaddy";
domains = "media.lanakk.com";
};
service = "http-images";
entrypoints = "websecure";
};
syncthing = {
rule = "Host(`sync.lanakk.com`)";
tls = {
certResolver = "godaddy";
domains = "sync.lanakk.com";
};
service = "syncthing";
entrypoints = "websecure";
};
littlelink-m3tm3re = { littlelink-m3tm3re = {
rule = "Host(`links.m3tam3re.com`)"; rule = "Host(`links.m3tam3re.com`)";
tls = { tls = { domains = "links.m3tam3re.com"; };
certResolver = "lets-encrypt";
domains = "links.m3tam3re.com";
};
service = "littlelink-m3tam3re"; service = "littlelink-m3tam3re";
entrypoints = "websecure"; entrypoints = "websecure";
}; };

View File

@ -16,7 +16,6 @@ in {
"briefkasten-env.age".publicKeys = [ root ]; "briefkasten-env.age".publicKeys = [ root ];
"littlelink-lanakk-env.age".publicKeys = [ root ]; "littlelink-lanakk-env.age".publicKeys = [ root ];
"littlelink-m3tam3re-env.age".publicKeys = [ root ];
"traefik-env.age".publicKeys = [ root ]; "traefik-env.age".publicKeys = [ root ];
} }

Binary file not shown.

Binary file not shown.