From 81c753d78ed8a4d25ee5af755460af6bf9600d58 Mon Sep 17 00:00:00 2001 From: "Rory&::Emma" Date: Wed, 1 Nov 2023 17:13:31 +0000 Subject: Updates --- flake.lock | 52 +++++++++++++++++++-------------------- flake.nix | 2 +- host/Rory-nginx/configuration.nix | 1 + update.sh | 4 +-- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 3aa1386..23f1df6 100644 --- a/flake.lock +++ b/flake.lock @@ -164,11 +164,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1697931116, - "narHash": "sha256-KdjQQBavncOSLgv/AM/hwWH8GAYeP3O2XXLfXSuJzQ0=", + "lastModified": 1698795315, + "narHash": "sha256-fF5ScAWLMHXOuqsbLSG137kS1D+gr9JPtm4H2c4yBbU=", "owner": "nix-community", "repo": "home-manager", - "rev": "81ab14626273ca38cba947d9a989c9d72b5e7593", + "rev": "9bc7d84b8213255ecd5eb6299afdb77c36ece71d", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "mtxclientSrc": { "flake": false, "locked": { - "lastModified": 1697051830, - "narHash": "sha256-8KmvXUHoeeBcZ10SqFllMWEpzKafilgFc5MY3fAFAQI=", + "lastModified": 1698808746, + "narHash": "sha256-eZdBcuhHpyw1xAsGjdx9qgKLBqrIggO2P920cuITj7I=", "owner": "Nheko-reborn", "repo": "mtxclient", - "rev": "f878e29420c037f45b575fbd29a11cabce3c010a", + "rev": "72f9a20c048c3482386b0916ef76fb9f4d890be8", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nhekoSrc": { "flake": false, "locked": { - "lastModified": 1697929349, - "narHash": "sha256-vsUo8/LBFWxgU87V4w4HgjET7yxzDvlxYpTQmXT26nY=", + "lastModified": 1698816044, + "narHash": "sha256-bfJ1SNyQZtBUxOWj+gm4mG0U4hrV+JFdbrjEc1pC8Dg=", "owner": "Nheko-reborn", "repo": "nheko", - "rev": "724e38e67389a5c0047abc3a68663c44f2ad35a5", + "rev": "7823aceb58b5927c3674d08f475ef37fe0a43ec7", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1697459493, - "narHash": "sha256-HH8ePJIVAsiDHIdS4qnKQ9o4X0KTVGA9cfHBplKqpfs=", + "lastModified": 1698222534, + "narHash": "sha256-iF9C7C7eT8LVVWx5IOZ/8KKJT8AIw9A5aBA6vqS18l8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "b63b328577f1cb5839f8ecc4fd05040335d4a55a", + "rev": "a058cff4b09b3a398d8caa379b4dc96cfedd98c9", "type": "github" }, "original": { @@ -250,15 +250,15 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1697777081, - "narHash": "sha256-n2vQARhKevRGyeo+LAa8g+CdUQsdH/caNk8jnylcPhY=", - "owner": "NixOs", + "lastModified": 1698696950, + "narHash": "sha256-FHFL58t6lMumvWqwundC8fDDDLOIvc+JJBNIAlPjrDY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "679cadfdfed2b90311a247b2d6ef6dfd3d6cab73", + "rev": "017ef2132a5bda50bd713aeabce8f918502d4ec1", "type": "github" }, "original": { - "owner": "NixOs", + "owner": "NixOS", "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" @@ -266,11 +266,11 @@ }, "nixpkgs-rory": { "locked": { - "lastModified": 1695727562, - "narHash": "sha256-ON/1Gp508BTZVZ1MllTApqkeq5uwCOKl/m2t6OGcY1w=", + "lastModified": 1698837096, + "narHash": "sha256-XrvsL5+9JngJQv0gjomdmS5qUwvEhCWp32cdn2/ZfVA=", "owner": "TheArcaneBrony", "repo": "nixpkgs", - "rev": "b20f5df4486be87b6d502aa1d2945fcaf3c524f5", + "rev": "78b673f2c7be85ac7d54b19c85fb5daf61c654d8", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1697226376, - "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=", + "lastModified": 1697851979, + "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5", + "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", "type": "github" }, "original": { @@ -314,11 +314,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cde1e7b..bbfda08 100755 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ url = "github:TheArcaneBrony/nixpkgs/master"; }; nixpkgs-RoryNix = { - url = "github:NixOs/nixpkgs/nixos-23.05"; + url = "github:NixOS/nixpkgs/nixos-23.05"; }; botcore-v4 = { url = "gitlab:BotCore-Devs/BotCore-v4/staging"; diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 8b1a915..ea023d6 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -26,6 +26,7 @@ address = "10.10.10.2"; prefixLength = 16; } ]; + defaultGateway.interface = "ens18"; # extraHosts = '' # 127.0.0.1 rory.gay # 127.0.0.1 matrix.rory.gay diff --git a/update.sh b/update.sh index 6ce5622..a277a4e 100755 --- a/update.sh +++ b/update.sh @@ -4,9 +4,9 @@ if [ -d "nixpkgs" ]; then cd nixpkgs git remote add upstream https://github.com/NixOS/nixpkgs || git remote set-url upstream https://github.com/NixOS/nixpkgs git fetch --all -v - git rebase upstream/nixos-unstable -v + git rebase upstream/nixos-unstable -v && git push --force cd .. fi nix flake update -./build.sh / $HOSTNAME \ No newline at end of file +./build.sh / $HOSTNAME -- cgit 1.4.1