This commit is contained in:
Stephan Raabe 2024-01-11 16:03:36 +01:00
parent f807a8af03
commit 222b23bb4c
37 changed files with 303 additions and 126 deletions

View File

@ -35,13 +35,13 @@ alias od='~/private/onedrive.sh'
alias rw='~/dotfiles/waybar/reload.sh' alias rw='~/dotfiles/waybar/reload.sh'
alias winclass="xprop | grep 'CLASS'" alias winclass="xprop | grep 'CLASS'"
alias dot="cd ~/dotfiles" alias dot="cd ~/dotfiles"
alias cleanup='~/dotfiles/scripts/cleanup.sh'
# ----------------------------------------------------- # -----------------------------------------------------
# Window Managers # Window Managers
# ----------------------------------------------------- # -----------------------------------------------------
alias Qtile='startx' alias Qtile='startx'
# alias QtileWayland='qtile start -b wayland'
# Hyprland with Hyprland # Hyprland with Hyprland
# ----------------------------------------------------- # -----------------------------------------------------

View File

@ -46,6 +46,7 @@ packagesPacman=(
"xdg-user-dirs" "xdg-user-dirs"
"networkmanager" "networkmanager"
"network-manager-applet" "network-manager-applet"
"xclip"
); );
packagesYay=( packagesYay=(

View File

@ -269,6 +269,23 @@ echo -e "${NONE}"
echo "Waybar Network restored." echo "Waybar Network restored."
fi fi
# Restore Waybar Idle
targetFile1="$HOME/dotfiles/waybar/themes/ml4w/config"
targetFile2="$HOME/dotfiles/waybar/themes/ml4w-blur/config"
targetFile3="$HOME/dotfiles/waybar/themes/ml4w-blur-bottom/config"
targetFile4="$HOME/dotfiles/waybar/themes/ml4w-bottom/config"
settingsFile="$HOME/dotfiles/.settings/waybar_swaylock"
if [ -f $settingsFile ] ;then
startMarker="START IDLE TOOGLE"
endMarker="END IDLE TOOGLE"
customtext="$(cat $settingsFile)"
_replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile1"
_replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile2"
_replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile3"
_replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile4"
echo "Waybar Idle restored."
fi
# Restore Waybar nmapplet # Restore Waybar nmapplet
targetFile="$HOME/dotfiles-versions/$version/hypr/conf/autostart.conf" targetFile="$HOME/dotfiles-versions/$version/hypr/conf/autostart.conf"
settingsFile="$HOME/dotfiles/.settings/waybar_nmapplet" settingsFile="$HOME/dotfiles/.settings/waybar_nmapplet"
@ -290,5 +307,16 @@ echo -e "${NONE}"
echo "keyboard natural_scroll restored." echo "keyboard natural_scroll restored."
fi fi
# Restore Start Swaylock
targetFile="$HOME/dotfiles/hypr/scripts/lockscreentime.sh"
settingsFile="$HOME/dotfiles/.settings/hypr_lockscreen"
if [ -f $settingsFile ] ;then
startMarker="START SWAYIDLE"
endMarker="END SWAYIDLE"
customtext="$(cat $settingsFile)"
_replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile"
echo "Swaylock start restored."
fi
echo "" echo ""
fi fi

View File

@ -1 +1 @@
2.7.1 2.7.2RC1

2
.version/version.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
echo $(cat ~/dotfiles/.version/name) $(cat ~/dotfiles/.version/version)

View File

@ -1,3 +1,17 @@
Version 2.7.2
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.7.2
--------------------------------------------------------
Hyprland:
- New waybar icon to enable/disable swaylock. Left mouse click to toggle swaylock, right mouse click to start swaylock
- Show/Hide idle_inhibitor module (swaylock) in Settings script
- Start of swayidle can be deactivated in the settings script
- New animation variation animation-moving.conf
General:
- Installation script bug fixing
- Alias cleanup added to .bashrc for Arch Linux maintenance
- New Hyprland configuration variation script to roll back to default variations via tty
Version 2.7.1 Version 2.7.1
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.7.1 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.7.1
-------------------------------------------------------- --------------------------------------------------------

View File

@ -1,11 +1,12 @@
# ML4W dotfiles 2.7.1 # ML4W dotfiles 2.7.2 RC1
This is my configuration of Hyprland (Wayland) and Qtile (X11) for Arch Linux based distributions. This package includes an installation script to install and setup the required components. This is my configuration of Hyprland (Wayland) and Qtile (X11) for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
<a href="https://youtu.be/e9ro_P9rbFk" target="_blank"><img src="screenshots/v271/screenshot-271-1.png" alt="Click to watch on YouTube" /></a> <a href="https://youtu.be/e9ro_P9rbFk" target="_blank"><img src="screenshots/v271/screenshot-271-1.png" alt="Click to watch on YouTube" /></a>
PLEASE NOTE: This branch is the rolling release of my dotfiles and includes the latest changes. PLEASE NOTE: This branch is the rolling release of the ML4W dotfiles and includes the latest changes.
Please be aware that this version is not a tested release.
Latest official release
You can find the installation video on YouTube: <a href="https://youtu.be/kHG5czrQ7WA" target="_blank">Install Arch Linux with Hyprland & Qtile</a> You can find the installation video on YouTube: <a href="https://youtu.be/kHG5czrQ7WA" target="_blank">Install Arch Linux with Hyprland & Qtile</a>
@ -45,14 +46,14 @@ The reference installation on the dotfiles is based on Arch Linux installed with
Please watch the video on YouTube: https://youtu.be/kHG5czrQ7WA Please watch the video on YouTube: https://youtu.be/kHG5czrQ7WA
## Installation with GIT (Rolling Release of main branch) ## Installation with GIT of Rolling Release
``` ```
# 1.) Change into your Downloads folder # 1.) Change into your Downloads folder
cd ~/Downloads cd ~/Downloads
# 2.) Clone the dotfiles repository into the Downloads folder # 2.) Clone the dotfiles repository into the Downloads folder
git clone --depth=1 https://gitlab.com/stephan-raabe/dotfiles.git git clone https://gitlab.com/stephan-raabe/dotfiles.git
# 3.) Change into the dotfiles folder # 3.) Change into the dotfiles folder
cd dotfiles cd dotfiles
@ -61,11 +62,36 @@ cd dotfiles
./install.sh ./install.sh
``` ```
## Update with GIT (Rolling Release of main branch)
## Installation with GIT of the latest release
```
# 1.) Change into your Downloads folder where you have downloaded the release to
cd ~/Downloads
# 2.) Unzip
git clone --branch 2.7.1 https://gitlab.com/stephan-raabe/dotfiles.git
# 3.) Change into the new dotfiles folder
cd dotfiles
# 4.) Start the installation to update
./install.sh
```
## Update with GIT
``` ```
# 1.) Change into your Downloads folder # 1.) Change into your Downloads folder
cd ~/Downloads/dotfiles cd ~/Downloads/dotfiles
# Switch to rolling release
# git checkout origin/main
# Switch to other version
# git checkout 2.7.1
# 2.) Pull the latest version and update the repository # 2.) Pull the latest version and update the repository
git stash; git pull git stash; git pull
@ -74,46 +100,7 @@ git stash; git pull
``` ```
## Update with GIT (Rolling Release of main branch) (fresh update) ## Dotfiles Installer
You can also update by deleting the ~/Downloads/dotfiles folder and clone again.
```
# 1.) Change into your Downloads folder
cd ~/Downloads
# 2.) Delete existing dotfiles folder from Downloads folder
rm -rf ~/Downloads/dotfiles
# 3.) Clone the dotfiles repository into the Downloads folder
git clone --depth=1 https://gitlab.com/stephan-raabe/dotfiles.git
# 4.) Change into the dotfiles folder
cd dotfiles
# 5.) Start the installation to update
./install.sh
```
## Installation by downloading the latest release
If you don't want to use the rolling release, you can download the latest release the latest release https://gitlab.com/stephan-raabe/dotfiles/-/releases or choose the the latest tag https://gitlab.com/stephan-raabe/dotfiles/-/tags and download the zip.
```
# 1.) Change into your Downloads folder where you have downloaded the release to
cd ~/Downloads
# 2.) Unzip
unzip dotfiles-2.6.zip
# 3.) Change into the new dotfiles folder
cd dotfiles-2.6
# 4.) Start the installation to update
./install.sh
```
You can also use the dotfiles installer script to download and install the latest release: https://gitlab.com/stephan-raabe/installer You can also use the dotfiles installer script to download and install the latest release: https://gitlab.com/stephan-raabe/installer

View File

@ -0,0 +1,18 @@
# -----------------------------------------------------
# Animations
# name "Moving"
# -----------------------------------------------------
animations {
enabled = true
bezier = overshot, 0.05, 0.9, 0.1, 1.05
bezier = smoothOut, 0.5, 0, 0.99, 0.99
bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
animation = windows, 1, 5, overshot, slide
animation = windowsOut, 1, 3, smoothOut
animation = windowsIn, 1, 3, smoothOut
animation = windowsMove, 1, 4, smoothIn, slide
animation = border, 1, 5, default
animation = fade, 1, 5, smoothIn
animation = fadeDim, 1, 5, smoothIn
animation = workspaces, 1, 6, default
}

View File

@ -1,3 +1,7 @@
# -----------------------------------------------------
# Animations
# name "Fast"
# -----------------------------------------------------
animations { animations {
enabled = true enabled = true
bezier = linear, 0, 0, 1, 1 bezier = linear, 0, 0, 1, 1

11
hypr/conf/ml4w.conf Normal file
View File

@ -0,0 +1,11 @@
# -----------------------------------------------------
# ML4W configurations
# -----------------------------------------------------
windowrulev2 = float,class:(ml4w-about)
windowrulev2 = size 60% 60%,class:(ml4w-about)
windowrulev2 = center,class:(ml4w-about)
windowrulev2 = float,class:(dotfiles-floating)
windowrulev2 = size 60% 60%,class:(dotfiles-floating)
windowrulev2 = center,class:(dotfiles-floating)

51
hypr/conf/restorevariations.sh Executable file
View File

@ -0,0 +1,51 @@
#!/bin/bash
clear
cat <<"EOF"
____ _
| _ \ ___ ___| |_ ___ _ __ ___
| |_) / _ \/ __| __/ _ \| '__/ _ \
| _ < __/\__ \ || (_) | | | __/
|_| \_\___||___/\__\___/|_| \___|
__ __ _ _ _
\ \ / /_ _ _ __(_) __ _| |_(_) ___ _ __ ___
\ \ / / _` | '__| |/ _` | __| |/ _ \| '_ \/ __|
\ V / (_| | | | | (_| | |_| | (_) | | | \__ \
\_/ \__,_|_| |_|\__,_|\__|_|\___/|_| |_|___/
EOF
echo "You can restore to the default Hyprland Variations."
echo "PLEASE NOTE: You can reactivate to a customized variation or selection in the settings script."
echo "Your customized variation will not be overwritten or deleted."
if gum confirm "Do you want to restore all variations to the default values?" ;then
echo
echo "source = ~/dotfiles/hypr/conf/keybindings/default.conf" > ~/dotfiles/hypr/conf/keybinding.conf
echo "Hyprland keybinding.conf restored!"
echo "source = ~/dotfiles/hypr/conf/environments/default.conf" > ~/dotfiles/hypr/conf/environment.conf
echo "Hyprland environment.conf restored!"
echo "source = ~/dotfiles/hypr/conf/windowrules/default.conf" > ~/dotfiles/hypr/conf/windowrule.conf
echo "Hyprland windowrule.conf restored!"
echo "source = ~/dotfiles/hypr/conf/animations/default.conf" > ~/dotfiles/hypr/conf/animation.conf
echo "Hyprland animation.conf restored!"
echo "source = ~/dotfiles/hypr/conf/decorations/default.conf" > ~/dotfiles/hypr/conf/decoration.conf
echo "Hyprland decoration.conf restored!"
echo "source = ~/dotfiles/hypr/conf/windows/default.conf" > ~/dotfiles/hypr/conf/window.conf
echo "Hyprland window.conf restored!"
echo "source = ~/dotfiles/hypr/conf/monitors/default.conf" > ~/dotfiles/hypr/conf/monitor.conf
echo "Hyprland monitor.conf restored!"
echo
echo ":: Restore done!"
else
echo ":: Restore canceled!"
exit
fi

View File

@ -9,6 +9,3 @@ windowrule = float,^(pavucontrol)$
windowrule = float,^(blueman-manager)$ windowrule = float,^(blueman-manager)$
windowrule = float,^(nm-connection-editor)$ windowrule = float,^(nm-connection-editor)$
windowrulev2 = float,class:(dotfiles-floating)
windowrulev2 = size 60% 60%,class:(dotfiles-floating)
windowrulev2 = center,class:(dotfiles-floating)

View File

@ -48,11 +48,16 @@ source = ~/dotfiles/hypr/conf/windowrule.conf
source = ~/dotfiles/hypr/conf/animation.conf source = ~/dotfiles/hypr/conf/animation.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Animation # Custom
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/custom.conf source = ~/dotfiles/hypr/conf/custom.conf
# -----------------------------------------------------
# Custom
# -----------------------------------------------------
source = ~/dotfiles/hypr/conf/ml4w.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Environment for xdg-desktop-portal-hyprland # Environment for xdg-desktop-portal-hyprland
# ----------------------------------------------------- # -----------------------------------------------------
# exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP

View File

@ -1,5 +0,0 @@
#!/bin/bash
if [ -f ~/.hyprland.sh ]; then
sleep 1
~/.hyprland.sh
fi

View File

@ -9,6 +9,9 @@
# by Stephan Raabe (2023) # by Stephan Raabe (2023)
# ----------------------------------------------------- # -----------------------------------------------------
# START SWAYIDLE
# exit
# END SWAYIDLE
source ~/dotfiles/.settings/swayidle.sh source ~/dotfiles/.settings/swayidle.sh
if [ -f "/usr/bin/swayidle" ]; then if [ -f "/usr/bin/swayidle" ]; then
echo "swayidle is installed." echo "swayidle is installed."

View File

@ -1,2 +0,0 @@
cd ~/hyprland-settings
./settings.sh dotfiles

View File

@ -95,7 +95,7 @@ _getModules() {
nameList+=("BACK") nameList+=("BACK")
fi fi
echo "" echo ""
selected=$(gum choose ${nameList[@]}) selected=$(gum choose --height 12 ${nameList[@]})
case $selected in case $selected in
BACK) BACK)
_goBack _goBack

View File

@ -0,0 +1,2 @@
name="Enable/Disable Swaylock"
order=1

View File

@ -0,0 +1,34 @@
#!/bin/bash
_getHeader "$name" "$author"
echo "Enable/Disable the start of Swaylock. Restart of Hyprland is required after a change."
# Define File
targetFile="$HOME/dotfiles/hypr/scripts/lockscreentime.sh"
settingsFile="$HOME/dotfiles/.settings/hypr_lockscreen"
# Define Markers
startMarker="START SWAYIDLE"
endMarker="END SWAYIDLE"
# Select Value
customvalue=$(gum choose "ENABLE" "DISABLE")
if [ ! -z $customvalue ]; then
if [ "$customvalue" == "ENABLE" ] ;then
customtext="# exit"
else
customtext="exit"
fi
_replaceInFile $startMarker $endMarker $customtext $targetFile
_writeSettings $settingsFile $customtext
# Reload Waybar
setsid $HOME/dotfiles/waybar/launch.sh 1>/dev/null 2>&1 &
_goBack
else
echo "ERROR: Define a value."
sleep 2
_goBack
fi

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
_getHeader "$name" "$author" _getHeader "$name" "$author"
echo "Define the label of the Apps Starter" echo "Define the label of the Apps Starter (Default is Apps). "
# Define File # Define File
targetFile="$HOME/dotfiles/waybar/modules.json" targetFile="$HOME/dotfiles/waybar/modules.json"

View File

@ -15,11 +15,13 @@ startMarker="START BT TOOGLE"
endMarker="END BT TOOGLE" endMarker="END BT TOOGLE"
# Select Value # Select Value
customvalue=$(gum choose "SHOW" "HIDE") customvalue=$(gum choose "SHOW" "HIDE" "DEFAULT")
if [ ! -z $customvalue ]; then if [ ! -z $customvalue ]; then
if [ "$customvalue" == "SHOW" ] ;then if [ "$customvalue" == "SHOW" ] ;then
customtext=" \"bluetooth\"," customtext=" \"bluetooth\","
elif [ "$customvalue" == "DEFAULT" ] ;then
customtext=" \"bluetooth\","
else else
customtext=" \/\/\"bluetooth\"," customtext=" \/\/\"bluetooth\","
fi fi

View File

@ -12,11 +12,13 @@ startMarker="START CHATGPT TOOGLE"
endMarker="END CHATGPT TOOGLE" endMarker="END CHATGPT TOOGLE"
# Select Value # Select Value
customvalue=$(gum choose "SHOW" "HIDE") customvalue=$(gum choose "SHOW" "HIDE" "DEFAULT")
if [ ! -z $customvalue ]; then if [ ! -z $customvalue ]; then
if [ "$customvalue" == "SHOW" ] ;then if [ "$customvalue" == "SHOW" ] ;then
customtext=" \"custom\/chatgpt\"," customtext=" \"custom\/chatgpt\","
elif [ "$customvalue" == "DEFAULT" ] ;then
customtext=" \"custom\/chatgpt\","
else else
customtext=" \/\/\"custom\/chatgpt\"," customtext=" \/\/\"custom\/chatgpt\","
fi fi

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
_getHeader "$name" "$author" _getHeader "$name" "$author"
echo "Define the start command to start the browser." echo "Define the start command to start the browser (Default: chromium)."
# Define File # Define File
targetFile="$HOME/dotfiles/.settings/browser.sh" targetFile="$HOME/dotfiles/.settings/browser.sh"

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
_getHeader "$name" "$author" _getHeader "$name" "$author"
echo "Define the start command to start the filemanager." echo "Define the start command to start the filemanager (Default: thunar)."
# Define File # Define File
targetFile="$HOME/dotfiles/.settings/filemanager.sh" targetFile="$HOME/dotfiles/.settings/filemanager.sh"

View File

@ -2,6 +2,7 @@
_getHeader "$name" "$author" _getHeader "$name" "$author"
echo "Define the start command to start the networkmanager (Must be installed on your system)." echo "Define the start command to start the networkmanager (Must be installed on your system)."
echo "(Default: nm-connection-editor)"
echo "Possible values: alacritty -e nmtui, nm-connection-editor, etc." echo "Possible values: alacritty -e nmtui, nm-connection-editor, etc."
# Define File # Define File

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
_getHeader "$name" "$author" _getHeader "$name" "$author"
echo "Define the start command to start the software manager." echo "Define the start command to start the software manager (Default: alacritty -e pacseek)."
# Define File # Define File
targetFile="$HOME/dotfiles/.settings/software.sh" targetFile="$HOME/dotfiles/.settings/software.sh"

View File

@ -0,0 +1,2 @@
name="Show/Hide Swaylock"
order=1

View File

@ -0,0 +1,40 @@
#!/bin/bash
_getHeader "$name" "$author"
echo "Hide or show the swaylock (idle_inhibitor) module in ML4W waybar themes."
# Define File
targetFile1="$HOME/dotfiles/waybar/themes/ml4w/config"
targetFile2="$HOME/dotfiles/waybar/themes/ml4w-blur/config"
targetFile3="$HOME/dotfiles/waybar/themes/ml4w-blur-bottom/config"
targetFile4="$HOME/dotfiles/waybar/themes/ml4w-bottom/config"
settingsFile="$HOME/dotfiles/.settings/waybar_swaylock"
# Define Markers
startMarker="START IDLE TOOGLE"
endMarker="END IDLE TOOGLE"
# Select Value
customvalue=$(gum choose "SHOW" "HIDE")
if [ ! -z $customvalue ]; then
if [ "$customvalue" == "SHOW" ] ;then
customtext=" \"idle_inhibitor\","
else
customtext=" \/\/\"idle_inhibitor\","
fi
_replaceInFile $startMarker $endMarker $customtext $targetFile1
_replaceInFile $startMarker $endMarker $customtext $targetFile2
_replaceInFile $startMarker $endMarker $customtext $targetFile3
_replaceInFile $startMarker $endMarker $customtext $targetFile4
_writeSettings $settingsFile $customtext
# Reload Waybar
setsid $HOME/dotfiles/waybar/launch.sh 1>/dev/null 2>&1 &
_goBack
else
echo "ERROR: Define a value."
sleep 2
_goBack
fi

View File

@ -1,15 +1,13 @@
#!/bin/bash #!/bin/bash
# _ clear
# ___| | ___ __ _ _ __ _ _ _ __ cat <<"EOF"
# / __| |/ _ \/ _` | '_ \ | | | | '_ \ ____ _
# | (__| | __/ (_| | | | | | |_| | |_) | / ___| | ___ __ _ _ __ _ _ _ __
# \___|_|\___|\__,_|_| |_| \__,_| .__/ | | | |/ _ \/ _` | '_ \ | | | | '_ \
# |_| | |___| | __/ (_| | | | | | |_| | |_) |
# \____|_|\___|\__,_|_| |_| \__,_| .__/
# by Stephan Raabe (2023) |_|
# -----------------------------------------------------
yay -Scc EOF
su -c 'pacman -Qtdq | pacman -Rns -'
su -c 'pacman -Qqd | pacman -Rsu -'
sudo pacman -Rns $(pacman -Qtdq)

View File

@ -12,7 +12,9 @@
# Quit all running waybar instances # Quit all running waybar instances
# ----------------------------------------------------- # -----------------------------------------------------
killall waybar killall waybar
pkill waybar
sleep 0.2 sleep 0.2
# ----------------------------------------------------- # -----------------------------------------------------
# Default theme: /THEMEFOLDER;/VARIATION # Default theme: /THEMEFOLDER;/VARIATION
# ----------------------------------------------------- # -----------------------------------------------------
@ -29,7 +31,7 @@ else
fi fi
IFS=';' read -ra arrThemes <<< "$themestyle" IFS=';' read -ra arrThemes <<< "$themestyle"
echo ${arrThemes[0]} echo "Theme: ${arrThemes[0]}"
if [ ! -f ~/dotfiles/waybar/themes${arrThemes[1]}/style.css ]; then if [ ! -f ~/dotfiles/waybar/themes${arrThemes[1]}/style.css ]; then
themestyle="/ml4w;/ml4w/light" themestyle="/ml4w;/ml4w/light"
@ -49,8 +51,4 @@ if [ -f ~/dotfiles/waybar/themes${arrThemes[1]}/style-custom.css ] ;then
style_file="style-custom.css" style_file="style-custom.css"
fi fi
# Check used files
echo "Config: $config_file"
echo "Style: $style_file"
waybar -c ~/dotfiles/waybar/themes${arrThemes[0]}/$config_file -s ~/dotfiles/waybar/themes${arrThemes[1]}/$style_file & waybar -c ~/dotfiles/waybar/themes${arrThemes[0]}/$config_file -s ~/dotfiles/waybar/themes${arrThemes[1]}/$style_file &

View File

@ -353,10 +353,11 @@
"idle_inhibitor": { "idle_inhibitor": {
"format": "{icon}", "format": "{icon}",
"tooltip": false, "tooltip": true,
"format-icons":{ "format-icons":{
"activated": "Auto lock OFF", "activated": "",
"deactivated": "ON" "deactivated": ""
} },
"on-click-right": "swaylock"
} }
} }

View File

@ -61,7 +61,9 @@
"group/hardware", "group/hardware",
"group/settings", "group/settings",
"custom/cliphist", "custom/cliphist",
// START IDLE TOOGLE
"idle_inhibitor", "idle_inhibitor",
// END IDLE TOOGLE
// START TRAY TOOGLE // START TRAY TOOGLE
"tray", "tray",
// END TRAY TOOGLE // END TRAY TOOGLE

View File

@ -60,7 +60,9 @@
// END NETWORK TOOGLE // END NETWORK TOOGLE
"group/hardware", "group/hardware",
"custom/cliphist", "custom/cliphist",
// START IDLE TOOGLE
"idle_inhibitor", "idle_inhibitor",
// END IDLE TOOGLE
// START TRAY TOOGLE // START TRAY TOOGLE
"tray", "tray",
// END TRAY TOOGLE // END TRAY TOOGLE

View File

@ -189,20 +189,18 @@ window#waybar.empty #window {
#idle_inhibitor { #idle_inhibitor {
margin-right: 15px; margin-right: 15px;
font-size: 16px; font-size: 22px;
font-weight: bold; font-weight: bold;
opacity: 0.8; opacity: 0.8;
color: @iconcolor; color: @iconcolor;
} }
#idle_inhibitor.activated { #idle_inhibitor.activated {
background-color: #dc2f2f; margin-right: 15px;
font-size: 16px; font-size: 20px;
color: #FFFFFF; font-weight: bold;
border-radius: 15px; opacity: 0.8;
padding: 2px 10px 0px 10px; color: #dc2f2f;
margin: 8px 15px 8px 0px;
opacity:0.8;
} }
/* ----------------------------------------------------- /* -----------------------------------------------------
@ -418,24 +416,3 @@ window#waybar.empty #window {
#tray > .needs-attention { #tray > .needs-attention {
-gtk-icon-effect: highlight; -gtk-icon-effect: highlight;
} }
/* -----------------------------------------------------
* Other
* ----------------------------------------------------- */
/*
label:focus {
background-color: #000000;
}
#backlight {
background-color: #90b1b1;
}
#network {
background-color: #2980b9;
}
#network.disconnected {
background-color: #f53c3c;
}
*/

