From 7881355f004f48990dd53885a2fa4b0cfbc5c0ba Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Sun, 2 Mar 2025 14:00:46 +0100
Subject: [PATCH] Paths changed, Wirepy now runs as normal user, Required files
 and folders are now created. From now on suitable for multi-user system

---
 .idea/workspace.xml                    |   4 +-
 Changelog                              |  15 ++++--
 Wire-Py.desktop                        |   2 +-
 __pycache__/cls_mth_fc.cpython-312.pyc | Bin 11820 -> 11755 bytes
 cls_mth_fc.py                          |  68 +++++++++++++++++++------
 install                                |  30 +++++------
 open_gitea.py                          |   5 --
 org.wirepy.policy                      |  16 ------
 run_as                                 |   2 -
 settings.conf => settings              |   0
 start_wg.py                            |   2 +-
 wg_main.py                             |  51 ++++++++++---------
 wg_start.service                       |   4 +-
 wirepy.py                              |   6 ---
 14 files changed, 110 insertions(+), 95 deletions(-)
 delete mode 100755 open_gitea.py
 delete mode 100644 org.wirepy.policy
 delete mode 100755 run_as
 rename settings.conf => settings (100%)
 delete mode 100755 wirepy.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5c6d238..1b6ddde 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -350,7 +350,7 @@
       <option name="project" value="LOCAL" />
       <updated>1727379755537</updated>
     </task>
-    <task id="LOCAL-00055" summary="fix installer add .keys file">
+    <task id="LOCAL-00055" summary="fix installer add keys file">
       <option name="closed" value="true" />
       <created>1727380793216</created>
       <option name="number" value="00055" />
@@ -579,7 +579,7 @@
     <MESSAGE value="info icon shadow fix end msg Export fix to" />
     <MESSAGE value="little fixes" />
     <MESSAGE value="fix msg_boxes when tunnel list = 0 a Start, Delete and Export" />
-    <MESSAGE value="fix installer add .keys file" />
+    <MESSAGE value="fix installer add keys file" />
     <MESSAGE value="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil.&#10;Start with version number 1.4.7&#10;Message window size corrected so text is displayed better" />
     <MESSAGE value="Fix msg_window and remove x , y argument&#10;Install further adapted and with colored&#10;text if user is not in group sudo or wheel.&#10;Added to install Opensuse for installation" />
     <MESSAGE value=" - Menu add &#10; - New Modern Dark and Light(default) Theme" />
diff --git a/Changelog b/Changelog
index f1d0035..443a545 100644
--- a/Changelog
+++ b/Changelog
@@ -6,8 +6,17 @@ My standard System: Linux Mint 22 Cinnamon
  - os import in cls_mth_fc.py replaced by other methods
  - If Wire-Py already runs, prevent further start
  - for loops with lists replaced by List Comprehensions
- - Update search after start of Wire-Py
+ - Crypt and Decrypt Config Files in ~/.config/wire_py
 
+  ### Added
+02-03-2025
+
+ - Fix ipv6 in Config File on import
+ - Wirepy run now as user
+ - settings, keys and Config Files now in ~/.config/wire_py
+ - For new users, the required files are created and autostart service is started. 
+ - Tunnels are now read from the directory to view them in the list. 
+   To display only own tunnels, and read errors are minimized.
 
   ### Added
 10-11-2024
@@ -57,7 +66,7 @@ My standard System: Linux Mint 22 Cinnamon
   ### Added
 27-10-2024
 
- - Add Autoconnect settings to settings.conf
+ - Add Autoconnect settings to settings
 
 
   ### Added
@@ -65,7 +74,7 @@ My standard System: Linux Mint 22 Cinnamon
 
  - Add run_as Bash script and open_gitea.py python script
  - Add Tooltip disable/enable
- - Rename settings to settings.conf for theme, updates and tooltip enable in one file
+ - Rename settings to settings for theme, updates and tooltip enable in one file
 
 
   ### Added
diff --git a/Wire-Py.desktop b/Wire-Py.desktop
index 19e5690..cda2352 100755
--- a/Wire-Py.desktop
+++ b/Wire-Py.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Wire-Py
-Exec=/usr/bin/wirepy.py
+Exec=/usr/local/bin/wg_main.py
 Terminal=false
 Categories=Network;
 Icon=/usr/share/icons/wp-icons/128/wg_vpn.png
diff --git a/__pycache__/cls_mth_fc.cpython-312.pyc b/__pycache__/cls_mth_fc.cpython-312.pyc
index 9e274fb9ef4312970d12bc7ac9f5d2e207404956..3856fbfde5f16acf6bc49800ab10890f09d8ef30 100644
GIT binary patch
delta 2760
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

