From 15053e74e014072e4d27b35f170935524dfce2b1 Mon Sep 17 00:00:00 2001
From: muon <admin@muon.host>
Date: Sun, 29 Dec 2024 09:46:52 +0000
Subject: [PATCH] Add muop to wireguard

---
 hosts/muon/configuration.nix   |  2 +-
 hosts/muop/configuration.nix   |  2 +-
 modules/nixos/core/network.nix |  6 ++-
 modules/nixos/core/nix.nix     | 70 +++++++++++++++++-----------------
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix
index fa254af..c2a71dc 100644
--- a/hosts/muon/configuration.nix
+++ b/hosts/muon/configuration.nix
@@ -37,7 +37,7 @@ in {
   mods.server.sync.enable = true;
   mods.tailscale.enable = true;
   mods.openvpn.enable = false;
-  mods.wireguard.enable = true;
+  mods.wireguard.id = 2;
   mods.i2p.enable = true;
 
   services.xserver.windowManager.i3.enable = true;
diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix
index a535882..625f0c4 100644
--- a/hosts/muop/configuration.nix
+++ b/hosts/muop/configuration.nix
@@ -33,7 +33,7 @@ in {
   mods.server.sync.enable = true;
   mods.tailscale.enable = false;
   mods.openvpn.enable = false;
-  mods.wireguard.enable = false;
+  mods.wireguard.id = 4;
 
   services.xserver.windowManager.i3.enable = true;
 
diff --git a/modules/nixos/core/network.nix b/modules/nixos/core/network.nix
index c82cb19..9784c72 100644
--- a/modules/nixos/core/network.nix
+++ b/modules/nixos/core/network.nix
@@ -8,11 +8,12 @@ in with lib; {
   options.mods = {
     i2p.enable = mkEnableOption "enables i2p network";
     tailscale.enable = mkEnableOption "enables tailscale";
-    wireguard.enable = mkEnableOption "enables wireguard client";
+
     wireguard.id = mkOption {
       type = with types; nullOr ints.u8;
       default = null;
     };
+
     openvpn.enable = mkEnableOption "enables openvpn config";
     openvpn.config = let
       username = "${config.mods.user.name}";
@@ -79,5 +80,8 @@ in with lib; {
       };
     };
 
+    # gateway =
+    # "${pkgs.networkmanager}/bin/nmcli dev show ${interface} | ${pkgs.gnugrep}/bin/fgrep IP4.GATEWAY | ${pkgs.awk}/bin/awk {print $2}";
+
   };
 }
diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix
index 6aacb83..e8842ff 100644
--- a/modules/nixos/core/nix.nix
+++ b/modules/nixos/core/nix.nix
@@ -1,47 +1,47 @@
 { pkgs, lib, config, inputs, system, ... }: {
-
   options = {
     mods.nix.upgrade.enable = lib.mkEnableOption "enables nix auto upgrade";
     mods.nix.clean.enable = lib.mkEnableOption "enables nix auto cleaning";
   };
 
-  config = {
+  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";
+      };
 
-    system.autoUpgrade = {
-      enable = config.mods.nix.upgrade.enable;
-      flake = inputs.self.outPath;
-      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;
+      };
 
-    programs.nh = {
-      enable = true;
-      clean.enable = config.mods.nix.clean.enable;
-      clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = inputs.self.outPath;
-    };
+      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="
+        ];
+      };
 
-    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;
     };
-
-    environment.systemPackages = with pkgs; [
-      inputs.nix-alien.packages.${system}.nix-alien
-      colmena
-    ];
-    programs.nix-ld.enable = true;
-  };
 }