4 files changed, 25 insertions, 14 deletions
diff --git a/nixos/hosts/opus/default.nix b/nixos/hosts/opus/default.nix
index 8290866..b0bf347 100644
--- a/nixos/hosts/opus/default.nix
+++ b/nixos/hosts/opus/default.nix
@@ -35,9 +35,10 @@
     ../../modules/features/gst-codecs
     ../../modules/features/fonts
     ../../modules/features/desktop-apps
-    ../../modules/features/dev-tools
-    ../../modules/features/wireshark
-    ../../modules/features/mouse
+     ../../modules/features/dev-tools
+     ../../modules/features/vpn-utils
+     ../../modules/features/wireshark
+     ../../modules/features/mouse
   ];
 
   # ────────────────────────────────────────────────────────────────────────
@@ -83,13 +84,7 @@
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
   };
-  # Throne: privacy-oriented game overlay / microtransactions blocker.
-  programs.throne = {
-    enable = true;
-    tunMode.enable = true;
-  };
-  services.gnome.gnome-keyring.enable = true;
-  # Wine-based launchers for Windows games & apps.
+   # Wine-based launchers for Windows games & apps.
   environment.systemPackages = with pkgs; [
     pkgs.lutris
     pkgs.prismlauncher
diff --git a/nixos/modules/features/desktop-apps/default.nix b/nixos/modules/features/desktop-apps/default.nix
index 175938e..bbc7683 100644
--- a/nixos/modules/features/desktop-apps/default.nix
+++ b/nixos/modules/features/desktop-apps/default.nix
@@ -15,7 +15,6 @@
     pkgs.ayugram-desktop
     pkgs.legcord
     pkgs.vesktop
-    pkgs.amnezia-vpn
     obsidian
     obs-studio
     pkgs.qbittorrent
diff --git a/nixos/modules/features/vpn-utils/default.nix b/nixos/modules/features/vpn-utils/default.nix
new file mode 100644
index 0000000..258f0ef
--- /dev/null
+++ b/nixos/modules/features/vpn-utils/default.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+  programs.throne = {
+    enable = true;
+    tunMode.enable = true;
+  };
+
+  programs.amnezia-vpn.enable = true;
+
+  networking.wireguard.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    wireguard-tools
+    wireguard-ui
+    gnomeExtensions.wireguard-vpn-extension
+  ];
+}
+\ No newline at end of file
diff --git a/nixos/modules/system/network/default.nix b/nixos/modules/system/network/default.nix
index 5601ff8..588314e 100644
--- a/nixos/modules/system/network/default.nix
+++ b/nixos/modules/system/network/default.nix
@@ -2,8 +2,7 @@
 
 {
   networking.hostName = "opus";
-  networking.networkmanager.enable = true;
-  programs.amnezia-vpn.enable = true;
+   networking.networkmanager.enable = true;
 
   # Primary DNS via Mullvad DoT (Base mode).
   # When systemd-resolved is enabled, these servers are fed into its
@@ -36,4 +35,4 @@
     nssmdns4 = true;
     openFirewall = true;
   };
-}
-\ No newline at end of file
+}