mirror of
https://github.com/Mastermindzh/dotfiles.git
synced 2024-11-21 22:33:42 +01:00
switch to sddm
This commit is contained in:
parent
ea861dbbfa
commit
3768caaa76
@ -7,6 +7,7 @@ root = true
|
|||||||
[*]
|
[*]
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
# Matches multiple files with brace expansion notation
|
# Matches multiple files with brace expansion notation
|
||||||
[*.{sh,py,yml}]
|
[*.{sh,py,yml}]
|
||||||
|
2
dependencies/pacman.txt
vendored
2
dependencies/pacman.txt
vendored
@ -24,7 +24,6 @@ networkmanager
|
|||||||
eog
|
eog
|
||||||
python
|
python
|
||||||
python-pip
|
python-pip
|
||||||
gdm
|
|
||||||
neofetch
|
neofetch
|
||||||
git
|
git
|
||||||
scrot
|
scrot
|
||||||
@ -87,3 +86,4 @@ blueman
|
|||||||
pulseaudio-bluetooth
|
pulseaudio-bluetooth
|
||||||
bluez
|
bluez
|
||||||
bluez-libs
|
bluez-libs
|
||||||
|
sddm
|
||||||
|
27
install.sh
27
install.sh
@ -38,7 +38,7 @@ ask() {
|
|||||||
|
|
||||||
# delete target, create dirs if they don't exist yet and finally symlink the dir
|
# delete target, create dirs if they don't exist yet and finally symlink the dir
|
||||||
function linkDir {
|
function linkDir {
|
||||||
rm -rf "$2";
|
rm -rf "$2"
|
||||||
mkdir -p "${2%/*}"
|
mkdir -p "${2%/*}"
|
||||||
ln -sf "$1" "$2"
|
ln -sf "$1" "$2"
|
||||||
}
|
}
|
||||||
@ -113,8 +113,8 @@ function install_config {
|
|||||||
sudo ln -sf "$PWD"/bash/Completion /etc/bash_completion.d
|
sudo ln -sf "$PWD"/bash/Completion /etc/bash_completion.d
|
||||||
|
|
||||||
# create empty .custom alias file
|
# create empty .custom alias file
|
||||||
echo "" > ~/.custom
|
echo "" >~/.custom
|
||||||
echo "" > ~/.variables
|
echo "" >~/.variables
|
||||||
|
|
||||||
# system fixes
|
# system fixes
|
||||||
echo fs.inotify.max_user_watches=524288 | sudo tee /etc/sysctl.d/40-max-user-watches.conf && sudo sysctl --system
|
echo fs.inotify.max_user_watches=524288 | sudo tee /etc/sysctl.d/40-max-user-watches.conf && sudo sysctl --system
|
||||||
@ -133,7 +133,6 @@ function install_dependencies {
|
|||||||
fileToList dependencies/npm.txt | xargs sudo npm install -g
|
fileToList dependencies/npm.txt | xargs sudo npm install -g
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# =======================================
|
# =======================================
|
||||||
# User output functions
|
# User output functions
|
||||||
# =======================================
|
# =======================================
|
||||||
@ -177,7 +176,6 @@ function computer {
|
|||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# =======================================
|
# =======================================
|
||||||
# Main loop
|
# Main loop
|
||||||
# =======================================
|
# =======================================
|
||||||
@ -188,10 +186,10 @@ intro
|
|||||||
|
|
||||||
ask "Do you want to continue installing my config and rice?" Y &&
|
ask "Do you want to continue installing my config and rice?" Y &&
|
||||||
|
|
||||||
# Ask for dependency installation
|
# Ask for dependency installation
|
||||||
if ask "Do you want to install the applications listen in ./dependencies? (might prompt for password)" Y; then
|
if ask "Do you want to install the applications listen in ./dependencies? (might prompt for password)" Y; then
|
||||||
install_dependencies
|
install_dependencies
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ask for config installation
|
# Ask for config installation
|
||||||
if ask "Do you want to install the config files?" Y; then
|
if ask "Do you want to install the config files?" Y; then
|
||||||
@ -203,9 +201,10 @@ if ask "Do you want to install the fonts?" Y; then
|
|||||||
install_fonts
|
install_fonts
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ask to enable gdm
|
# ask to enable the display manager
|
||||||
if ask "Do you want to enable GDM?" Y; then
|
if ask "Do you want to enable sddm?" Y; then
|
||||||
sudo systemctl enable gdm.service
|
sudo systemctl set-default graphical.target
|
||||||
|
sudo systemctl enable sddm.service
|
||||||
fi
|
fi
|
||||||
|
|
||||||
clear
|
clear
|
||||||
@ -215,10 +214,10 @@ prompt=$(echo $'\n> ' "Please select a specific computer to install or q to fini
|
|||||||
|
|
||||||
PS3="$prompt: "
|
PS3="$prompt: "
|
||||||
select opt in "$PWD/computers"/*; do
|
select opt in "$PWD/computers"/*; do
|
||||||
if (( REPLY == "q" )) ; then
|
if ((REPLY == "q")); then
|
||||||
break
|
break
|
||||||
|
|
||||||
elif (( REPLY > 0 )) ; then
|
elif ((REPLY > 0)); then
|
||||||
bash "$opt/install.sh"
|
bash "$opt/install.sh"
|
||||||
break
|
break
|
||||||
else
|
else
|
||||||
@ -227,4 +226,4 @@ select opt in "$PWD/computers"/*; do
|
|||||||
done
|
done
|
||||||
clear
|
clear
|
||||||
|
|
||||||
echo "Enjoy using my rice! Do not forget to select i3 in GDM :)"
|
echo "Enjoy using my rice! Do not forget to select i3 in sddm :)"
|
||||||
|
Loading…
Reference in New Issue
Block a user