Compare commits

..

No commits in common. "475c164d78fb7ac127a6c5c3fc62ca6ac5b56b5e" and "b4bb386ff651daf1c811035149d759dd0bf60962" have entirely different histories.

3 changed files with 157 additions and 93 deletions

View File

@ -3,7 +3,7 @@ _k_friendly_name=Aktivitätenverwaltung
switch-to-activity-64664544-a062-48cf-a713-e4045da575e9=none,none,Zu Aktivität „Standard“ wechseln switch-to-activity-64664544-a062-48cf-a713-e4045da575e9=none,none,Zu Aktivität „Standard“ wechseln
[KDE Keyboard Layout Switcher] [KDE Keyboard Layout Switcher]
Switch to Last-Used Keyboard Layout=none,Meta+Alt+L,Auf zuletzt verwendete Tastaturbelegung umschalten Switch to Last-Used Keyboard Layout=none,Meta+Alt+L,Switch to Last-Used Keyboard Layout
Switch to Next Keyboard Layout=none,Meta+Alt+K,Auf nächste Tastaturbelegung umschalten Switch to Next Keyboard Layout=none,Meta+Alt+K,Auf nächste Tastaturbelegung umschalten
_k_friendly_name=Umschaltung der Tastaturbelegung _k_friendly_name=Umschaltung der Tastaturbelegung
@ -82,7 +82,7 @@ KrohnkiteSpreadLayout=none,none,Krohnkite: Spread Layout
KrohnkiteStackedLayout=none,none,Krohnkite: Stacked Layout KrohnkiteStackedLayout=none,none,Krohnkite: Stacked Layout
KrohnkiteStairLayout=Meta+S,none,Krohnkite: Stair Layout KrohnkiteStairLayout=Meta+S,none,Krohnkite: Stair Layout
KrohnkiteTileLayout=none,none,Krohnkite: Tile Layout KrohnkiteTileLayout=none,none,Krohnkite: Tile Layout
KrohnkiteToggleFloat=Meta+F,none,Krohnkite: Toggle Float KrohnkiteToggleFloat=none,none,Krohnkite: Toggle Float
KrohnkiteTreeColumnLayout=none,none,Krohnkite: Tree Column Layout KrohnkiteTreeColumnLayout=none,none,Krohnkite: Tree Column Layout
KrohnkitegrowWidth=none,none,Krohnkite: Grow Width KrohnkitegrowWidth=none,none,Krohnkite: Grow Width
Move Tablet to Next Output=none,none,Move the tablet to the next output Move Tablet to Next Output=none,none,Move the tablet to the next output

View File

@ -49,8 +49,8 @@ plugin=org.kde.plasma.kickoff
[Containments][29][Applets][30][Configuration] [Containments][29][Applets][30][Configuration]
PreloadWeight=100 PreloadWeight=100
popupHeight=541 popupHeight=510
popupWidth=733 popupWidth=677
[Containments][29][Applets][30][Configuration][General] [Containments][29][Applets][30][Configuration][General]
favoritesPortedToKAstats=true favoritesPortedToKAstats=true

View File