delta 2876
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

diff --git a/cls_mth_fc.py b/cls_mth_fc.py
index 811c862..3244eb4 100755
--- a/cls_mth_fc.py
+++ b/cls_mth_fc.py
@@ -5,6 +5,7 @@ import locale
 import os
 import shutil
 import subprocess
+from subprocess import check_call
 import tkinter as tk
 import zipfile
 from datetime import datetime
@@ -19,8 +20,41 @@ gettext.bindtextdomain(APP, LOCALE_DIR)
 gettext.textdomain(APP)
 _ = gettext.gettext
 
-wg_set = Path('/etc/wire_py/settings.conf')
-_u = Path.read_text(Path('/tmp/_u'))
+def dirs_and_files():
+
+    pth = Path.home() / '.config/wire_py'
+    pth.mkdir(parents=True, exist_ok=True)
+    sett = Path.home() / '.config/wire_py/settings'
+    ks = Path.home() / '.config/wire_py/keys'
+
+    if sett.exists():
+        pass
+
+    else:
+        sett.touch()
+        sett.write_text('[UPDATES]\non\n[THEME]\nlight\n[TOOLTIP]\nTrue\n[AUTOSTART ON]\noff')
+
+    if ks.exists():
+        pass
+
+    else:
+        ks.touch()
+
+def files_for_autostart():
+
+    pth2 = Path.home() / '.config/systemd/user'
+    pth2.mkdir(parents=True, exist_ok=True)
+    wg_ser = Path.home() / '.config/systemd/user/wg_start.service'
+
+    if wg_ser.exists():
+        pass
+
+    else:
+        wg_ser.touch()
+        sett.write_text('[Unit]\nDescription=Automatic Tunnel Start\nAfter=network-online.target\n\n[Service]\nType=oneshot\nExecStartPre=/bin/sleep 5\nExecStart=/usr/local/bin/start_wg.py\n[Install]\nWantedBy=default.target')
+        check_call(['systemctl', '--user', 'enable', wg_start.service])
+
+wg_set = Path(Path.home() / '.config/wire_py/settings')
 
 
 class GiteaUpdate:
@@ -53,10 +87,10 @@ class GiteaUpdate:
     @staticmethod
     def download(urld, down_ok_image, down_not_ok_image, res):
         try:
-            to_down = 'wget -qP ' + str(_u) + ' ' + urld
+            to_down = 'wget -qP ' + str(Path.home()) + ' ' + urld
             result = subprocess.call(to_down, shell=True)
             if result == 0:
-                shutil.chown(str(_u) + f'/{res}.zip', 1000, 1000)
+                shutil.chown(str(Path.home()) + f'/{res}.zip', 1000, 1000)
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/info.png'
                 ii = down_ok_image
@@ -145,6 +179,8 @@ class Tunnel:
         for items in dictlist:
             if items == '=':
                 dictlist.remove(items)
+            if items == '::/0':
+                dictlist.remove(items)    
 
         ''' Here is the beginning (Loop) of convert List to Dictionary '''
         for _ in dictlist:
@@ -189,15 +225,16 @@ class Tunnel:
         return active
 
     """
-    Shows all existing Wireguard tunnels
+    Shows all existing Wireguard tunnels a login user
     """
     @staticmethod
     def list():
-        wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
-
-        ''' tl = Tunnel list # Show of 4.Element in list '''
-        tl = wg_s[::3]
-        return tl
+        dirname = Path.home() / '.config/wire_py/'
+        wg_s = os.listdir(dirname)
+        wg_s.remove('keys')
+        wg_s.remove('settings')
+        
+        return wg_s
 
     """
     This will export the tunnels.
@@ -206,21 +243,20 @@ class Tunnel:
     """
     @staticmethod
     def export():
-        _u1 = str(_u[6:])
         now_time = datetime.now()
         now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
         tl = Tunnel.list()
 
         try:
             if len(tl) != 0:
-                wg_tar = str(_u) + '/' + now_datetime
-                shutil.copytree('/etc/wire_py', '/tmp/wire_py', dirs_exist_ok=True)
+                wg_tar = str(Path.home()) + '/' + now_datetime
+                shutil.copytree(Path.home() / '.config/wire_py/', '/tmp/wire_py', dirs_exist_ok=True)
                 source = Path('/tmp/wire_py')
                 Path.unlink(Path(source) / 'wg_py', missing_ok=True)
