diff --git a/configuration/default.nix b/configuration/default.nix index bea7539..f82830f 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -56,6 +56,7 @@ 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 5ecf63a..f6915ee 100644 --- a/configuration/hardware-specific/hetzner/default.nix +++ b/configuration/hardware-specific/hetzner/default.nix @@ -10,8 +10,7 @@ # TODO(tlater): See if would be useful for anything? boot.kernelParams = ["nosgx"]; - networking.hostName = "hetzner-1"; - services.nginx.domain = "tlater.net"; + services.nginx.domain = "116.202.158.55"; 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 e404688..8d74b83 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 f17e7ee..8e7720a 100644 --- a/configuration/hardware-specific/vm.nix +++ b/configuration/hardware-specific/vm.nix @@ -4,7 +4,6 @@ # 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 41b8583..d77d6cc 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 8a9fadc..055848c 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1709504473, - "narHash": "sha256-hXzXxaZaI9Pn5tO4otY2gJUvW/orDGDAMdstm3AY8RU=", + "lastModified": 1701473318, + "narHash": "sha256-QdCJN8GeNl/V8wMjrvNkrWzNXnahgfjBfCSya4qQdrc=", "owner": "reckenrode", "repo": "nix-foundryvtt", - "rev": "5cf4e6d9ed7b662dbea7a61d785b67a878598986", + "rev": "f624c0ceabe13dd876ecff871e0dc7f55f96e993", "type": "github" }, "original": {