diff --git a/homelab/stacks/wireguard/.env b/homelab/stacks/wireguard/.env
deleted file mode 100644
index 8bb19ec6..00000000
--- a/homelab/stacks/wireguard/.env
+++ /dev/null
@@ -1 +0,0 @@
-DOCKER_DATA=/home/admin/data/wireguard
\ No newline at end of file
diff --git a/homelab/stacks/wireguard/docker-compose.yml b/homelab/stacks/wireguard/docker-compose.yml
index 32382e18..06b179f1 100644
--- a/homelab/stacks/wireguard/docker-compose.yml
+++ b/homelab/stacks/wireguard/docker-compose.yml
@@ -3,17 +3,16 @@ services:
     image: weejewel/wg-easy:latest
     container_name: wireguard_wg-easy
     restart: "no"
-    env_file:
-      - path: ./wireguard.env
-        required: true
-      - path: ./wireguard_secrets.env
-        required: false
+    environment:
+      WG_HOST: vpn.jafner.net
+      WG_PORT: 53820
+      WG_DEFAULT_DNS: 192.168.1.1
     ports:
       - 53820:51820/udp
     networks:
       - web
     volumes:
-      - ${DOCKER_DATA}/wg-easy:/etc/wireguard
+      - ${APPDATA}/wireguard:/etc/wireguard
     cap_add:
       - NET_ADMIN
       - SYS_MODULE
diff --git a/homelab/stacks/wireguard/stack.nix b/homelab/stacks/wireguard/stack.nix
new file mode 100644
index 00000000..d9bc7c7a
--- /dev/null
+++ b/homelab/stacks/wireguard/stack.nix
@@ -0,0 +1,21 @@
+{ sys, ... }: let stack = "wireguard"; in {
+  home-manager.users."${sys.username}".home.file = {
+    "${stack}" = {
+      enable = true;
+      recursive = true;
+      source = ./.;
+      target = "stacks/${stack}/";
+    };
+    "${stack}/.env" = {
+      enable = true;
+      text = ''APPDATA=${sys.dataDirs.appdata}'';
+      target = "stacks/${stack}/.env";
+    };
+  };
+  sops.secrets."${stack}" = { 
+    sopsFile = ./secrets.env;
+    key = "";
+    mode = "0440";
+    owner = sys.username;
+  };
+}
\ No newline at end of file
diff --git a/homelab/stacks/wireguard/wireguard.env b/homelab/stacks/wireguard/wireguard.env
deleted file mode 100644
index 6abe064e..00000000
--- a/homelab/stacks/wireguard/wireguard.env
+++ /dev/null
@@ -1,3 +0,0 @@
-WG_HOST=vpn.jafner.net
-WG_PORT=53820
-WG_DEFAULT_DNS=192.168.1.1
\ No newline at end of file