verita84/arch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Your Name 2023-03-25 12:47:08 -06:00
parent 8ea53ad17e
commit a43a3d8218
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
debian.sh
View File

@ -30,7 +30,7 @@ mkdir $TARGET
echo
HARD_DISK=$2
EFI="/dev/$(lsblk | grep $HARD_DISK | head -2 | tail -1 | sed 's/├─//' | cut -d ' ' -f1)"
BTRFS="/dev/$(lsblk | grep $HARD_DISK | head -4 | tail -1 | sed 's/└─//'| cut -d ' ' -f1)"
BTRFS="/dev/$(lsblk | grep $HARD_DISK | head -4 | tail -1 | sed 's/└─//' | cut -d ' ' -f1)"
BOOT="/dev/$(lsblk | grep $HARD_DISK | head -3 | tail -1 | sed 's/├─//' | cut -d ' ' -f1)"
ROOT_NAME='debian'
ROOT_MAPPER_NAME='root'
@ -68,11 +68,11 @@ auto_login() {
#sed -i "/True/a AutomaticLogin=$USER" $TARGET/etc/gdm3/daemon.conf
#sed -i "s/#autologin-user=/autologin-user=$USER/" $TARGET/etc/lightdm/lightdm.conf
#sed -i "s/#autologin-user-timeout=0/autologin-user-timeout=0/ " $TARGET/etc/lightdm/lightdm.conf
mkdir -p /etc/sddm.conf.d
echo "[Autologin]" > $TARGET/etc/sddm.conf.d/autologin
echo "User=$USER" >> $TARGET/etc/sddm.conf.d/autologin
echo "Session=plasma.desktop" >> $TARGET/etc/sddm.conf.d/autologin
echo "Relogin=false" >> $TARGET/etc/sddm.conf.d/autologin
mkdir -p $TARGET/etc/sddm.conf.d
echo "[Autologin]" >$TARGET/etc/sddm.conf.d/autologin
echo "User=$USER" >>$TARGET/etc/sddm.conf.d/autologin
echo "Session=plasma.desktop" >>$TARGET/etc/sddm.conf.d/autologin
echo "Relogin=false" >>$TARGET/etc/sddm.conf.d/autologin
}
create-os-snapshots() {
@ -166,7 +166,9 @@ os-restore() {
chmod +x $TARGET/debian.sh
chroot $TARGET /debian.sh bootloader $1
chroot $TARGET /debian.sh btrfs-tweaks
chroot $TARGET /debian.sh accounts
chown -R $USER:$USER $TARGET/home/$USER
auto_login
rm -f $TARGET/debian.sh
unmount
}
@ -228,7 +230,20 @@ install-element() {
apt install -y element-desktop
}
install-tor() {
apt update
apt install -y apt-transport-https privoxy
echo "deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $DEBIAN_RELEASE main" >/etc/apt/sources.list.d/tor.list
echo "deb-src [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $DEBIAN_RELEASE main" >>/etc/apt/sources.list.d/tor.list
wget -qO- https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor | tee /usr/share/keyrings/tor-archive-keyring.gpg >/dev/null
apt update
apt install -y tor deb.torproject.org-keyring
echo "ExitNodes {us}" >>/etc/tor/torrc
echo "forward-socks4a / 0.0.0.0:9050 ." >>/etc/privoxy/config
}
additional-software() {
install-tor
install-vivaldi
#install-brave
install-element
@ -271,7 +286,6 @@ install() {
configure-repository
cp -f debian.tar $TARGET/etc/default/
locale
accounts
auto_login
custom_service_files
services
@ -356,6 +370,7 @@ function setup_script() {
#sed -i 's/most/dep/i' $TARGET/etc/initramfs-tools/initramfs.conf
echo "bash /usr/bin/debian.sh bootloader $1" >>$TARGET/setup.sh
echo 'bash /usr/bin/debian.sh grub-snapshots' >>$TARGET/setup.sh
echo 'bash /usr/bin/debian.sh accounts' >>$TARGET/setup.sh
echo 'bash /usr/bin/debian.sh desktop' >>$TARGET/setup.sh
echo 'bash /usr/bin/debian.sh additional-software' >>$TARGET/setup.sh
echo 'bash /usr/bin/debian.sh btrfs-tweaks' >>$TARGET/setup.sh
@ -457,19 +472,19 @@ fstab() {
accounts() {
echo
echo "Set Password for $USER"
echo "useradd -m -s /bin/bash $USER" >>$TARGET/setup.sh
echo "echo \"$USER:$USER_PASSWORD\"| chpasswd " >>$TARGET/setup.sh
echo "gpasswd -a $USER wheel" >>$TARGET/setup.sh
echo "gpasswd -a $USER network" >>$TARGET/setup.sh
echo "gpasswd -a $USER video" >>$TARGET/setup.sh
echo "gpasswd -a $USER libvirt" >>$TARGET/setup.sh
echo "gpasswd -a $USER netdev" >>$TARGET/setup.sh
echo "$USER ALL=(ALL) ALL" >$TARGET/etc/sudoers
echo "root ALL=(ALL) ALL" >>$TARGET/etc/sudoers
useradd -m -s /bin/bash $USER
echo "$USER:$USER_PASSWORD" | chpasswd
gpasswd -a $USER wheel
gpasswd -a $USER network
gpasswd -a $USER video
gpasswd -a $USER libvirt
gpasswd -a $USER netdev
echo "$USER ALL=(ALL) ALL" >/etc/sudoers
echo "root ALL=(ALL) ALL" >>/etc/sudoers
echo
echo "Setting ROOT Password:"
echo "echo \"root:$ROOT_PASSWORD\"| chpasswd " >>$TARGET/setup.sh
echo "/usr/bin/hostnamectl set-hostname $ROOT_NAME" >>$TARGET/setup.sh
echo "root:$ROOT_PASSWORD" | chpasswd
/usr/bin/hostnamectl set-hostname $ROOT_NAME
}
btrfs-tweaks() {
@ -575,6 +590,8 @@ elif [ "$1" = "initialize" ]; then
initialize-disk
elif [ "$1" = "wifi" ]; then
wifi
elif [ "$1" = "accounts" ]; then
accounts
elif [ "$1" = "flatpaks" ]; then
flatpaks
elif [ "$1" = "bootloader" ]; then