From 46c2f79a6ddda4f48d7e9a4a3a7b8af3f6442831 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Thu, 5 May 2022 18:10:31 +0200
Subject: [PATCH] add some tools and fix home

---
 README.md | 26 +++++++++++++++++++++++++-
 entry.sh  | 32 ++++++++++++++++----------------
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index f2fe720..305b96e 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,25 @@
-# laptop-scripts
\ No newline at end of file
+# laptop-scripts
+
+
+
+### TODO
+
+dpkg-reconfigure locales tzdata keyboard-configuration
+wifi settings
+zsh config
+tinc setup
+wireguard settings
+firefox profiles home/.mozzilla/firefox
+thunderbird profile home/.thunderbird
+jetbrains settings home/.config/JetBrains
+
+pidgin setting home/.purple
+
+home/Projects
+home/Mount
+home/Tools
+
+;ldnsutils wireguard resolvconf freecad
+
+systemctl enable tinc
+systemctl enable tinc@nodes.j3d1.de
diff --git a/entry.sh b/entry.sh
index a1b9cb7..8ecc82a 100755
--- a/entry.sh
+++ b/entry.sh
@@ -130,7 +130,7 @@ function second_stage(){
 	hostname $NEW_HOSTNAME
 	sed -i 's/main/main contrib non-free/g' /etc/apt/sources.list
 	apt update
-	apt install -y linux-image-amd64 grub2 cryptsetup cryptsetup-initramfs cryptsetup-suspend btrfs-progs lvm2 firmware-iwlwifi locales tzdata keyboard-configuration console-common zsh intel-microcode
+	apt install -y linux-image-amd64 grub2 cryptsetup cryptsetup-initramfs cryptsetup-suspend btrfs-progs lvm2 firmware-iwlwifi locales tzdata keyboard-configuration console-common zsh intel-microcode ldnsutils wireguard resolvconf
 	grub-install ${DEVICE}
 	update-grub
 	update-initramfs -k all -u
@@ -149,13 +149,11 @@ function second_stage(){
 	unset USER_PASSWORD
 
 	btrfs subvolume snapshot / /snap/$(date +%Y-%m-%d_user_gui)
-	apt install -y git wget materia-gtk-theme htop nmap arandr timeshift gparted
+	apt install -y git wget materia-gtk-theme htop nmap arandr timeshift gparted jq
 	apt install -y virt-manager telegram-desktop chromium firefox thunderbird geany vlc pidgin meld remmina gmpc
 	apt install -y gimp inkscape blender freecad kicad || true
 	btrfs subvolume snapshot / /snap/$(date +%Y-%m-%d_big_tools)
-	git clone https://github.com/robbyrussell/oh-my-zsh.git $HOME/.oh-my-zsh
-	chmod 0755 $HOME/.oh-my-zsh
-	chown -R jedi:jedi $HOME
+	
 	chsh --shell /usr/bin/zsh jedi
 	
 	echo second_stage done
@@ -177,6 +175,10 @@ function user_install(){
 	dbus-launch dconf write /org/mate/desktop/interface/icon-theme "'Adwaita'" || true
 	dbus-launch dconf write /org/mate/desktop/peripherals/mouse/cursor-theme "'Adwaita'" || true
 	
+	git clone https://github.com/robbyrussell/oh-my-zsh.git $HOME/.oh-my-zsh
+	chmod 0755 $HOME/.oh-my-zsh
+	chown -R jedi:jedi $HOME
+	
 	cd
 	
 	rsync -a /root/unbox_data/secrets/SSH/ /home/jedi/.ssh/
@@ -184,20 +186,18 @@ function user_install(){
 	git clone ssh://git@git.neulandlabor.de:2222/j3d1/laptop_tools.git Tools
 	echo $?
 	
-	#wget https://data.services.jetbrains.com/products/releases?code=TBA&latest=true
 	
-	#do jq stuff
 	
-	#wget --show-progress -qO ./toolbox.tar.gz https://download.jetbrains.com/toolbox/jetbrains-toolbox-1.20.7940.tar.gz
+	TOOLBOX_LINK=$(wget "https://data.services.jetbrains.com/products/releases?code=TBA&latest=true" -O - 2>/dev/null | jq -r ".TBA[0].downloads.linux.link")
+	wget --show-progress -qO ./toolbox.tar.gz ${TOOLBOX_LINK}
+	unset TOOLBOX_LINK
+	TOOLBOX_TEMP_DIR=$(mktemp -d)
+	tar -C "$TOOLBOX_TEMP_DIR" -xf toolbox.tar.gz
+	rm ./toolbox.tar.gz
+	"$TOOLBOX_TEMP_DIR"/*/jetbrains-toolbox
+	rm -r "$TOOLBOX_TEMP_DIR"
+	unset TOOLBOX_TEMP_DIR
 	
-	#TOOLBOX_TEMP_DIR=$(mktemp -d)
-
-	#tar -C "$TOOLBOX_TEMP_DIR" -xf toolbox.tar.gz
-	#rm ./toolbox.tar.gz
-
-	#"$TOOLBOX_TEMP_DIR"/*/jetbrains-toolbox
-	
-	#rm -r "$TOOLBOX_TEMP_DIR"
 	echo
 }