Updates
This commit is contained in:
parent
7b936dead7
commit
59a037c694
41
.install/disabledm.sh → .install/displaymanager.sh
Normal file → Executable file
41
.install/disabledm.sh → .install/displaymanager.sh
Normal file → Executable file
|
@ -2,6 +2,7 @@
|
||||||
# Disable display manager
|
# Disable display manager
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
disman=0
|
disman=0
|
||||||
|
profile="Hyprland"
|
||||||
if [ -f /etc/systemd/system/display-manager.service ]; then
|
if [ -f /etc/systemd/system/display-manager.service ]; then
|
||||||
echo -e "${GREEN}"
|
echo -e "${GREEN}"
|
||||||
cat <<"EOF"
|
cat <<"EOF"
|
||||||
|
@ -14,12 +15,11 @@ cat <<"EOF"
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
echo -e "${NONE}"
|
echo -e "${NONE}"
|
||||||
echo "An active display manager has been dedected."
|
echo "An active display manager has been detected."
|
||||||
echo ""
|
echo ""
|
||||||
if [[ $profile == *"Hyprland"* ]]; then
|
if [[ $profile == *"Hyprland"* ]]; then
|
||||||
echo "IMPORTANT: Starting Hyprland from tty (terminal) with command Hyprland is recommended."
|
echo "IMPORTANT: Starting Hyprland works from tty (terminal) with command Hyprland or with the display manager SDDM (> 0.20.0 already installed or the latest git version (yay -S sddm-git)."
|
||||||
echo "Please check: https://wiki.hyprland.org/hyprland-wiki/pages/Getting-Started/Master-Tutorial/#launching-hyprland"
|
echo "Please check: https://wiki.hyprland.org/hyprland-wiki/pages/Getting-Started/Master-Tutorial/#launching-hyprland"
|
||||||
echo "Hyprland could work with SDDM > 0.20.0 or the latest git version (yay -S sddm-git)."
|
|
||||||
echo "Login with other display managers could fail and could have negative side effects on some devices."
|
echo "Login with other display managers could fail and could have negative side effects on some devices."
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
@ -30,17 +30,40 @@ echo -e "${NONE}"
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if gum confirm "Do you want to deactive the current display manager?" ;then
|
if gum confirm "Do you want to enable/update to sddm or disable the display manager?" --affirmative "Enable" --negative "Disable" ;then
|
||||||
|
if [ -f /etc/systemd/system/display-manager.service ]; then
|
||||||
|
sudo rm /etc/systemd/system/display-manager.service
|
||||||
|
fi
|
||||||
|
sudo systemctl enable sddm.service
|
||||||
|
|
||||||
|
if [ ! -d /etc/sddm.conf.d/ ]; then
|
||||||
|
sudo mkdir /etc/sddm.conf.d
|
||||||
|
echo "Folder /etc/sddm.conf.d created."
|
||||||
|
fi
|
||||||
|
|
||||||
|
sudo cp sddm/sddm.conf /etc/sddm.conf.d/
|
||||||
|
echo "File /etc/sddm.conf.d/sddm.conf updated."
|
||||||
|
|
||||||
|
if [ -f /usr/share/sddm/themes/sugar-candy/theme.conf ]; then
|
||||||
|
if [ -f ~/.cache/current_wallpaper.jpg ]; then
|
||||||
|
sudo cp ~/.cache/current_wallpaper.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/current_wallpaper.jpg
|
||||||
|
echo "Current wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
|
||||||
|
else
|
||||||
|
sudo cp wallpapers/default.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/current_wallpaper.jpg
|
||||||
|
echo "Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
|
||||||
|
fi
|
||||||
|
|
||||||
|
sudo cp sddm/theme.conf /usr/share/sddm/themes/sugar-candy/
|
||||||
|
echo "File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
|
||||||
|
fi
|
||||||
|
elif [ $? -eq 130 ]; then
|
||||||
|
exit 130
|
||||||
|
else
|
||||||
if [ -f /etc/systemd/system/display-manager.service ]; then
|
if [ -f /etc/systemd/system/display-manager.service ]; then
|
||||||
sudo rm /etc/systemd/system/display-manager.service
|
sudo rm /etc/systemd/system/display-manager.service
|
||||||
echo "Current display manager removed."
|
echo "Current display manager removed."
|
||||||
fi
|
fi
|
||||||
disman=1
|
disman=1
|
||||||
elif [ $? -eq 130 ]; then
|
|
||||||
exit 130
|
|
||||||
else
|
|
||||||
echo "Disable display manager skipped."
|
|
||||||
echo "You can run ~/dotfiles/hypr/script/disablewm.sh at a later point of time if needed."
|
|
||||||
fi
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
else
|
else
|
|
@ -33,8 +33,5 @@ if [[ $(_isFolderEmpty ~/dotfiles-versions/$version/) == 0 ]] ;then
|
||||||
echo "Execution of rsync -a -I --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/ is required."
|
echo "Execution of rsync -a -I --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/ is required."
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
if [ ! -f ~/dotfiles-versions/hook.sh ]; then
|
|
||||||
# cp .install/templates/hook.sh ~/dotfiles-versions/
|
|
||||||
fi
|
|
||||||
echo "dotfiles $version successfully prepared in ~/dotfiles-versions/$version/"
|
echo "dotfiles $version successfully prepared in ~/dotfiles-versions/$version/"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
12
CHANGELOG
12
CHANGELOG
|
@ -1,10 +1,18 @@
|
||||||
Version 2.6.2
|
Version 2.7
|
||||||
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.6.2
|
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.6.2
|
||||||
--------------------------------------------------------
|
--------------------------------------------------------
|
||||||
|
Installation:
|
||||||
|
- Display Manager SDDM and sugar-candy theme will be installed.
|
||||||
|
- Optional display manager disablement possible
|
||||||
|
|
||||||
Hyprland:
|
Hyprland:
|
||||||
- New Waybar Module Idle Inhibitor to deactivate the automatic start of swaylock e.g. to watch videos or for online meetings
|
- New Waybar Module Idle Inhibitor to deactivate the automatic start of swaylock e.g. to watch videos or for online meetings
|
||||||
- Create own customization of ML4W waybar themes: https://gitlab.com/stephan-raabe/dotfiles/-/tree/main/waybar?ref_type=heads#define-your-own-config-and-stylecss-for-a-ml4w-theme
|
- Create own customization of ML4W waybar themes: https://gitlab.com/stephan-raabe/dotfiles/-/tree/main/waybar?ref_type=heads#define-your-own-config-and-stylecss-for-a-ml4w-theme
|
||||||
- Waybar bluetooth module hidden when no bluetooth device detected or disabled
|
|
||||||
|
Settings Script:
|
||||||
|
- Settings script reworked completely. Implementation of custom modules are now possible.
|
||||||
|
- New waybar module to edit some ML4W waybar themes settings on the fly
|
||||||
|
- SDDM module to update the SDDM background with current wallpaper
|
||||||
|
|
||||||
Version 2.6.1
|
Version 2.6.1
|
||||||
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.6.1
|
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.6.1
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
name="Appearance"
|
name="Appearance"
|
||||||
order=2
|
order=10
|
||||||
author="Stephan Raabe ML4W"
|
author="Stephan Raabe ML4W"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
name="Keybindings"
|
name="Keybindings"
|
||||||
order=2
|
order=20
|
||||||
author="Stephan Raabe ML4W"
|
author="Stephan Raabe ML4W"
|
||||||
|
|
||||||
|
|
4
hypr/settings/modules/sddm/config.sh
Normal file
4
hypr/settings/modules/sddm/config.sh
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
name="SDDM"
|
||||||
|
desxription="Update the background wallpaper of sddm to the current wallpaper."
|
||||||
|
order=50
|
||||||
|
author="Stephan Raabe ML4W"
|
23
hypr/settings/modules/sddm/module.sh
Executable file
23
hypr/settings/modules/sddm/module.sh
Executable file
|
@ -0,0 +1,23 @@
|
||||||
|
#!/bin/bash
|
||||||
|
_getHeader "$name" "$author"
|
||||||
|
|
||||||
|
if gum confirm "Do you want to update the SDDM background with the current wallpaper?" ;then
|
||||||
|
if [ ! -d /etc/sddm.conf.d/ ]; then
|
||||||
|
sudo mkdir /etc/sddm.conf.d
|
||||||
|
echo "Folder /etc/sddm.conf.d created."
|
||||||
|
fi
|
||||||
|
|
||||||
|
sudo cp ~/dotfiles/sddm/sddm.conf /etc/sddm.conf.d/
|
||||||
|
echo "File /etc/sddm.conf.d/sddm.conf updated."
|
||||||
|
|
||||||
|
sudo cp ~/.cache/current_wallpaper.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/
|
||||||
|
echo "Current wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
|
||||||
|
|
||||||
|
sudo cp ~/dotfiles/sddm/theme.conf /usr/share/sddm/themes/sugar-candy/
|
||||||
|
echo "File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "SDDM background successfully updated!"
|
||||||
|
sleep 2
|
||||||
|
fi
|
||||||
|
_goBack
|
|
@ -1,3 +1,3 @@
|
||||||
name="System"
|
name="System"
|
||||||
order=2
|
order=30
|
||||||
author="Stephan Raabe ML4W"
|
author="Stephan Raabe ML4W"
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
name="Waybar"
|
name="Waybar"
|
||||||
order=1
|
order=40
|
||||||
|
|
|
@ -10,8 +10,8 @@ DimBackgroundImage="0.0"
|
||||||
ScaleImageCropped="true"
|
ScaleImageCropped="true"
|
||||||
## Whether the image should be cropped when scaled proportionally. Setting this to false will fit the whole image instead, possibly leaving white space. This can be exploited beautifully with illustrations (try it with "undraw.svg" included in the theme).
|
## Whether the image should be cropped when scaled proportionally. Setting this to false will fit the whole image instead, possibly leaving white space. This can be exploited beautifully with illustrations (try it with "undraw.svg" included in the theme).
|
||||||
|
|
||||||
ScreenWidth="1440"
|
# ScreenWidth="2560"
|
||||||
ScreenHeight="900"
|
# ScreenHeight="1440"
|
||||||
## Adjust to your resolution to help SDDM speed up on calculations
|
## Adjust to your resolution to help SDDM speed up on calculations
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user