diff --git a/scripts/install.sh b/scripts/install.sh
index 2a64e6a..838670e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -67,7 +67,6 @@ base_applications() {
         gcc \
         git \
         gnupg \
-        gnupg \
         gnupg-agent \
         gnupg2 \
         grep \
@@ -211,10 +210,11 @@ install_i3() {
     apt autoclean
     apt clean
 
-    git clone https://github.com/syl20bnr/spacemacs ~/.emacs.d
-    rm -rf ~/.emacs.d/private/snippets
-    git clone https://github.com/AndreaCrotti/yasnippet-snippets ~/.emacs.d/private/yas-snips
-    ln -s ~/.emacs.d/private/yas-snips/snippets ~/emacs.d/private/snippets/
+    TARGET="/home/$USERNAME/.emacs.d"
+    git clone https://github.com/syl20bnr/spacemacs "${TARGET}"
+    rm -rf "${TARGET}"/private/snippets
+    git clone https://github.com/AndreaCrotti/yasnippet-snippets "${TARGET}"/private/yas-snips
+    ln -s "${TARGET}"/private/yas-snips/snippets "${TARGET}"/private/snippets/
 
     no_suspend
 
@@ -424,7 +424,7 @@ main() {
 
     case "$cmd" in
         base)
-            apt_sources buster 
+            apt_sources buster
             base_applications
             install_docker
             install_compose
@@ -436,6 +436,7 @@ main() {
             install_server_base
             ;;
         desktop)
+            apt_sources buster
             install_i3
             apt_sources buster
             if [ -f "./get_private_stuff.sh" ]; then