diff --git a/configuration/default.nix b/configuration/default.nix index f82830f..bea7539 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -56,7 +56,6 @@ boot.kernelParams = ["highres=off" "nohz=off"]; networking = { - hostName = "tlaternet"; usePredictableInterfaceNames = false; useDHCP = false; diff --git a/configuration/hardware-specific/hetzner/default.nix b/configuration/hardware-specific/hetzner/default.nix index f6915ee..5ecf63a 100644 --- a/configuration/hardware-specific/hetzner/default.nix +++ b/configuration/hardware-specific/hetzner/default.nix @@ -10,7 +10,8 @@ # TODO(tlater): See if would be useful for anything? boot.kernelParams = ["nosgx"]; - services.nginx.domain = "116.202.158.55"; + networking.hostName = "hetzner-1"; + services.nginx.domain = "tlater.net"; systemd.network.networks."eth0" = { matchConfig.MACAddress = "90:1b:0e:c1:8c:62"; diff --git a/configuration/hardware-specific/hetzner/disko.nix b/configuration/hardware-specific/hetzner/disko.nix index 8d74b83..e404688 100644 --- a/configuration/hardware-specific/hetzner/disko.nix +++ b/configuration/hardware-specific/hetzner/disko.nix @@ -68,8 +68,8 @@ mountpoint = "/var"; }; "/volume/nix-store" = { + inherit mountOptions; mountpoint = "/nix"; - mountOptions = mountOptions ++ ["noacl"]; }; "/snapshots" = {}; }; diff --git a/configuration/hardware-specific/vm.nix b/configuration/hardware-specific/vm.nix index 8e7720a..f17e7ee 100644 --- a/configuration/hardware-specific/vm.nix +++ b/configuration/hardware-specific/vm.nix @@ -4,6 +4,7 @@ # Disable graphical tty so -curses works boot.kernelParams = ["nomodeset"]; + networking.hostName = "testvm"; # Sets the base domain for nginx to localhost so that we # can easily test locally with the VM. services.nginx.domain = "localhost"; diff --git a/configuration/services/gitea.nix b/configuration/services/gitea.nix index d77d6cc..41b8583 100644 --- a/configuration/services/gitea.nix +++ b/configuration/services/gitea.nix @@ -76,23 +76,23 @@ in { # ''; # }; - # services.backups.forgejo = { - # user = "forgejo"; - # paths = [ - # "/var/lib/forgejo/forgejo-db.sql" - # "/var/lib/forgejo/repositories/" - # "/var/lib/forgejo/data/" - # "/var/lib/forgejo/custom/" - # # Conf is backed up via nix - # ]; - # preparation = { - # packages = [config.services.postgresql.package]; - # text = "pg_dump ${config.services.forgejo.database.name} --file=/var/lib/forgejo/forgejo-db.sql"; - # }; - # cleanup = { - # packages = [pkgs.coreutils]; - # text = "rm /var/lib/forgejo/forgejo-db.sql"; - # }; - # pauseServices = ["forgejo.service"]; - # }; + services.backups.forgejo = { + user = "forgejo"; + paths = [ + "/var/lib/forgejo/forgejo-db.sql" + "/var/lib/forgejo/repositories/" + "/var/lib/forgejo/data/" + "/var/lib/forgejo/custom/" + # Conf is backed up via nix + ]; + preparation = { + packages = [config.services.postgresql.package]; + text = "pg_dump ${config.services.forgejo.database.name} --file=/var/lib/forgejo/forgejo-db.sql"; + }; + cleanup = { + packages = [pkgs.coreutils]; + text = "rm /var/lib/forgejo/forgejo-db.sql"; + }; + pauseServices = ["forgejo.service"]; + }; } diff --git a/flake.lock b/flake.lock index 055848c..8a9fadc 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1701473318, - "narHash": "sha256-QdCJN8GeNl/V8wMjrvNkrWzNXnahgfjBfCSya4qQdrc=", + "lastModified": 1709504473, + "narHash": "sha256-hXzXxaZaI9Pn5tO4otY2gJUvW/orDGDAMdstm3AY8RU=", "owner": "reckenrode", "repo": "nix-foundryvtt", - "rev": "f624c0ceabe13dd876ecff871e0dc7f55f96e993", + "rev": "5cf4e6d9ed7b662dbea7a61d785b67a878598986", "type": "github" }, "original": {