diff --git a/flake.lock b/flake.lock index 5a4450c..9984cc7 100644 --- a/flake.lock +++ b/flake.lock @@ -1201,15 +1201,15 @@ "locked": { "lastModified": 1684504342, "narHash": "sha256-rJ0eH7BuPizvXPc+LjVtovse4gWEuxP2WiyNdXjPNL4=", - "owner": "lelgenio", - "repo": "tlauncher-nix", + "ref": "refs/heads/main", "rev": "add4df7220bd0b85177a1938c02b60c966c5eb71", - "type": "github" + "revCount": 3, + "type": "git", + "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix" }, "original": { - "owner": "lelgenio", - "repo": "tlauncher-nix", - "type": "github" + "type": "git", + "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix" } }, "utils": { diff --git a/flake.nix b/flake.nix index b6e3e26..f3a4532 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ }; tlauncher = { - url = "github:lelgenio/tlauncher-nix"; + url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 782b783..7bb0fb0 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -15,6 +15,24 @@ ./forgejo.nix ]; + services.nginx.virtualHosts."lelgenio.xyz" = { + enableACME = true; + forceSSL = true; + root = pkgs.runCommand "www-dir" { } '' + mkdir -p $out + cat > $out/index.html < + + +

+ Nothing to see here! +

+ + + EOF + ''; + }; + # # Enable networking # networking.networkmanager.enable = true; # Set your time zone. @@ -33,7 +51,7 @@ dates = "04:40"; operation = "switch"; flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; - flake = "github:lelgenio/nixos-config#phantom"; + flake = "git+https://git.lelgenio.xyz/lelgenio/nixos-config#phantom"; }; system.stateVersion = "23.05"; # Never change this diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index fbe33d7..d56a946 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -8,7 +8,7 @@ mailserver = { enable = true; - fqdn = "mail.lelgenio.xyz"; + fqdn = "lelgenio.xyz"; domains = [ "lelgenio.xyz" "git.lelgenio.xyz" @@ -36,7 +36,7 @@ $config['smtp_host'] = "tls://${hostName}:587"; $config['smtp_user'] = "%u"; $config['smtp_pass'] = "%p"; - $config['plugins'] = [ "carddav" ]; + $config['plugins'] = [ "carddav", "archive" ]; ''; }; diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index 52421f2..5bddece 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -9,6 +9,11 @@ }; }; + services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { + forceSSL = true; + enableACME = true; + }; + age = { secrets.phantom-nextcloud = { file = ../../secrets/phantom-nextcloud.age;