-                Path.unlink(Path(source) / '.keys', missing_ok=True)
-                Path.unlink(Path(source) / 'settings.conf', missing_ok=True)
+                Path.unlink(Path(source) / 'keys', missing_ok=True)
+                Path.unlink(Path(source) / 'settings', missing_ok=True)
                 shutil.make_archive(wg_tar, 'zip', source)
-                shutil.chown(wg_tar + '.zip', 1000, 1000)
+                #shutil.chown(wg_tar + '.zip', 1000, 1000)
                 shutil.rmtree(source)
                 with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
                     if len(zf.namelist()) != 0:
diff --git a/install b/install
index 9978256..c10ecfa 100755
--- a/install
+++ b/install
@@ -6,24 +6,22 @@ BLUE='\033[30;1;34m'
 
 install_file_with(){
   clear
+  mkdir -p ~/.config/wire_py && touch ~/.config/wire_py/keys && cp -u settings ~/.config/wire_py/ && \
+  mkdir -p ~/.config/systemd/user && cp -u wg_start.service ~/.config/systemd/user/ && \
+  systemctl --user enable wg_start.service
   sudo apt install python3-tk && \
-  sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
-  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /etc/wire_py/ && \
+  sudo cp -u wg_main.py start_wg.py cls_mth_fc.py /usr/local/bin/ && \
   sudo cp -uR wp-icons lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
-  sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
   sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
-  sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
-  sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
-  sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
-  sudo cp -u wg_start.service /lib/systemd/system/ && \
-  sudo systemctl enable wg_start.service
+  sudo ln -sf /usr/local/bin/wg_main.py /usr/local/bin/wirepy && \
+  sudo cp -u Wire-Py.desktop /usr/share/applications/ 
   }
 
 install_arch_d(){
   clear
   sudo pacman -S --noconfirm tk python3 python-requests && \
-  sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
-  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf  /etc/wire_py/ && \
+  sudo cp -u wg_main.py start_wg.py cls_mth_fc.py && \
+  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && sudo cp -u settings  /etc/wire_py/ && \
   sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
   sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
   sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
@@ -91,9 +89,9 @@ elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
         if ! which python3-tkinter &> /dev/null
             then sudo dnf install python3-tkinter -y
 
-                sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
-                sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
-                sudo cp -u settings.conf /etc/wire_py/ && \
+                sudo cp -u wg_main.py start_wg.py cls_mth_fc.py && \
+                sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && \
+                sudo cp -u settings /etc/wire_py/ && \
                 sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
                 sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
                 sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
@@ -108,9 +106,9 @@ elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
     then
         if ! which python311-tk &> /dev/null
             then sudo zypper install python311-tk
-                 sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
-                 sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
-                 sudo cp -u settings.conf /etc/wire_py/ && \
+                 sudo cp -u wg_main.py start_wg.py cls_mth_fc.py && \
+                 sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && \
+                 sudo cp -u settings /etc/wire_py/ && \
                  sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
                  sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
                  sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
diff --git a/open_gitea.py b/open_gitea.py
deleted file mode 100755
index 4fdbad1..0000000
--- a/open_gitea.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/python3
-
-import webbrowser
-
-webbrowser.open('https://git.ilunix.de/punix/Wire-Py')
\ No newline at end of file
diff --git a/org.wirepy.policy b/org.wirepy.policy
deleted file mode 100644
index c4c1694..0000000
--- a/org.wirepy.policy
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-  <vendor>Project Wire-Py</vendor>
-  <vendor_url>https://git.ilunix.de/punix/Wire-Py</vendor_url>
-  <icon_name>wg-vpn</icon_name>
-  <action id="org.wirepy">
-    <defaults>
-      <allow_any>auth_admin_keep</allow_any>
-      <allow_inactive>auth_admin_keep</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/wg_main.py</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-  </action>
-</policyconfig>
diff --git a/run_as b/run_as
deleted file mode 100755
index d15cff4..0000000
--- a/run_as
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/usr/bin/./open_gitea.py
\ No newline at end of file
diff --git a/settings.conf b/settings
similarity index 100%
rename from settings.conf
rename to settings
diff --git a/start_wg.py b/start_wg.py
index 3140e90..b11f828 100755
--- a/start_wg.py
+++ b/start_wg.py
@@ -2,7 +2,7 @@
 from subprocess import check_call
 from pathlib import Path
 
-path_to_file = Path('/etc/wire_py/settings.conf')
+path_to_file = Path(Path.home() / '.config/wire_py/settings')
 
 with open(path_to_file, 'r') as a_con:
     lines = a_con.readlines()
diff --git a/wg_main.py b/wg_main.py
index 8d81627..938f54f 100755
--- a/wg_main.py
+++ b/wg_main.py
@@ -2,6 +2,7 @@
 
 import gettext
 import locale
+import webbrowser
 import os
 import shutil
 import subprocess
@@ -9,12 +10,12 @@ import tkinter as tk
 from pathlib import Path
 from subprocess import check_call
 from tkinter import filedialog, ttk, TclError
-from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, _u, wg_tips, wg_set)
+from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, wg_tips, dirs_and_files, wg_set, files_for_autostart)
 
 tcl_path = Path('/usr/share/TK-Themes')
 
 ''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