@ -21,6 +21,10 @@ func_dont_timeout &
# get script directory # get script directory
scriptloc="$BASH_SOURCE" scriptloc="$BASH_SOURCE"
setupdir=$(dirname "$scriptloc") setupdir=$(dirname "$scriptloc")
#setupdir=$(pwd)
#change to home directory
#cd "$HOME"
# check if multilib repo is enabled # check if multilib repo is enabled
if ! pacman -Sl multilib &>/dev/null; then if ! pacman -Sl multilib &>/dev/null; then
@ -50,7 +54,7 @@ clear
for choice in $choices; do for choice in $choices; do
case $choice in case $choice in
100) 100)
printf '%s\n' 'sway' 'swaylock' 'swayidle' 'swaybg' 'xorg-xwayland' 'xdg-desktop-portal-wlr' 'xdg-desktop-portal-gtk' 'qt5-wayland' 'qt6-wayland' >>"$setupdir/selectedpkgs.txt" printf '%s\n' 'sway' 'swaylock' 'swayidle' 'swaybg' 'xorg-xwayland' 'xdg-desktop-portal-wlr' 'xdg-desktop-portal-gtk' 'qt5-wayland' 'qt6-wayland' >> "$setupdir/selectedpkgs.txt"
;; ;;
esac esac
done done
@ -64,13 +68,13 @@ clear
for choice in $choices; do for choice in $choices; do
case $choice in case $choice in
0) 0)
echo "firefox" >>"$setupdir/selectedpkgs.txt" echo "firefox" >> "$setupdir/selectedpkgs.txt"
;; ;;
10) 10)
echo "chromium" >>"$setupdir/selectedpkgs.txt" echo "chromium" >> "$setupdir/selectedpkgs.txt"
;; ;;
20) 20)
echo "torbrowser-launcher" >>"$setupdir/selectedpkgs.txt" echo "torbrowser-launcher" >> "$setupdir/selectedpkgs.txt"
;; ;;
esac esac
done done
@ -99,25 +103,25 @@ clear
for choice in $choices; do for choice in $choices; do
case $choice in case $choice in
0) 0)
printf '%s\n' 'qemu' 'virt-manager' 'ebtables' 'dnsmasq' 'edk2-ovmf' >>"$setupdir/selectedpkgs.txt" printf '%s\n' 'qemu' 'virt-manager' 'ebtables' 'dnsmasq' 'edk2-ovmf' >> "$setupdir/selectedpkgs.txt"
;; ;;
1) 1)
echo "vmware-workstation" >>"$setupdir/aurselectedpkgs.txt" echo "vmware-workstation" >> "$setupdir/aurselectedpkgs.txt"
;; ;;
10) 10)
printf '%s\n' 'steam' 'steam-native-runtime' >>"$setupdir/selectedpkgs.txt" printf '%s\n' 'steam' 'steam-native-runtime' >> "$setupdir/selectedpkgs.txt"
;; ;;
11) 11)
echo "lutris" >>"$setupdir/selectedpkgs.txt" echo "lutris" >> "$setupdir/selectedpkgs.txt"
;; ;;
12) 12)
echo "citra-qt-git" >>"$setupdir/aurselectedpkgs.txt" echo "citra-qt-git" >>"$setupdir/aurselectedpkgs.txt"
;; ;;
20) 20)
echo "krita" >>"$setupdir/selectedpkgs.txt" echo "krita" >> "$setupdir/selectedpkgs.txt"
;; ;;
21) 21)
echo "gimp" >>"$setupdir/selectedpkgs.txt" echo "gimp" >> "$setupdir/selectedpkgs.txt"
;; ;;
31) 31)
printf '%s\n' 'yt-dlp' >>"$setupdir/aurselectedpkgs.txt" printf '%s\n' 'yt-dlp' >>"$setupdir/aurselectedpkgs.txt"
@ -151,7 +155,6 @@ for choice in $choices; do
;; ;;
80) 80)
echo "onedriver" >>"$setupdir/aurselectedpkgs.txt" echo "onedriver" >>"$setupdir/aurselectedpkgs.txt"
;;
esac esac
done done
@ -162,15 +165,16 @@ options=(0 "auto-cpufreq" off
1 "corectrl" off) 1 "corectrl" off)
choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
clear clear
for choice in $choices; do for choice in $choices
do
case $choice in case $choice in
0) 0)
in_acpufreq=1 in_acpufreq=1
echo "auto-cpufreq-git" >>"$setupdir/aurselectedpkgs.txt" echo "auto-cpufreq-git" >> "$setupdir/aurselectedpkgs.txt"
# TODO Handle rest of installation # TODO Handle rest of installation
;; ;;
1) 1)
echo "corectrl" >>"$setupdir/aurselectedpkgs.txt" echo "corectrl" >> "$setupdir/aurselectedpkgs.txt"
;; ;;
esac esac
done done
@ -210,6 +214,28 @@ for choice in $choices; do
esac esac
done done
: '
# Packages installed on different systems
in_arco_pc=0
in_arco_hp=0
cmd=(dialog --separate-output --checklist "Install system specific packages?" 22 76 16)
options=(1 "Arco PC" off
2 "Arco HP" off)
choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
clear
for choice in $choices; do
case $choice in
1)
in_arco_pc=1
;;
2)
in_arco_hp=1
;;
esac
done
'
if [ -f "$setupdir/notfoundpackages.txt" ]; then if [ -f "$setupdir/notfoundpackages.txt" ]; then
rm "$setupdir/notfoundpackages.txt" rm "$setupdir/notfoundpackages.txt"
fi fi
@ -349,6 +375,24 @@ if [ $in_podman -eq 1 ]; then
sudo usermod -aG podman "$USER" sudo usermod -aG podman "$USER"
fi fi
# other system configs
: '
# arco pc
if [ $in_arco_pc -eq 1 ]; then
echo "Installing arco pc packages"
paru -S --needed - <"$setupdir/packages/lupusregina-packages.txt"
fi
# arco hp
if [ $in_arco_hp -eq 1 ]; then
echo "Installing arch hp packages"
paru -S --needed - <"$setupdir/packages/arch-hp-packages.txt"
fi
'
# install nix
#curl -sSf -L https://install.determinate.systems/nix | sh -s -- install
############################## ##############################
##### Configuration ##### ##### Configuration #####
############################## ##############################
@ -357,9 +401,18 @@ echo Configuring packages
#change shell #change shell
chsh -s /usr/bin/fish "$USER" chsh -s /usr/bin/fish "$USER"
# setup autotrash
#autotrash -td 5 --install
#systemctl --user enable autotrash.timer
#enable vnstat #enable vnstat
sudo systemctl enable --now vnstat sudo systemctl enable --now vnstat
# enable lockscreen for systemd
#sudo systemctl enable betterlockscreen@$USER
# enable firewall # enable firewall
echo "Enabling Firewall" echo "Enabling Firewall"
sudo systemctl enable --now firewalld sudo systemctl enable --now firewalld
@ -369,6 +422,17 @@ sudo firewall-cmd --zone=public --permanent --remove-service=ssh || true
# enable gdm # enable gdm
sudo systemctl enable gdm sudo systemctl enable gdm
# regenerate locale
# Fixes rofi not launching
#sudo locale-gen
: '
if [[ $(pacman -Q | grep sway) ]]; then
sudo systemctl enable --now seatd.service
sudo gpasswd -a "$USER" seat 1>/dev/null
fi
'
# update fonts cache # update fonts cache
fc-cache -f fc-cache -f