From 47a4b227554919fd4fea4d07249759e3a43e4ce9 Mon Sep 17 00:00:00 2001
From: Lukas Graz <gasfunken@googlemail.com>
Date: Tue, 19 Apr 2022 09:54:28 +0200
Subject: [PATCH] .

---
 .vscode/settings.json     |  3 +++
 my_notes.md               | 11 +++++++++--
 pkg-files/aur-pkgs.txt    | 12 ++++++++++++
 pkg-files/pacman-pkgs.txt | 28 ++++++++++++++++++++++++++++
 scripts/1-setup.sh        | 14 ++++++++------
 scripts/2-user.sh         |  6 ++++--
 6 files changed, 64 insertions(+), 10 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..777f8b3
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "editor.glyphMargin": false
+}
\ No newline at end of file
diff --git a/my_notes.md b/my_notes.md
index f60ea63..0b438b8 100644
--- a/my_notes.md
+++ b/my_notes.md
@@ -6,10 +6,10 @@ this script is from [GitHub](https://github.com/ChrisTitusTech/ArchTitus) and is
 ## boot
 - dual boot for windows (dont delete partition)
 - skip boot menu (show if 'shift' pressed down)
-- do not use grub-theming
+<!-- - do not use grub-theming -->
 ## package-install
 - pacman-pkgs.txt
-    - replace pulseaudio with pipewire
+    <!-- - replace pulseaudio with pipewire -->
 - GPU packages
     - check if all nessecary:
     libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa
@@ -45,6 +45,13 @@ and in `1-setup.sh` set:
 ### delete zsh
 in `2-user.sh`
 ### turn of terminal bell/beep
+## Gnome-shell-extensions
+### Install 
+from file
+### configure
+link and compile extensions from extension with gsettings according to askubuntu.com (configure gnome-shell extensions from command line)
+## setup rclone with gdrived
+
 
 
 ## CleanUp
diff --git a/pkg-files/aur-pkgs.txt b/pkg-files/aur-pkgs.txt
index 4a9a26f..520c4b8 100644
--- a/pkg-files/aur-pkgs.txt
+++ b/pkg-files/aur-pkgs.txt
@@ -19,4 +19,16 @@
 # snapper-gui-git
 # ttf-meslo
 # vde2
+###################
+##  my packages
+###################
+epson-inkjet-printer-escpr
+mathpix-snipping-tool
+rambox-bin
+spotify
+superproductivity-bin
+# teamviewer
+# timeshift
+# visual-studio-code-bin
+zotero
 zoom
diff --git a/pkg-files/pacman-pkgs.txt b/pkg-files/pacman-pkgs.txt
index 3c8c712..3c9b3b0 100644
--- a/pkg-files/pacman-pkgs.txt
+++ b/pkg-files/pacman-pkgs.txt
@@ -14,6 +14,7 @@ noto-fonts-emoji
 usbutils
 xdg-user-dirs
 --END OF MINIMAL INSTALL--
+avahi
 # alsa-plugins
 # alsa-utils
 ## autoconf
@@ -115,3 +116,30 @@ pipewire
 pipewire-alsa
 pipewire-jack
 pipewire-pulse
+########################
+adobe-source-code-pro-fonts
+firefox
+flatpak
+grep
+gscan2pdf
+guake
+htop
+openconnect
+openvpn
+networkmanager
+networkmanager-openconnect
+networkmanager-openvpn
+obs-studio
+# okular
+opencore-amr
+openjpeg2
+openresolv
+openssh
+openssl
+openvpn
+python
+qgis
+r
+rclone
+sane
+texlive-most
diff --git a/scripts/1-setup.sh b/scripts/1-setup.sh
index 7ca4188..fc76ae2 100755
--- a/scripts/1-setup.sh
+++ b/scripts/1-setup.sh
@@ -58,18 +58,20 @@ echo -ne "
 # 
 # sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
 sed -i 's/^#de_CH.UTF-8 UTF-8/de_CH.UTF-8 UTF-8/' /etc/locale.gen
-cat "LANG=en_US.UTF-8" >> /etc/locale.conf
-cat "LC_TIME=de_CH.UTF-8" >> /etc/locale.conf
-
+locale-gen
+touch /etc/locale.conf
+cat "LANG=en_US.UTF-8" | tee -a /etc/locale.conf
+cat "LC_TIME=de_CH.UTF-8" | tee -a /etc/locale.conf
 timedatectl --no-ask-password set-timezone ${TIMEZONE}
 timedatectl --no-ask-password set-ntp 1
 # localectl --no-ask-password set-locale LANG="en_US.UTF-8" LC_TIME="en_US.UTF-8"
 localectl --no-ask-password set-locale LANG="en_US.UTF-8" LC_TIME="de_CH.UTF-8"
 ln -s /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
 # Set keymaps
+touch /etc/vconsole
+echo "KEYMAP=$KEYMAP" | tee /etc/vconsole
 localectl --no-ask-password set-keymap ${KEYMAP}
 localectl set-x11-keymap de acer_laptop nodeadkeys
-locale-gen
 
 # Add sudo no password rights
 sed -i 's/^# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
@@ -132,9 +134,9 @@ if grep -E "NVIDIA|GeForce" <<< ${gpu_type}; then
 elif lspci | grep 'VGA' | grep -E "Radeon|AMD"; then
     pacman -S --noconfirm --needed xf86-video-amdgpu
 elif grep -E "Integrated Graphics Controller" <<< ${gpu_type}; then
-    pacman -S --noconfirm --needed libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa
+    pacman -S --noconfirm --needed libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-utils lib32-mesa
 elif grep -E "Intel Corporation UHD" <<< ${gpu_type}; then
-    pacman -S --needed --noconfirm libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa
+    pacman -S --needed --noconfirm libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-utils lib32-mesa
 fi
 
 echo -ne "
diff --git a/scripts/2-user.sh b/scripts/2-user.sh
index 05bf523..b65a5ed 100755
--- a/scripts/2-user.sh
+++ b/scripts/2-user.sh
@@ -35,8 +35,10 @@ do
     # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line
     continue
   fi
-  echo "INSTALLING: ${line}"
-  sudo pacman -S --noconfirm --needed ${line}
+  if [[ ! $line = \#* ]] ; then
+    echo "INSTALLING: ${line}"
+    sudo pacman -S --noconfirm --needed ${line}
+  fi
 done
 
 echo -ne "