-version = 'v. 2.02.2425'
+version = 'v. 2.03.0225'
 
 res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases', version)
 
@@ -26,7 +27,6 @@ gettext.bindtextdomain(APP, LOCALE_DIR)
 gettext.textdomain(APP)
 _ = gettext.gettext
 
-
 class MainWindow(tk.Tk):
 
     def __init__(self, *args, **kwargs):
@@ -141,9 +141,7 @@ class FrameWidgets(ttk.Frame):
 
         def info():
             def link_btn():
-                _u1 = str(_u[6:])
-                path_to_file = Path('/usr/bin/./run_as')
-                check_call(['su', _u1, path_to_file])
+                webbrowser.open('https://git.ilunix.de/punix/Wire-Py')
 
             """img_w, img_i, w_title, w_txt , txt2, com hand over"""
             iw = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
@@ -332,7 +330,7 @@ class FrameWidgets(ttk.Frame):
         ''' Listbox with Scrollbar '''
 
         def enable_check_box(_):
-
+            files_for_autostart()    
             if self.l_box.size() != 0:
                 self.wg_autostart.configure(state='normal')
                 self.lb_rename.config(state='normal')
@@ -351,7 +349,7 @@ class FrameWidgets(ttk.Frame):
         ''' Tunnel List '''
         self.tl = Tunnel.list()
         for tunnels in self.tl:
-            self.l_box.insert("end", tunnels)
+            self.l_box.insert("end", tunnels[:-5])
             self.l_box.update()
 
         def list_empty_enter(event):
@@ -382,7 +380,7 @@ class FrameWidgets(ttk.Frame):
         ''' Button Vpn '''
         if self.a != '':
             self.stop()
-            wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
+            wg_read = str(Path.home()) + '/.config/wire_py/' + str(self.a + '.conf')
             with open(wg_read, 'r') as file:
                 data = Tunnel.con_to_dict(file)
 
@@ -420,7 +418,7 @@ class FrameWidgets(ttk.Frame):
             try:
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
-                with open('/etc/wire_py/' + select_tl + '.conf', 'r+') as file2:
+                with open(str(Path.home()) + '/.config/wire_py/' + select_tl + '.conf', 'r+') as file2:
                     key = Tunnel.con_to_dict(file2)
                     pre_key = key[3]
                 check_call(['nmcli', 'connection', 'delete', select_tl])
@@ -434,14 +432,14 @@ class FrameWidgets(ttk.Frame):
                         self.selected_option.set(0)
                         self.autoconnect_var.set(_('no Autoconnect'))
 
-                Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf'))
-                with open('/etc/wire_py/.keys', 'r') as readfile:
-                    with open('/etc/wire_py/.keys2', 'w') as writefile:
+                Path.unlink(str(Path.home()) + '/.config/wire_py/' + str(select_tl + '.conf'))
+                with open(str(Path.home()) + '/.config/wire_py/keys', 'r') as readfile:
+                    with open(str(Path.home()) +  '/.config/wire_py/keys2', 'w') as writefile:
                         for line in readfile:
                             if pre_key not in line.strip("\n"):
                                 writefile.write(line)
-                file_one = Path('/etc/wire_py/.keys2')
-                file_two = file_one.with_name('.keys')
+                file_one = Path(str(Path.home()) +  '/.config/wire_py/keys2')
+                file_two = file_one.with_name('keys')
                 file_one.replace(file_two)
                 self.wg_autostart.configure(state='disabled')
 
@@ -636,7 +634,7 @@ class FrameWidgets(ttk.Frame):
 
                     ''' nmcli connection modify old connection.id iphone '''
                     check_call(['nmcli', 'connection', 'modify', select_tl, 'connection.id', self.lb_rename.get()])
