diff --git a/build.sh b/build.sh
index 483b3e8..000e6ea 100755
--- a/build.sh
+++ b/build.sh
@@ -19,7 +19,7 @@ if [ "${ROOT}" = "/" ]; then
[ -f "host/${CONFIG}/hooks/pre-rebuild.sh" ] && host/${CONFIG}/hooks/pre-rebuild.sh
[ ! -f "hardware-configuration.nix" ] && nixos-generate-config --show-hardware-config > hardware-configuration.nix
git add -f hardware-configuration.nix
- nom build $DERIVATION $EXTRA_NIX_FLAGS && nixos-rebuild switch --flake .#${CONFIG} $EXTRA_NIX_FLAGS $EXTRA_NIXOS_REBUILD_FLAGS || exit 1
+ nom build $DERIVATION $EXTRA_NIX_FLAGS && nixos-rebuild test --flake .#${CONFIG} $EXTRA_NIX_FLAGS $EXTRA_NIXOS_REBUILD_FLAGS || exit 1
#nixos-rebuild switch --flake ".#${CONFIG}" -j`nproc` --upgrade-all -L || exit 1
[ -f "host/${CONFIG}/hooks/post-rebuild.sh" ] && host/${CONFIG}/hooks/post-rebuild.sh
git rm --cached hardware-configuration.nix
diff --git a/flake.lock b/flake.lock
index 7b497f1..46cee6c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -108,7 +108,7 @@
},
"locked": {
"lastModified": 1745744468,
- "narHash": "sha256-iM+uxKk3eaSr2WHqhBd+M1MQvEMLf0VIfs0Y8yYdC9E=",
+ "narHash": "sha256-S1vibZhzfZrZbjXCJIjzCXf4Gx/yHfPzGCzOJ9m0kWY=",
"ref": "refs/heads/master",
"rev": "43939110959a719b0b346780e8f0d0c028320180",
"revCount": 1658,
@@ -567,11 +567,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1746585355,
- "narHash": "sha256-p+3fK8HEYC+0q4gPKSE4OSRxqt5H/tWZkB9wF7aaWOY=",
+ "lastModified": 1746632058,
+ "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "35535345be0be7dbae2e9b787c6cf790f8c893d5",
+ "rev": "708074ae6db9e0468e4f48477f856e8c2d059795",
"type": "github"
},
"original": {
@@ -1053,11 +1053,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1746617143,
- "narHash": "sha256-0NzKGiEH4lAD0Fn+TWNz0Lqo5sJLkIdTVtDWsgmKzuM=",
+ "lastModified": 1746631734,
+ "narHash": "sha256-xX6nV/7yVcTlgqZBteV0GocEe+KRyDGuFVeAVS4igYY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fe965d2c054ce6283f857d57d9ba4e15f25bae22",
+ "rev": "9b4bb7dfd03a98d5e6933195dc04e458dc5eb1c9",
"type": "github"
},
"original": {
@@ -1085,11 +1085,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1746617143,
- "narHash": "sha256-0NzKGiEH4lAD0Fn+TWNz0Lqo5sJLkIdTVtDWsgmKzuM=",
+ "lastModified": 1746631734,
+ "narHash": "sha256-xX6nV/7yVcTlgqZBteV0GocEe+KRyDGuFVeAVS4igYY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fe965d2c054ce6283f857d57d9ba4e15f25bae22",
+ "rev": "9b4bb7dfd03a98d5e6933195dc04e458dc5eb1c9",
"type": "github"
},
"original": {
@@ -1229,11 +1229,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1746232882,
- "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
+ "lastModified": 1746461020,
+ "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
+ "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github"
},
"original": {
@@ -1297,7 +1297,7 @@
},
"locked": {
"lastModified": 1737779835,
- "narHash": "sha256-TY7cnYqhgxIXZCltcFxYuKQ6Hpt3gouuYn0rj9URsp4=",
+ "narHash": "sha256-iZ/kQ/XFqIx053AuSHhCwu3HA8627ognYiJl/LRNpD0=",
"ref": "refs/heads/master",
"rev": "11cc65efa2909bdc7e3e978bf1f56f6d141bf82a",
"revCount": 11,
diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix
index f457603..6be6b1f 100755
--- a/host/Rory-ovh/configuration.nix
+++ b/host/Rory-ovh/configuration.nix
@@ -32,14 +32,6 @@
boot.loader.grub.devices = lib.mkForce [ "nodev" ];
networking = {
hostName = "Rory-ovh";
- #interfaces.enp98s0f0.ipv4.addresses = [
- # {
- # address = "51.210.113.110";
- # prefixLength = 24;
- # }
- #];
- #defaultGateway.interface = "enp98s0f0";
- #defaultGateway.address = "51.210.113.254";
nat = {
enable = true;
internalInterfaces = [
@@ -52,6 +44,9 @@
enableIPv6 = lib.mkForce false;
nameservers = lib.mkForce [ "1.1.1.1" ];
firewall.enable = lib.mkForce true;
+ resolvconf.enable = false;
+ defaultGateway = lib.mkForce null;
+ defaultGateway6 = lib.mkForce null;
};
systemd.network = {
@@ -59,8 +54,9 @@
networks.enp98s0f0 = {
name = "enp98s0f0";
DHCP = "no";
- gateway = [ "51.210.113.254" ];
- address = [ "51.210.113.110" ];
+ #gateway = [ "51.210.113.254" ];
+ routes = [ { Gateway = "51.210.113.254"; GatewayOnLink = true; } ];
+ address = [ "51.210.113.110/32" ];
};
};
|
