diff --git a/README.md b/README.md index a28cfc1..e860f06 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,3 @@ -# nixfiles +# nixos-config -My NixOS configuration files. - -## Machines - -* `tohru`: Dell Latitude 5300, personal laptop -* `yevaud`: Oracle Cloud free AMD VM, hosts a Forgejo instance - -## Usage - -### Building - -To build locally, run `colmena apply-local` as root. - -To build the remote machines, run `colmena apply`. See the [colmena documentation](https://colmena.cli.rs/) for command-line options. Notable options include: -* `--on [hostname]`: build a specific machine only -* `--reboot`: reboot after building (but note [this bug](https://github.com/zhaofengli/colmena/issues/166) means it may hang even when the reboot completes successfully) - -### Updating - -Run `npins update` to update the dependencies within the currently selected upgrade channels. - -To upgrade to a new major version of a dependency, simply re-add it and the old version will be overwritten, e.g.: - -```sh -npins add --name nixpkgs channel nixos-unstable -``` - -In either case, commit the changes to `npins/sources.json`. - -See the [npins documentation](https://github.com/andir/npins) for more details. \ No newline at end of file +My NixOS configuration files \ No newline at end of file diff --git a/hosts/yevaud/forgejo.nix b/hosts/yevaud/forgejo.nix index e103297..31e8494 100644 --- a/hosts/yevaud/forgejo.nix +++ b/hosts/yevaud/forgejo.nix @@ -10,15 +10,11 @@ # TODO: interface customisation services.nginx.virtualHosts = { - "git.qenya.tel" = { - forceSSL = true; - enableACME = true; - locations."/".proxyPass = "http://[::1]:3000/"; - }; + # TODO: move to new domain "git.katherina.rocks" = { forceSSL = true; enableACME = true; - locations."/".return = "301 https://git.qenya.tel$request_uri"; + locations."/".proxyPass = "http://[::1]:3000/"; }; }; @@ -26,7 +22,7 @@ enable = true; stateDir = "/data/forgejo"; settings = { - DEFAULT.APP_NAME = "git.qenya.tel"; + DEFAULT.APP_NAME = "git.katherina.rocks"; cache = { ADAPTER = "twoqueue"; HOST = ''{"size": 100, "recent_ratio": 0.25, "ghost_ratio": 0.5}''; @@ -37,9 +33,9 @@ }; security.LOGIN_REMEMBER_DAYS = 365; server = { - DOMAIN = "git.qenya.tel"; + DOMAIN = "git.katherina.rocks"; HTTP_PORT = 3000; - ROOT_URL = "https://git.qenya.tel/"; + ROOT_URL = "https://git.katherina.rocks/"; }; service.DISABLE_REGISTRATION = true; };