-                    source = Path('/etc/wire_py') / str(select_tl + '.conf')
+                    source = Path.home() / '.config/wire_py' / str(select_tl + '.conf')
                     destination = source.with_name(str(self.lb_rename.get() + '.conf'))
                     source.replace(destination)
                     self.l_box.delete(self.select_tunnel[0])
@@ -738,8 +736,11 @@ class FrameWidgets(ttk.Frame):
         If True then the name is automatically shortened to 12 characters and then imported.
         If in each case false comes out, a corresponding window comes to inform the user that something is wrong.
         """
+
+        dirs_and_files()
+
         try:
-            filepath = filedialog.askopenfilename(initialdir=str(_u), title=_('Select Wireguard config File'),
+            filepath = filedialog.askopenfilename(initialdir=str(Path.home()), title=_('Select Wireguard config File'),
                                                   filetypes=[(_('WG config files'), '*.conf')], )
 
             with open(filepath, 'r') as file:
@@ -753,7 +754,7 @@ class FrameWidgets(ttk.Frame):
                     key = Tunnel.con_to_dict(file)
                     pre_key = key[3]
                     if len(pre_key) != 0:
-                        with open('/etc/wire_py/.keys', 'r') as readfile:
+                        with open(str(Path.home()) + '/.config/wire_py/keys', 'r') as readfile:
                             p_key = readfile.readlines()
                             if pre_key in p_key or pre_key + '\n' in p_key:
                                 """img_w, img_i, w_title, w_txt hand over"""
@@ -765,13 +766,13 @@ class FrameWidgets(ttk.Frame):
 
                             else:
 
-                                with open('/etc/wire_py/.keys', 'a') as keyfile:
+                                with open(str(Path.home()) +  '/.config/wire_py/keys', 'a') as keyfile:
                                     keyfile.write(pre_key + '\r')
                                     if len(path_split1) > 17:
-                                        p1 = shutil.copy(filepath, Path('/etc/wire_py/'))
+                                        p1 = shutil.copy(filepath, str(Path.home()) + '/.config/wire_py/')
                                         path_split = path_split1[len(path_split1) - 17:]
-                                        os.rename(p1, Path('/etc/wire_py') / str(path_split))
-                                        new_conf = '/etc/wire_py/' + path_split
+                                        os.rename(p1, str(Path.home()) + '/.config/wire_py/' + str(path_split))
+                                        new_conf = str(Path.home()) + '/.config/wire_py/' + path_split
                                         if self.a != '':
                                             check_call(['nmcli', 'connection', 'down', Tunnel.active()])
                                             self.label_empty()
@@ -780,7 +781,7 @@ class FrameWidgets(ttk.Frame):
                                                                  'wireguard', 'file', new_conf], text=True)
 
                                     else:
-                                        shutil.copy(filepath, Path('/etc/wire_py/'))
+                                        shutil.copy(filepath, str(Path.home()) + '/.config/wire_py/')
                                         if self.a != '':
                                             check_call(['nmcli', 'connection', 'down', Tunnel.active()])
                                             self.label_empty()
@@ -865,7 +866,7 @@ class FrameWidgets(ttk.Frame):
                                     self.StrVar.set(self.a)
                                     self.color_label()
                                     self.stop()
-                                    wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
+                                    wg_read = str(Path.home()) + '/.config/wire_py/' + str(self.a + '.conf')
                                     with open(wg_read, 'r') as file_for_key:
                                         data = Tunnel.con_to_dict(file_for_key)
 
@@ -1061,7 +1062,7 @@ class FrameWidgets(ttk.Frame):
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
                 check_call(['nmcli', 'connection', 'up', select_tl])
-                wg_read = Path('/etc/wire_py') / str(select_tl + '.conf')
+                wg_read = str(Path.home()) + '/.config/wire_py/' + str(select_tl + '.conf')
                 with open(wg_read, 'r') as file:
                     data = Tunnel.con_to_dict(file)
 
diff --git a/wg_start.service b/wg_start.service
index cc5f2bb..0352b4e 100644
--- a/wg_start.service
+++ b/wg_start.service
@@ -5,6 +5,6 @@ After=network-online.target
 [Service]
 Type=oneshot
 ExecStartPre=/bin/sleep 5
-ExecStart=/usr/bin/start_wg.py
+ExecStart=/usr/local/bin/start_wg.py
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/wirepy.py b/wirepy.py
deleted file mode 100755
index 592fa67..0000000
--- a/wirepy.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/python3
-from subprocess import check_call
-from pathlib import Path
-
-Path.write_text(Path('/tmp/_u'), str(Path.home()))
-check_call(['pkexec', '/usr/bin/wg_main.py'])