View File

@ -60,7 +60,9 @@
// END NETWORK TOOGLE // END NETWORK TOOGLE
"group/hardware", "group/hardware",
"custom/cliphist", "custom/cliphist",
// START IDLE TOOGLE
"idle_inhibitor", "idle_inhibitor",
// END IDLE TOOGLE
// START TRAY TOOGLE // START TRAY TOOGLE
"tray", "tray",
// END TRAY TOOGLE // END TRAY TOOGLE

View File

@ -60,7 +60,9 @@
// END NETWORK TOOGLE // END NETWORK TOOGLE
"group/hardware", "group/hardware",
"custom/cliphist", "custom/cliphist",
// START IDLE TOOGLE
"idle_inhibitor", "idle_inhibitor",
// END IDLE TOOGLE
// START TRAY TOOGLE // START TRAY TOOGLE
"tray", "tray",
// END TRAY TOOGLE // END TRAY TOOGLE

View File

@ -188,22 +188,20 @@ window#waybar.empty #window {
* Idle Inhibator * Idle Inhibator
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#idle_inhibitor { #idle_inhibitor {
margin-right: 15px; margin-right: 15px;
font-size: 16px; font-size: 22px;
font-weight: bold; font-weight: bold;
opacity: 0.8; opacity: 0.8;
color: @iconcolor; color: @iconcolor;
} }
#idle_inhibitor.activated { #idle_inhibitor.activated {
background-color: #dc2f2f; margin-right: 15px;
font-size: 16px; font-size: 20px;
color:#ffffff; font-weight: bold;
border-radius: 15px; opacity: 0.8;
padding: 2px 10px 0px 10px; color: #dc2f2f;
margin: 5px 15px 5px 0px;
opacity:0.8;
} }
/* ----------------------------------------------------- /* -----------------------------------------------------