diff --git a/systems/x86_64-linux/attic/atticd.nix b/systems/x86_64-linux/attic/atticd.nix index 07bacac..b24dd3b 100644 --- a/systems/x86_64-linux/attic/atticd.nix +++ b/systems/x86_64-linux/attic/atticd.nix @@ -12,7 +12,7 @@ }; systemd.services.postgresql.postStart = lib.mkAfter '' - psql -tAc 'ALTER DATABASE "attic" OWNER TO "atticd"' + $PSQL -tAc 'ALTER DATABASE "attic" OWNER TO "atticd"' ''; environment.systemPackages = with pkgs; [ attic-client ]; diff --git a/systems/x86_64-linux/attic/default.nix b/systems/x86_64-linux/attic/default.nix index 8daa780..a0d887c 100644 --- a/systems/x86_64-linux/attic/default.nix +++ b/systems/x86_64-linux/attic/default.nix @@ -29,20 +29,11 @@ boot.loader.efi.canTouchEfiVariables = lib.mkForce false; boot.loader.grub.enable = true; - security.sudo.wheelNeedsPassword = false; - security.tpm2.enable = false; security.tpm2.abrmd.enable = false; networking.wireless.enable = false; - networking.useDHCP = false; - networking.useNetworkd = true; - systemd.network.networks."30-wan" = { - matchConfig.Name = "enp1s0"; - networkConfig.DHCP = "ipv4"; - address = [ "2a01:4f9:c014:619::1/64" ]; - routes = [{ Gateway = "fe80::1"; }]; - }; + networking.dhcpcd.IPv6rs = true; networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowPing = true;