Merge branch 'master' of ssh://5.83.162.84:22/home/git/SpectreOS

arch-graphical-install-auto

@@ -377,6 +377,21 @@ echo "	Option \"AccelerationDenominator\" \"1\"" >> /etc/X11/xorg.conf.d/50-mous
 echo "	Option \"AccelerationThreshold\" \"4\"" >> /etc/X11/xorg.conf.d/50-mouse-acceleration.conf
 echo "EndSection" >> /etc/X11/xorg.conf.d/50-mouse-acceleration.conf
 
+# import compress script
+
+# compress-script
+cp /opt/${repo}/compress.sh /usr/bin/compress
+chmod 755 /usr/bin/compress
+
+# set config direction
+
+if [ -d /root/.config ]; then
+  rm -Rv /root/.config
+fi
+mkdir -p /root/.config
+compress restore /opt/${repo}/.config.tar.pxz /root/.config/
+gnomeconfig
+
 # set system startup files
 echo "System startup files"
 
@@ -501,10 +516,6 @@ chmod 755 /usr/bin/btrfs-swapon
 cp /opt/${repo}/btrfs-swapoff /usr/bin/
 chmod 755 /usr/bin/btrfs-swapoff
 
-# compress-script
-cp /opt/${repo}/compress.sh /usr/bin/compress
-chmod 755 /usr/bin/compress
-
 # ssh
 cp /opt/${repo}/sshd_config /etc/ssh/sshd_config
 
@@ -787,16 +798,8 @@ if [ "$version" != "lite" ] && [ "$skip" != "skip" ]; then
 
 fi
 
-#if [ "$skip" != "skip" ]; then
+echo "Kopiere Config zum User"
-  # .config
-  if [ -d /root/.config ]; then
-    rm -Rv /root/.config
-  fi
-  mkdir -p /root/.config
-  compress restore /opt/${repo}/.config.tar.pxz /root/.config/
-  gnomeconfig
 copyconfig
-#fi
 
 if pacman -Qdtq; then
   echo "Verwaiste Packete werden entfernt :)"

arch-install

@@ -174,7 +174,7 @@ function partionierenohneswap() {
 }
 
 function partitioniereonepartition() {
-    wipefs -a -f ${device}3
+    sgdisk -d 3 ${device}
     sgdisk -a 2048 -n 3:: -c 3:"Linux filesystem" -t 3:8300 ${device}
     formatencrypt
 }
