diff --git a/modules/core/shell.nix b/modules/core/shell.nix index 15e79d4..31011e6 100644 --- a/modules/core/shell.nix +++ b/modules/core/shell.nix @@ -41,6 +41,8 @@ gtm = "git merge"; gtma = "git merge --abort"; gtmc = "git merge --continue"; + gtr = "git restore"; + gtrs = "git reset"; # just jts = "just switch"; diff --git a/modules/srv/traefik.nix b/modules/srv/traefik.nix index fa730ac..ffb6655 100644 --- a/modules/srv/traefik.nix +++ b/modules/srv/traefik.nix @@ -86,8 +86,8 @@ in { ]; root = websitePackage; locations."/" = { + # NixOS already handles mime types, no need to add them to the NGINX config extraConfig = '' - include ${pkgs.nginx}/conf/mime.types; autoindex off; try_files $uri $uri/index.html $uri.html =404; ''; @@ -120,7 +120,7 @@ in { rule = "Host(`git.air1.one`)"; service = "gitea"; entryPoints = ["websecure"]; - tls = {}; + tls.certResolver = "le"; }; services.gitea.loadBalancer.servers = [ {url = "http://127.0.0.1:3031";} diff --git a/pkgs/website/config.toml b/pkgs/website/config.toml index af66324..775951b 100644 --- a/pkgs/website/config.toml +++ b/pkgs/website/config.toml @@ -1,4 +1,4 @@ -base_url = "http://localhost" +base_url = "http://air1.one" theme = "zola.386" default_language = "en"