From 06b5695b4a86933a6e353585e77c0c95581c303f Mon Sep 17 00:00:00 2001
From: muon <admin@muon.host>
Date: Sun, 29 Dec 2024 09:53:44 +0000
Subject: [PATCH] Add muop wg peer

---
 modules/nixos/core/nix.nix         | 77 +++++++++++++++---------------
 modules/nixos/server/wireguard.nix | 10 ++--
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix
index e8842ff..cabe731 100644
--- a/modules/nixos/core/nix.nix
+++ b/modules/nixos/core/nix.nix
@@ -4,44 +4,43 @@
     mods.nix.clean.enable = lib.mkEnableOption "enables nix auto cleaning";
   };
 
-  config =
-    let flake = "${config.environment.sessionVariables.XDG_CONFIG_HOME}/home";
-    in {
-      system.autoUpgrade = {
-        enable = config.mods.nix.upgrade.enable;
-        flake = flake;
-        flags = [ "--commit-lock-file" "-L" ];
-        dates = "02:00";
-        randomizedDelaySec = "45min";
-      };
-
-      programs.nh = {
-        enable = true;
-        clean.enable = config.mods.nix.clean.enable;
-        clean.extraArgs = "--keep-since 4d --keep 3";
-        flake = flake;
-      };
-
-      nix.settings.experimental-features = [ "nix-command" "flakes" ];
-      nix.settings = {
-        substituters = [
-          "https://cache.nixos.org"
-          "https://nix-community.cachix.org"
-          "https://nixpkgs-unfree.cachix.org"
-          "https://hyprland.cachix.org"
-        ];
-        trusted-public-keys = [
-          "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-          "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
-          "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        ];
-      };
-
-      environment.systemPackages = with pkgs; [
-        inputs.nix-alien.packages.${system}.nix-alien
-        colmena
-      ];
-      programs.nix-ld.enable = true;
+  config = let flake = "/home/${config.mods.user.name}/.config/home";
+  in {
+    system.autoUpgrade = {
+      enable = config.mods.nix.upgrade.enable;
+      flake = flake;
+      flags = [ "--commit-lock-file" "-L" ];
+      dates = "02:00";
+      randomizedDelaySec = "45min";
     };
+
+    programs.nh = {
+      enable = true;
+      clean.enable = config.mods.nix.clean.enable;
+      clean.extraArgs = "--keep-since 4d --keep 3";
+      flake = flake;
+    };
+
+    nix.settings.experimental-features = [ "nix-command" "flakes" ];
+    nix.settings = {
+      substituters = [
+        "https://cache.nixos.org"
+        "https://nix-community.cachix.org"
+        "https://nixpkgs-unfree.cachix.org"
+        "https://hyprland.cachix.org"
+      ];
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      ];
+    };
+
+    environment.systemPackages = with pkgs; [
+      inputs.nix-alien.packages.${system}.nix-alien
+      colmena
+    ];
+    programs.nix-ld.enable = true;
+  };
 }
diff --git a/modules/nixos/server/wireguard.nix b/modules/nixos/server/wireguard.nix
index f49d998..f13a571 100644
--- a/modules/nixos/server/wireguard.nix
+++ b/modules/nixos/server/wireguard.nix
@@ -45,17 +45,21 @@
         '';
 
         peers = [
-          { # peer0
+          { # peer0 - muon
             publicKey = "MDBdADwP/SE/T9cadXB1Mup7Dr3x+l6gBFBN83BU4Dg=";
             presharedKeyFile = "/home/muon/wireguard-keys/psk-muon";
             allowedIPs = [ "10.0.0.2/32" "fdc9:281f:04d7:9ee9::2/128" ];
           }
-          { # peer1
+          { # peer1 - muho
             publicKey = "ohf/tGV9bjDDh/i9U5+DNvFtn+Glm8Wy1ieHoPvXfCo=";
             presharedKeyFile = "/home/muon/wireguard-keys/psk-muho";
             allowedIPs = [ "10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128" ];
           }
-          # More peers can be added here.
+          { # peer2 - muop
+            publicKey = "PgWVukvuXexAl42xk8jdysa28xcYZiV3RduaN9j3Axo=";
+            presharedKeyFile = "/home/muon/wireguard-keys/psk-muop";
+            allowedIPs = [ "10.0.0.4/32" "fdc9:281f:04d7:9ee9::4/128" ];
+          }
         ];
       };
     };