diff --git a/nixos/components/network/nginx.nix b/nixos/components/network/nginx.nix index 3fd63db..e063797 100644 --- a/nixos/components/network/nginx.nix +++ b/nixos/components/network/nginx.nix @@ -44,7 +44,7 @@ with lib; services.nginx.package = pkgs.nginxMainline; services.nginx.virtualHosts."${config.networking.hostName}.private" = { - default = true; + default = lib.mkDefault true; locations."/" = { root = pkgs.landingpage.override { jsonConfig = [ diff --git a/nixos/homes/common/packages.nix b/nixos/homes/common/packages.nix index df134aa..4228bc7 100644 --- a/nixos/homes/common/packages.nix +++ b/nixos/homes/common/packages.nix @@ -11,6 +11,8 @@ with lib; ipcalc units + + parallel ]; } (mkIf config.gui.enable { @@ -24,9 +26,11 @@ with lib; aspellDicts.en aspellDicts.es - joplin-desktop + #joplin-desktop evince + + transmission-remote-gtk ]; }) ]; diff --git a/nixos/machines/robi/finance.nix b/nixos/legacy/finance.nix similarity index 100% rename from nixos/machines/robi/finance.nix rename to nixos/legacy/finance.nix diff --git a/nixos/machines/robi/graylog.nix b/nixos/legacy/graylog.nix similarity index 100% rename from nixos/machines/robi/graylog.nix rename to nixos/legacy/graylog.nix diff --git a/nixos/machines/robi/kibana.nix b/nixos/legacy/kibana.nix similarity index 100% rename from nixos/machines/robi/kibana.nix rename to nixos/legacy/kibana.nix diff --git a/nixos/machines/robi/mail-fetcher.nix b/nixos/legacy/mail-fetcher.nix similarity index 100% rename from nixos/machines/robi/mail-fetcher.nix rename to nixos/legacy/mail-fetcher.nix diff --git a/nixos/machines/robi/media-unmanic.nix b/nixos/legacy/media-unmanic.nix similarity index 100% rename from nixos/machines/robi/media-unmanic.nix rename to nixos/legacy/media-unmanic.nix diff --git a/nixos/machines/robi/mysql.nix b/nixos/legacy/mysql.nix similarity index 100% rename from nixos/machines/robi/mysql.nix rename to nixos/legacy/mysql.nix diff --git a/nixos/machines/robi/property.nix b/nixos/legacy/property.nix similarity index 100% rename from nixos/machines/robi/property.nix rename to nixos/legacy/property.nix diff --git a/nixos/machines/robi/screeps.nix b/nixos/legacy/screeps.nix similarity index 100% rename from nixos/machines/robi/screeps.nix rename to nixos/legacy/screeps.nix diff --git a/nixos/machines/robi/webhook-ring.nix b/nixos/legacy/webhook-ring.nix similarity index 100% rename from nixos/machines/robi/webhook-ring.nix rename to nixos/legacy/webhook-ring.nix diff --git a/nixos/machines/robi/weechat.nix b/nixos/legacy/weechat.nix similarity index 100% rename from nixos/machines/robi/weechat.nix rename to nixos/legacy/weechat.nix diff --git a/nixos/machines/cherry/37c3.nix b/nixos/machines/cherry/37c3.nix index c500f3c..24cb476 100644 --- a/nixos/machines/cherry/37c3.nix +++ b/nixos/machines/cherry/37c3.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - interface = "wlp170s0"; + interface = "wlp170s0"; in { networking.networkmanager.ensureProfiles.profiles = { diff --git a/nixos/machines/orbi/terranix-dendrite.nix b/nixos/machines/orbi/terranix-dendrite.nix index 118fcb6..afa7a4a 100644 --- a/nixos/machines/orbi/terranix-dendrite.nix +++ b/nixos/machines/orbi/terranix-dendrite.nix @@ -23,7 +23,7 @@ in services.dendrite = { enable = true; - httpPort = 8043; + httpPort = 8448; settings = { global = { server_name = "terranix.org"; @@ -100,10 +100,11 @@ in locations."/".root = element-web-terranix.org; }; - services.nginx.virtualHosts.${server_name} = { - locations."= /.well-known/matrix/server".alias = - pkgs.writeText "matrix-server" (builtins.toJSON { "m.server" = "${nginx-vhost}:443"; }); - locations."= /.well-known/matrix/client".alias = - pkgs.writeText "matrix-client" (builtins.toJSON { "m.homeserver".base_url = "https://${nginx-vhost}"; }); - }; + #services.nginx.virtualHosts.${server_name} = { + # locations."= /.well-known/matrix/server".alias = + # pkgs.writeText "matrix-server" (builtins.toJSON { "m.server" = "${nginx-vhost}:443"; }); + # locations."= /.well-known/matrix/client".alias = + # pkgs.writeText "matrix-client" (builtins.toJSON { "m.homeserver".base_url = "https://${nginx-vhost}"; }); + #}; + } diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix index e8b1c53..3f50a64 100644 --- a/nixos/machines/robi/configuration.nix +++ b/nixos/machines/robi/configuration.nix @@ -1,7 +1,7 @@ { lib, config, pkgs, ... }: { imports = [ - ../../system/all/nginx.nix + # ../../system/all/nginx.nix ../../system/all/borg-jobs.nix ../../system/all/defaults.nix ../../system/server/packages.nix @@ -12,8 +12,6 @@ ./hetzner.nix - #./screeps.nix - ./borg.nix ./codimd.nix ./gitea.nix @@ -33,24 +31,9 @@ ./media-transmission.nix ./media-transmission2.nix ./media-arr.nix - #./media-tdarr.nix - #./media-unmanic.nix ./social-jitsi.nix - #./webhook-ring.nix - - #../../system/server - - #./hardware-configuration.nix - #./finance.nix - #./graylog.nix - #./kibana.nix - #./mysql.nix - #./prometheus.nix - #./weechat.nix - #./property.nix # flask sucks, find something else - # matrix ./terranix-dendrite.nix diff --git a/nixos/machines/robi/nginx.nix b/nixos/machines/robi/nginx.nix index b05b49d..e465464 100644 --- a/nixos/machines/robi/nginx.nix +++ b/nixos/machines/robi/nginx.nix @@ -39,7 +39,10 @@ in recommendedProxySettings = true; virtualHosts = { + "${config.networking.hostName}.private".default = false; + "ingolf-wagner.de" = { + default = true; forceSSL = true; enableACME = true; extraConfig = error.extraConfig;