From 850b7bdc02e815b3c0f4977f24e5d5aec1ca0829 Mon Sep 17 00:00:00 2001
From: yuri <yuri@nekover.se>
Date: Mon, 12 Aug 2024 20:14:13 +0200
Subject: [PATCH] Update valkyrie IP

---
 config/hosts/mastodon/mastodon.nix |  4 ++--
 config/hosts/valkyrie/services.nix |  2 +-
 flake.lock                         | 17 -----------------
 flake.nix                          |  7 +++----
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix
index a1d82d2..9abd69d 100644
--- a/config/hosts/mastodon/mastodon.nix
+++ b/config/hosts/mastodon/mastodon.nix
@@ -1,4 +1,4 @@
-{ pkgs, nixpkgs-mastodon-4-2-10, ... }:
+{ pkgs, nixpkgs-unstable, ... }:
 let
   mastodonNekoversePatches = pkgs.fetchgit {
     url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git";
@@ -25,7 +25,7 @@ let
       yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE=";
     });
   };
-  pkgs-overlay = nixpkgs-mastodon-4-2-10.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay;
+  pkgs-overlay = nixpkgs-unstable.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay;
   vapidPublicKey = pkgs.writeText "vapid-public-key" "BDCbFEDCZ8eFuWr3uEq4Qc30UFZUQeNpF8OCw6OjPwAtaKS1yTM3Ue749Xjqy5WhBDjakzlixh4Gk7gluUhIdsU=";
 in
 {
diff --git a/config/hosts/valkyrie/services.nix b/config/hosts/valkyrie/services.nix
index 5af708c..dc0fa6d 100644
--- a/config/hosts/valkyrie/services.nix
+++ b/config/hosts/valkyrie/services.nix
@@ -3,7 +3,7 @@ let
   wireguard-nat-nftables = import ../../../pkgs/wireguard-nat-nftables pkgs;
   config = pkgs.writeText "wireguard-nat-nftables-config" (builtins.toJSON {
     interface = "ens3";
-    interface_address = "172.16.4.180";
+    interface_address = "172.16.4.239";
     wg_interface = "wg0";
     pubkey_port_mapping = {
       # okayu
diff --git a/flake.lock b/flake.lock
index 491040e..a6fd892 100644
--- a/flake.lock
+++ b/flake.lock
@@ -115,22 +115,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-mastodon-4-2-10": {
-      "locked": {
-        "lastModified": 1720106533,
-        "narHash": "sha256-m1f/yXrCX3czYSVvBz5jdJ41dcCVsKlSIrnH0i83L6U=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e8f680e000d5c5b4a0ff998e6423951bcf06ba35",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e8f680e000d5c5b4a0ff998e6423951bcf06ba35",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1722685361,
@@ -167,7 +151,6 @@
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-mastodon-4-2-10": "nixpkgs-mastodon-4-2-10",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
       }
diff --git a/flake.nix b/flake.nix
index 876a711..5cf2232 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
-    nixpkgs-mastodon-4-2-10.url = "github:NixOS/nixpkgs/e8f680e000d5c5b4a0ff998e6423951bcf06ba35";
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -11,7 +10,7 @@
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixpkgs-mastodon-4-2-10, nixos-generators, simple-nixos-mailserver, ... }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, ... }@inputs:
   let
     hosts = import ./hosts.nix inputs;
     helper = import ./helper.nix inputs;
@@ -29,7 +28,7 @@
         nodeNixpkgs = builtins.mapAttrs (name: host: host.pkgs) hosts;
 
         specialArgs = {
-          inherit nixpkgs-unstable nixpkgs-master nixpkgs-mastodon-4-2-10 hosts simple-nixos-mailserver;
+          inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver;
 
           # Provide environment for secret key command
           keyCommandEnv = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" ];
@@ -39,7 +38,7 @@
 
     hydraJobs = {
       nixConfigurations = builtins.mapAttrs (host: helper.generateNixConfiguration host {
-        inherit nixpkgs-unstable nixpkgs-master nixpkgs-mastodon-4-2-10 hosts simple-nixos-mailserver;
+        inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver;
       }) hosts;
     };