From aadb04c4bea2d31124bc9711909c86b445798101 Mon Sep 17 00:00:00 2001
From: developomp <developomp@gmail.com>
Date: Tue, 12 Oct 2021 14:30:12 +0900
Subject: [PATCH] simplified copy code and added rootless X prevention

---
 Xwrapper.config |  2 ++
 setup.sh        | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 Xwrapper.config

diff --git a/Xwrapper.config b/Xwrapper.config
new file mode 100644
index 0000000..d9903b7
--- /dev/null
+++ b/Xwrapper.config
@@ -0,0 +1,2 @@
+allowed_users=anybody
+needs_root_rights = yes
diff --git a/setup.sh b/setup.sh
index b904153..f2f589b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -117,8 +117,8 @@ setup_brave() {
 }
 
 setup_conky() {
-	cp ./.conky ~/.conky
-	cp ./autostart/conky.desktop ~/.config/autostart/conky.desktop
+	cp ./.conky/ ~
+	cp ./autostart/conky.desktop ~/.config/autostart
 
 	package_install                              \
 		conky                                    \
@@ -314,6 +314,8 @@ setup_gnome() {
 		nvidia                    `# nvidia GPU support`                                      \
 		optimus-manager-qt        `# https://github.com/Shatur/optimus-manager-qt`            \
 
+	# prevent rootless X
+	cp ./Xwrapper.config /etc/X11/
 	load_dconf "gnome-desktop-interface.conf"
 	sudo systemctl enable gdm
 	sudo systemctl enable optimus-manager
@@ -542,7 +544,7 @@ setup_vim() {
 	package_install                        \
 		vim-plug    `# vim plugin manager` \
 
-	cp .vimrc ~/.vimrc
+	cp .vimrc ~
 }
 
 setup_virtualbox() {
@@ -615,7 +617,7 @@ setup_zsh() {
 		# install powerlevel10k theme
 		git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
 
-		cp .zshrc ~/.zshrc
+		cp .zshrc ~
 	else
 		log "zsh already configured. Skipping."
 	fi