diff options
Diffstat (limited to 'configurations')
| -rw-r--r-- | configurations/ilmare/default.nix | 5 | ||||
| -rw-r--r-- | configurations/manwe/default.nix | 8 | ||||
| -rw-r--r-- | configurations/manwe/webserver.nix | 64 |
3 files changed, 11 insertions, 66 deletions
diff --git a/configurations/ilmare/default.nix b/configurations/ilmare/default.nix index a1b5007..bb89699 100644 --- a/configurations/ilmare/default.nix +++ b/configurations/ilmare/default.nix @@ -1,4 +1,7 @@ -_: { +{ lib, ... }: +{ + imports = lib.attrValues (lib.modulesIn ./.); + nixfiles.modules = { wireguard.client.enable = true; diff --git a/configurations/manwe/default.nix b/configurations/manwe/default.nix index 609d2a8..337a43e 100644 --- a/configurations/manwe/default.nix +++ b/configurations/manwe/default.nix @@ -1,4 +1,8 @@ -{ config, lib, ... }: +{ + config, + lib, + ... +}: with lib; { imports = attrValues (modulesIn ./.); @@ -38,6 +42,8 @@ with lib; vaultwarden.enable = true; ntfy.enable = true; plausible.enable = true; + uptime-kuma.enable = true; + thelounge.enable = true; }; boot = { diff --git a/configurations/manwe/webserver.nix b/configurations/manwe/webserver.nix index 95a0b0b..051ddba 100644 --- a/configurations/manwe/webserver.nix +++ b/configurations/manwe/webserver.nix @@ -12,70 +12,6 @@ with lib; virtualHosts = with my.domain; { - # TODO Start using this. - # "start.local" = { - # root = pkgs.hiccup; - # locations = { - # "/".tryFiles = "$uri $uri/ /index.html"; - # "~* ^.+config.json$".extraConfig = let - # config = pkgs.writeText "config.json" (generators.toJSON {} { - # version = "2.0"; - # id = "default"; - # title = "Demo Config"; - # url = "./configs/config.json"; - # featured = [ - # { - # name = "GitHub"; - # background = "/assets/card.png"; - # link = "https://github.com/ashwin-pc/hiccup"; - # } - # ]; - # categories = [ - # { - # title = "Category 1"; - # links = [ - # { - # name = "Link 1"; - # link = "https://example.com"; - # } - # ]; - # } - # { - # title = "Category 2"; - # links = [ - # { - # name = "Link 1"; - # link = "https://example.com"; - # } - # ]; - # } - # { - # title = "Category 3"; - # links = [ - # { - # name = "Link 1"; - # link = "https://example.com"; - # } - # ]; - # } - # { - # title = "Category 4"; - # links = [ - # { - # name = "Link 1"; - # link = "https://example.com"; - # } - # ]; - # } - # ]; - # }); - # in '' - # alias ${config}; - # ''; - # }; - # enableACME = false; - # forceSSL = false; - # }; ${shire}.locations."/".return = "301 https://www.youtube.com/watch?v=dQw4w9WgXcQ"; "git.${shire}".locations."/".return = "301 https://git.${azahi}"; "bitwarden.${shire}".locations."/".return = "301 https://vaultwarden.${shire}"; |