Merge branch 'master' of https://github.com/simono41/SpectreOS

arch-graphical-install-auto

@@ -4,7 +4,7 @@ set -ex
 
 if [[ $EUID -ne 0 ]]; then
     echo "This script must be run as root" 1>&2
-    sudo $0
+    sudo $0 $1 $2 $3 $4 $5 $6 $7 $8 $9
     exit 0
 fi
 echo "Als root Angemeldet"
@@ -155,6 +155,7 @@ function copyconfig() {
     #links
     links
     userrechte
+    rootrechte
 }
 
 function userrechte() {
@@ -172,6 +173,9 @@ function userrechte() {
         chmod 600 /home/"$username"/.ssh/authorized_keys
     fi
 
+}
+
+function rootrechte() {
     #root
     chmod 750 -Rv /root
     #ssh-root
@@ -231,18 +235,6 @@ function links() {
 }
 
 function gnomeconfig() {
-    mkdir -p /home/"$username"/.config/gtk-3.0/
-    echo "[Settings]" > /home/"$username"/.config/gtk-3.0/settings.ini
-    echo "gtk-theme-name = Adwaita" >> /home/"$username"/.config/gtk-3.0/settings.ini
-    echo "# next option is applicable only if selected theme supports it" >> /home/"$username"/.config/gtk-3.0/settings.ini
-    echo "gtk-application-prefer-dark-theme = true" >> /home/"$username"/.config/gtk-3.0/settings.ini
-    echo "# set font name and dimension" >> /home/"$username"/.config/gtk-3.0/settings.ini
-    echo "gtk-font-name = Sans 10" >> /home/"$username"/.config/gtk-3.0/settings.ini
-
-    mkdir -p /home/"$username"/.local/share/applications/
-    echo "[Default Applications]" > /home/"$username"/.local/share/applications/mimeapps.list
-    echo "inode/directory=org.gnome.Nautilus.desktop" >> /home/"$username"/.local/share/applications/mimeapps.list
-
     mkdir -p /root/.config/gtk-3.0/
     echo "[Settings]" > /root/.config/gtk-3.0/settings.ini
     echo "gtk-theme-name = Adwaita" >> /root/.config/gtk-3.0/settings.ini
@@ -251,10 +243,6 @@ function gnomeconfig() {
     echo "# set font name and dimension" >> /root/.config/gtk-3.0/settings.ini
     echo "gtk-font-name = Sans 10" >> /root/.config/gtk-3.0/settings.ini
 
-    mkdir -p /root/.local/share/applications/
-    echo "[Default Applications]" > /root/.local/share/applications/mimeapps.list
-    echo "inode/directory=org.gnome.Nautilus.desktop" >> /root/.local/share/applications/mimeapps.list
-
     gsettings set org.gnome.desktop.media-handling automount 'false'
     gsettings set org.gnome.desktop.media-handling automount-open 'false'
 }
@@ -663,6 +651,9 @@ if [ "${vollinstallation}" != "n" ]; then
     tar -vxJf /opt/${repo}/vibrancy-colors.tar.xz -C /usr/share/icons/
     gtk-update-icon-cache /usr/share/icons/Vibrancy-Colors-Dark/
 
+    # XDG standard
+    cp /opt/${repo}/mimeapps.list /etc/xdg/mimeapps.list
+
 fi
 
 

arch-install

@@ -9,10 +9,6 @@ repo="SpectreOS"
 user="user1"
 version="%VERSION%"
 
-if [ "${version}" == "%VERSION%" ]; then
-    version=""
-fi
-
 if [ "$2" == "libre" ]; then
     echo "Libre mode Enabled!!!"
     version="libre"

mimeapps.list

@@ -0,0 +1,45 @@
+[Added Associations]
+application/octet-stream=org.gnome.FileRoller.desktop;
+x-scheme-handler/http=exo-web-browser.desktop;firefox.desktop;
+x-scheme-handler/https=exo-web-browser.desktop;firefox.desktop;
+x-scheme-handler/mailto=exo-mail-reader.desktop;thunderbird.desktop;
+text/markdown=org.gnome.gedit.desktop;
+x-scheme-handler/ftp=firefox.desktop;
+x-scheme-handler/chrome=firefox.desktop;
+text/html=firefox.desktop;org.gnome.gedit.desktop;
+application/x-extension-htm=firefox.desktop;
+application/x-extension-html=firefox.desktop;
+application/x-extension-shtml=firefox.desktop;
+application/xhtml+xml=firefox.desktop;
+application/x-extension-xhtml=firefox.desktop;
+application/x-extension-xht=firefox.desktop;
+message/rfc822=thunderbird.desktop;
+application/x-shellscript=pluma.desktop;
+application/x-cue=org.gnome.gedit.desktop;
+application/x-7z-compressed=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
+model/x.stl-binary=org.gnome.FileRoller.desktop;
+application/x-compressed-tar=org.gnome.Nautilus.desktop;
+application/json=org.gnome.gedit.desktop;
+text/vcard=kaddressbook-importer.desktop;
+text/x-opml+xml=firefox.desktop;
+text/csv=libreoffice-calc.desktop;
+image/png=eog.desktop;
+image/jpeg=eog.desktop;
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/ftp=firefox.desktop
+x-scheme-handler/chrome=firefox.desktop
+text/html=firefox.desktop
+application/x-extension-htm=firefox.desktop
+application/x-extension-html=firefox.desktop
+application/x-extension-shtml=firefox.desktop
+application/xhtml+xml=firefox.desktop
+application/x-extension-xhtml=firefox.desktop
+application/x-extension-xht=firefox.desktop
+x-scheme-handler/mailto=thunderbird.desktop
+message/rfc822=thunderbird.desktop
+x-scheme-handler/discord-402572971681644545=discord-402572971681644545.desktop
+image/png=eog.desktop
+inode/directory=org.gnome.Nautilus.desktop

packages_cinnamon.txt

@@ -95,6 +95,7 @@ opencl-nvidia
 openssh
 openvpn
 os-prober
+p7zip
 pavucontrol
 pixz
 ppp

packages_gnome.txt

@@ -94,6 +94,7 @@ opencl-nvidia
 openssh
 openvpn
 os-prober
+p7zip
 pavucontrol
 pixz
 ppp

packages_kde.txt

@@ -92,6 +92,7 @@ opencl-nvidia
 openssh
 openvpn
 os-prober
+p7zip
 pavucontrol
 pixz
 plasma

packages_libre.txt

@@ -79,6 +79,7 @@ ntp
 openssh
 openvpn
 os-prober
+p7zip
 pavucontrol
 pixz
 ppp

packages_lxde.txt

@@ -90,6 +90,7 @@ opencl-nvidia
 openssh
 openvpn
 os-prober
+p7zip
 pavucontrol
 pixz
 ppp

packages_lxqt.txt

@@ -93,6 +93,7 @@ openssh
 openvpn
 os-prober
 oxygen-icons
+p7zip
 pavucontrol
 pixz
 ppp

packages_mate.txt

@@ -92,6 +92,7 @@ opencl-nvidia
 openssh
 openvpn
 os-prober
+p7zip
 pavucontrol
 pixz
 ppp

packages_voll.txt

@@ -151,6 +151,7 @@ openttd
 openvpn
 os-prober
 oxygen-icons
+p7zip
 pavucontrol
 pcsx2
 physfs

packages_xfce4.txt

@@ -89,6 +89,7 @@ opencl-nvidia
 openssh
 openvpn
 os-prober
+p7zip
 pavucontrol
 pixz
 ppp

update.sh

@@ -12,7 +12,7 @@ user="user1"
 
 if [[ $EUID -ne 0 ]]; then
     echo "This script must be run as root" 1>&2
-    sudo $0
+    sudo $0 $1 $2 $3 $4 $5 $6 $7 $8 $9
     exit 0
 fi
 echo "Als root Angemeldet"