diff --git a/home/features/desktop/espanso.nix b/home/features/desktop/espanso.nix index 1a0f753..92ec55d 100644 --- a/home/features/desktop/espanso.nix +++ b/home/features/desktop/espanso.nix @@ -1 +1,2 @@ { pkgs, ... }: { home.packages = with pkgs; [ espanso-wayland ]; } + diff --git a/hosts/lkk-nix-1/default.nix b/hosts/lkk-nix-1/default.nix index a9092fd..9eaf005 100644 --- a/hosts/lkk-nix-1/default.nix +++ b/hosts/lkk-nix-1/default.nix @@ -7,11 +7,10 @@ ]; boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only services.openssh.enable = true; - services.openssh.passwordAuthentication = false; + services.openssh.settings.PasswordAuthentication = false; networking = { hostName = "lkk-nix-1"; firewall.enable = true; diff --git a/hosts/lkk-nix-1/services/gitea.nix b/hosts/lkk-nix-1/services/gitea.nix index 1affefd..13c8825 100644 --- a/hosts/lkk-nix-1/services/gitea.nix +++ b/hosts/lkk-nix-1/services/gitea.nix @@ -2,7 +2,7 @@ { services.gitea = { enable = true; - rootUrl = "https://code.lanakk.com"; + settings.server.ROOT_URL = "https://code.lanakk.com"; lfs.enable = true; dump = { enable = true; diff --git a/hosts/lkk-nix-1/services/metabase.nix b/hosts/lkk-nix-1/services/metabase.nix new file mode 100644 index 0000000..40608a7 --- /dev/null +++ b/hosts/lkk-nix-1/services/metabase.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: { + + services.metabase = { + enable = true; + listen.port = 3000; +} diff --git a/hosts/lkk-nix-1/services/syncthing.nix b/hosts/lkk-nix-1/services/syncthing.nix index 566dddf..95563fa 100644 --- a/hosts/lkk-nix-1/services/syncthing.nix +++ b/hosts/lkk-nix-1/services/syncthing.nix @@ -5,15 +5,18 @@ guiAddress = "0.0.0.0:8384"; overrideDevices = true; overrideFolders = true; - devices = { - "LK-DATA" = { - id = "BI7CMZF-2SGQMXW-RG47HRG-FEH454J-ZTCE544-BXNSCSJ-PXCE7A7-R4CX2Q3"; + settings = { + devices = { + "LK-DATA" = { + id = + "BI7CMZF-2SGQMXW-RG47HRG-FEH454J-ZTCE544-BXNSCSJ-PXCE7A7-R4CX2Q3"; + }; }; - }; - folders = { - "Bildvorschauen" = { - path = "/opt/service-data/http-images"; - devices = [ "LK-DATA" ]; + folders = { + "Bildvorschauen" = { + path = "/opt/service-data/http-images"; + devices = [ "LK-DATA" ]; + }; }; }; }; diff --git a/hosts/lkk-nix-1/services/traefik.nix b/hosts/lkk-nix-1/services/traefik.nix index 910c531..5e3f985 100644 --- a/hosts/lkk-nix-1/services/traefik.nix +++ b/hosts/lkk-nix-1/services/traefik.nix @@ -15,7 +15,7 @@ acme = { email = "dev@lanakk.com"; storage = "/var/lib/traefik/acme.json"; - tlsChallenge = {}; + tlsChallenge = { }; }; }; }; @@ -81,10 +81,10 @@ [{ url = "http://localhost:3012/"; }]; syncthing.loadBalancer.servers = [{ url = "http://localhost:8384/"; }]; - minio.loadBalancer.servers = - [{ url = "http://localhost:9000/"; }]; + minio.loadBalancer.servers = [{ url = "http://localhost:9000/"; }]; minio-console.loadBalancer.servers = [{ url = "http://localhost:9001/"; }]; + metabase.loadBalancer.servers = [{ url = "http://localhost:3013/"; }]; }; routers = { api = { @@ -255,12 +255,21 @@ service = "littlelink-m3tam3re"; entrypoints = "websecure"; }; + metabase = { + rule = "Host(`kpi.lanakk.com`)"; + tls = { + certResolver = "godaddy"; + domains = "kpi.lanakk.com"; + }; + service = "metabase"; + entrypoints = "websecure"; + }; }; }; }; }; systemd.services.traefik.serviceConfig = { - EnvironmentFile="${config.age.secrets.traefik-env.path}"; + EnvironmentFile = "${config.age.secrets.traefik-env.path}"; }; }