@@ -472,8 +472,8 @@ function installation {
             echo "fstab ${wort} wird erstellt!!!"
             autodiskdevicedateisystem=$(blkid -s TYPE -o value ${wort})
             autodiskdeviceuuid=$(blkid -s UUID -o value ${wort})
-            mkdir -p ${mountpoint}/run/media/user1/${wort#/*/}
+            mkdir -p ${mountpoint}/run/media/user1/${autodiskdeviceuuid}
-            echo "UUID=${autodiskdeviceuuid} /run/media/user1/${wort#/*/} ${autodiskdevicedateisystem} defaults 0 2" >> ${mountpoint}/etc/fstab
+            echo "UUID=${autodiskdeviceuuid} /run/media/user1/${autodiskdeviceuuid} ${autodiskdevicedateisystem} defaults 0 2" >> ${mountpoint}/etc/fstab
 
         done
 

packages_gnome.txt

@@ -1082,7 +1082,6 @@ thunar-media-tags-plugin
 thunar-volman
 thunderbird
 thunderbird-i18n-de
-tigervnc
 tlp
 tolua++
 totem
@@ -1122,10 +1121,6 @@ viewnior
 vinagre
 vino
 virglrenderer
-virtualbox
-virtualbox-guest-modules-arch
-virtualbox-guest-utils
-virtualbox-host-modules-arch
 vlc
 volume_key
 vpnc

packages_manjaro.txt

@@ -879,7 +879,6 @@ thunar-media-tags-plugin
 thunar-volman
 thunderbird
 thunderbird-i18n-de
-tigervnc
 tlp
 tolua++
 transmission-gtk

packages_xfce4.txt

@@ -1,5 +1,3 @@
-0ad
-0ad-data
 a52dec
 aalib
 accountsservice
@@ -8,28 +6,25 @@ acpi
 acpid
 adwaita-icon-theme
 afpfs-ng
-alembic
 alsa-firmware
 alsa-lib
 alsa-plugins
 alsa-utils
 android-tools
 android-udev
+aom
 apache
 apm
 appstream-glib
 apr
 apr-util
-arandr
 arc-gtk-theme
 arc-icon-theme
 arch-install-scripts
 archlinux-appstream-data
 archlinux-keyring
-ardour
 argon2
 aspell
-assaultcube
 at-spi2-atk
 at-spi2-core
 atk
@@ -37,10 +32,8 @@ atkmm
 atom
 attica
 attr
-aubio
 audacious
 audacious-plugins
-audacity
 autoconf
 automake
 avahi
@@ -49,19 +42,14 @@ babl
 bash
 bash-completion
 bc
-binutils
 bison
 blas
-blender
-blosc
 blueman
 bluez
 bluez-libs
 boost-libs
-brasero
 brotli
 btrfs-progs
-bubblewrap
 bumblebee
 bzip2
 c-ares
@@ -69,30 +57,21 @@ ca-certificates
 ca-certificates-cacert
 ca-certificates-mozilla
 ca-certificates-utils
-cabextract
 cairo
 cairomm
 cantarell-fonts
 catfish
-cblas
 cdparanoia
-cdrdao
 cdrtools
 celt
 celt0.5.1
-cheese
 chromaprint
 chromium
 cifs-utils
 clucene
-clutter
-clutter-gst
-clutter-gtk
 cmake
-cogl
 colord
 confuse
-convertlit
 coreutils
 cpupower
 cracklib
@@ -123,12 +102,8 @@ dnssec-anchors
 dosfstools
 dotconf
 double-conversion
-drumstick
 dsniff
-dvd+rw-tools
-dvgrab
 e2fsprogs
-ebook-tools
 ecryptfs-utils
 efibootmgr
 efitools
@@ -138,7 +113,6 @@ eglexternalplatform
 electron
 enca
 enchant
-enet
 engrampa
 exfat-utils
 exiv2
@@ -152,7 +126,6 @@ fakeroot
 farstream
 ffmpeg
 ffmpegthumbnailer
-ffnvcodec-headers
 fftw
 file
 filesystem
@@ -163,26 +136,21 @@ firefox-i18n-de
 fish
 flac
 flex
-fltk
-fluidsynth
 fontconfig
 foomatic-db-engine
 freeciv
-freecol
 freeglut
 freetype2
 fribidi
-ftgl
 fuse-common
 fuse2
 fuse3
+fzf
 galculator-gtk2
 gamin
 garcon
 gawk
-gc
 gcab
-gcc
 gcc-libs
 gconf
 gcr
@@ -194,7 +162,6 @@ geoclue2
 geoip
 geoip-database
 gettext
-ghc-libs
 ghostscript
 giflib
 gimp
@@ -205,18 +172,13 @@ glib-networking
 glib2
 glibc
 glibmm
-gloox
 glu
-gmime3
 gmp
-gnome-chess
-gnome-desktop
 gnome-icon-theme
 gnome-icon-theme-symbolic
 gnome-keyring
 gnome-menus
 gnome-themes-extra
-gnuchess
 gnupg
 gnutls
 gobject-introspection-runtime
@@ -232,8 +194,8 @@ groff
 grub
 gsettings-desktop-schemas
 gsfonts
-gsl
 gsm
+gsmartcontrol
 gssproxy
 gst-libav
 gst-plugins-bad
@@ -252,7 +214,6 @@ gtkmm3
 gtksourceview3
 gtkspell
 gufw
-guile
 gvfs
 gvfs-afc
 gvfs-gphoto2
@@ -262,36 +223,8 @@ gvfs-smb
 gzip
 harfbuzz
 harfbuzz-icu
-haskell-conduit
-haskell-entropy
-haskell-exceptions
-haskell-hashable
-haskell-hslogger
-haskell-math-functions
-haskell-mono-traversable
-haskell-mwc-random
-haskell-network
-haskell-old-locale
-haskell-primitive
-haskell-random
-haskell-regex-base
-haskell-regex-tdfa
-haskell-resourcet
-haskell-sandi
-haskell-sha
-haskell-split
-haskell-stringsearch
-haskell-transformers-compat
-haskell-unliftio-core
-haskell-unordered-containers
-haskell-utf8-string
-haskell-vector
-haskell-vector-algorithms
-haskell-vector-th-unbox
 haveged
-hdf5
 hdparm
-hedgewars
 hexchat
 hicolor-icon-theme
 hiredis
@@ -301,10 +234,10 @@ htop
 http-parser
 hunspell
 hunspell-de
+hunspell-en_US
 hwids
 hwinfo
 hydra
-hydrogen
 hyphen
 iana-etc
 icu
@@ -314,7 +247,6 @@ imagemagick
 imlib2
 inetutils
 iniparser
-inkscape
 intel-tbb
 intel-ucode
 intltool
@@ -330,7 +262,6 @@ jack
 jansson
 jasper
 java-environment-common
-java-openjfx
 java-runtime-common
 jbig2dec
 jdk8-openjdk
@@ -353,11 +284,7 @@ kconfigwidgets
 kcoreaddons
 kcrash
 kdbusaddons
-kdeclarative
-kdenlive
-kdnssd
 keyutils
-kfilemetadata
 kglobalaccel
 kguiaddons
 ki18n
@@ -367,11 +294,8 @@ kitemmodels
 kitemviews
 kjobwidgets
 kmod
-knewstuff
 knotifications
-knotifyconfig
+kpmcore
-konquest
-kpackage
 krb5
 kservice
 ktextwidgets
@@ -389,7 +313,6 @@ ldns
 lensfun
 less
 leveldb
-lib32-acl
 lib32-alsa-lib
 lib32-alsa-plugins
 lib32-atk
@@ -411,7 +334,6 @@ lib32-fribidi
 lib32-gcc-libs
 lib32-gconf
 lib32-gdk-pixbuf2
-lib32-gettext
 lib32-giflib
 lib32-glew
 lib32-glew1.10
@@ -426,7 +348,6 @@ lib32-icu
 lib32-imlib2
 lib32-keyutils
 lib32-krb5
-lib32-lcms2
 lib32-libappindicator-gtk2
 lib32-libasyncns
 lib32-libcaca
@@ -458,11 +379,9 @@ lib32-libldap
 lib32-libltdl
 lib32-libmikmod
 lib32-libmodplug
-lib32-libnl
 lib32-libnm-glib
 lib32-libnsl
 lib32-libogg
-lib32-libpcap
 lib32-libpciaccess
 lib32-libpng
 lib32-libpng12
@@ -546,7 +465,6 @@ lib32-wayland
 lib32-xz
 lib32-zlib
 libabw
-libaec
 libaio
 libao
 libappindicator-gtk2
@@ -595,7 +513,6 @@ libdvdnav
 libdvdread
 libe-book
 libebml
-libebur128
 libedit
 libelf
 libepoxy
@@ -614,7 +531,6 @@ libftdi
 libgadu
 libgcrypt
 libgcrypt15
-libgdiplus
 libgexiv2
 libglade
 libglvnd
@@ -636,24 +552,19 @@ libiec61883
 libimobiledevice
 libindicator-gtk2
 libinput
-libircclient
 libisoburn
 libisofs
 libjpeg-turbo
 libjpeg6-turbo
 libkate
-libkdegames
 libkeybinder3
 libksba
 liblangtag
 libldap
-liblo
 liblouis
 liblqr
-liblrdf
 libmad
 libmagick
-libmagick6
 libmariadbclient
 libmatroska
 libmbim
@@ -664,7 +575,6 @@ libmng
 libmnl
 libmodplug
 libmp4v2
-libmpc
 libmpcdec
 libmpd
 libmpeg2
@@ -692,8 +602,6 @@ libofa
 libogg
 libomxil-bellagio
 libopenraw
-libopenshot
-libopenshot-audio
 libpagemaker
 libpaper
 libpcap
@@ -709,9 +617,6 @@ libpsl
 libpulse
 libpurple
 libqmi
-libquicktime
-libquvi
-libquvi-scripts
 libraqm
 libraw
 libraw1394
@@ -734,7 +639,6 @@ libsoup
 libsoxr
 libspeechd
 libspiro
-libspnav
 libsrtp
 libssh
 libssh2
@@ -831,42 +735,30 @@ light-locker
 lightdm
 lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
-lilv
 links
 linux
 linux-api-headers
 linux-firmware
-linux-headers
 lirc
 llvm-libs
 lm_sensors
 lmdb
-log4cplus
 logrotate
 lpsolve
 lsb-release
 lua
 lua51
 lua52
-lua52-bitop
-lua52-expat
-lua52-lpeg
-lua52-luajson
-lua52-socket
 luajit
-lv2
 lvm2
 lz4
 lzo
 m4
 mailcap
-make
 man-db
 man-pages
 mdadm
 media-player-info
-megaglest
-megaglest-data
 memtest86+
 mesa
 mesa-demos
@@ -874,18 +766,14 @@ metis
 minetest
 minetest-common
 minetest-server
-miniupnpc
 minizip
 mjpegtools
 mkinitcpio
 mkinitcpio-busybox
 mkinitcpio-nfs-utils
 mlocate
-mlt
-mlt-python-bindings
 mobile-broadband-provider-info
 modemmanager
-mono
 mousepad
 mozilla-common
 mpfr
@@ -901,7 +789,6 @@ ncurses
 ndctl
 neon
 net-snmp
-net-tools
 netbeans
 netctl
 nettle
@@ -913,6 +800,7 @@ networkmanager-pptp
 networkmanager-vpnc
 nfs-utils
 nfsidmap
+nilfs-utils
 nm-connection-editor
 nmap
 node-gyp
@@ -931,28 +819,17 @@ numlockx
 nvidia
 nvidia-settings
 nvidia-utils
-obs-studio
 onboard
 openal
 opencl-nvidia
-opencollada
-opencolorio
 openconnect
 opencore-amr
 openexr
-openimageio
-openjpeg
 openjpeg2
-openra
 openresolv
-openshadinglanguage
-openshot
 openssh
 openssl
 openssl-1.0
-opensubdiv
-openttd
-openvdb
 openvpn
 opus
 orage
@@ -968,7 +845,6 @@ pambase
 pango
 pangomm
 parted
-patch
 patchutils
 pavucontrol
 pciutils
@@ -994,7 +870,6 @@ perl-xml-sax
 perl-xml-sax-base
 phonon-qt5
 phonon-qt5-gstreamer
-physfs
 pidgin
 pinentry
 pixman
@@ -1010,10 +885,7 @@ poppler-glib
 poppler-qt5
 popt
 portaudio
-portmidi
-portsmf
 postgresql-libs
-potrace
 powertop
 ppp
 pptpclient
@@ -1021,7 +893,6 @@ procps-ng
 protobuf
 protobuf-c
 psmisc
-ptex
 pulseaudio
 pulseaudio-alsa
 pulseaudio-bluetooth
@@ -1044,12 +915,10 @@ python-distutils-extra
 python-docopt
 python-gobject
 python-html5lib
-python-httplib2
 python-idna
 python-keyutils
 python-lockfile
 python-msgpack
-python-numpy
 python-packaging
 python-pexpect
 python-pillow
@@ -1061,12 +930,12 @@ python-pyinotify
 python-pyparsing
 python-pyqt5
 python-pytoml
-python-pyzmq
 python-reportlab
 python-requests
 python-retrying
 python-setuptools
 python-sip
+python-sip-pyqt5
 python-six
 python-systemd
 python-urllib3
@@ -1076,9 +945,6 @@ python-yaml
 python2
 python2-cairo
 python2-gobject2
-python2-numpy
-python2-pygame
-python2-xdg
 qemu
 qpdf
 qpdfview
@@ -1089,7 +955,6 @@ qt5-declarative
 qt5-imageformats
 qt5-location
 qt5-multimedia
-qt5-quickcontrols
 qt5-script
 qt5-sensors
 qt5-speech
@@ -1113,20 +978,15 @@ rpcbind
 rsync
 rtkit
 rtmpdump
-rubberband
 run-parts
 s-nail
 samba
 sbc
-schroedinger
 screen
-screenfetch
 sdl
 sdl2
-sdl2_gfx
 sdl2_image
 sdl2_mixer
-sdl2_net
 sdl2_ttf
 sdl_image
 sdl_mixer
@@ -1134,23 +994,19 @@ sdl_ttf
 seabios
 sed
 semver
-serd
 serf
 shadow
 shared-mime-info
-simplescreenrecorder
-singularity
 sip
 slang
+smartmontools
 smbclient
 smpeg
 snappy
 solid
 sonnet
-sord
 sound-theme-freedesktop
 soundtouch
-sox
 spandsp
 speech-dispatcher
 speex
@@ -1159,7 +1015,6 @@ spice
 splix
 sqlite
 squashfs-tools
-sratom
 srt
 sshfs
 startup-notification
@@ -1167,10 +1022,7 @@ steam
 steam-native-runtime
 subversion
 sudo
-suil
 suitesparse
-supertux
-supertuxkart
 sysfsutils
 syslinux
 systemd
@@ -1186,7 +1038,6 @@ teeworlds
 telegram-desktop
 terminus-font
 tevent
-texinfo
 thin-provisioning-tools
 thunar
 thunar-archive-plugin
@@ -1194,12 +1045,9 @@ thunar-media-tags-plugin
 thunar-volman
 thunderbird
 thunderbird-i18n-de
-tinyxml
 tlp
 tolua++
-totem-plparser
 traceroute
-tracker
 transmission-gtk
 tslib
 ttf-bitstream-vera
@@ -1213,8 +1061,6 @@ twolame
 tzdata
 udiskie
 udisks2
-ufoai
-ufoai-data
 ufw
 unace
 unrar
@@ -1226,25 +1072,18 @@ usbredir
 usbutils
 util-linux
 v4l-utils
-vamp-plugin-sdk
 vde2
 vi
 vid.stab
 viewnior
 virglrenderer
-virtualbox
-virtualbox-guest-modules-arch
-virtualbox-guest-utils
-virtualbox-host-modules-arch
 virtualgl
 vlc
-vmpk
 volume_key
 vpnc
 vte-common
 vte3
 vulkan-icd-loader
-warzone2100
 wavpack
 wayland
 wayland-protocols
@@ -1253,12 +1092,7 @@ webrtc-audio-processing
 wget
 which
 whois
-widelands
 wildmidi
-wine
-wine-mono
-wine_gecko
-winetricks
 wireless-regdb
 wireless_tools
 wireshark-cli
@@ -1267,7 +1101,6 @@ wireshark-gtk
 woff2
 wpa_supplicant
 wxgtk-common
-wxgtk2
 wxgtk3
 x11vnc
 x265
@@ -1282,26 +1115,12 @@ xcursor-simpleandsoft
 xcursor-vanilla-dmz-aa
 xdg-user-dirs
 xdg-utils
-xerces-c
 xf86-input-elographics
 xf86-input-evdev
 xf86-input-keyboard
 xf86-input-libinput
 xf86-input-mouse
-xf86-input-synaptics
-xf86-input-vmmouse
 xf86-input-void
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-qxl
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
 xfburn
 xfce4-appfinder
 xfce4-battery-plugin
@@ -1362,10 +1181,8 @@ xorg-xkbcomp
 xorg-xkill
 xorg-xmessage
 xorg-xmodmap
-xorg-xrandr
 xorg-xrdb
 xorg-xset
-xorg-xsetroot
 xorgproto
 xvidcore
 xz
@@ -1373,6 +1190,7 @@ yaml-cpp
 yelp
 yelp-xsl
 youtube-dl
+zbar
 zenity
 zeromq
 zip

xinitrc_voll.txt

@@ -1 +1 @@
-exec gnome-session
+exec startxfce4