Browse Source

Merge pull request #221 from JaKooLit/development

Development
pull/225/head^2 v2.2.8-1
Ja.KooLit 2 years ago committed by GitHub
parent
commit
8cda78812d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 18
      config/hypr/hyprlock.conf
  2. 201
      config/waybar/style/Half-Moon.css
  3. 297
      config/waybar/style/[Dark] Half-Moon.css
  4. 30
      copy.sh

18
config/hypr/hyprlock.conf

@ -4,14 +4,18 @@
source = $HOME/.cache/wal/colors-hyprland source = $HOME/.cache/wal/colors-hyprland
# wallpaper and picture variables # supports png, jpg, webp (no animations, though)
$wallpaper = $HOME/.config/rofi/.current_wallpaper
$picture = $HOME/.config/rofi/.current_wallpaper
general { general {
grace = 1 grace = 0.5
} }
background { background {
monitor = monitor =
path = screenshot # screenshot of your desktop path = screenshot # screenshot of your desktop
# path = $HOME/.config/rofi/.current_wallpaper # NOTE only png supported for now #path = $wallpaper # set the picture path above
color = $color7 color = $color7
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
@ -75,7 +79,7 @@ label {
# text = cmd[update:1000] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM # text = cmd[update:1000] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM
text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
color = $color7 color = $color7
font_size = 94 font_size = 90
font_family = JetBrains Mono Nerd Font 10 font_family = JetBrains Mono Nerd Font 10
position = 0, -150 position = 0, -150
@ -87,7 +91,7 @@ label {
monitor = monitor =
text = $USER text = $USER
color = $color7 color = $color7
font_size = 18 font_size = 24
font_family = Inter Display Medium font_family = Inter Display Medium
position = 0, 200 position = 0, 200
@ -119,10 +123,10 @@ label {
image { image {
monitor = monitor =
path = $HOME/.config/rofi/.current_wallpaper path = $picture # set the picture path above
size = 230 size = 230
rounding = -1 rounding = -2
border_size = 4 border_size = 1
border_color = $color12 border_color = $color12
rotate = 0 rotate = 0
reload_time = -1 reload_time = -1

201
config/waybar/style/Half-Moon.css

@ -1,201 +0,0 @@
/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
/* ....................................*/
/* ..........Half Moon.................. */
/* NOTE: This is only for some waybar configs */
/* --- 👍 shared by https://github.com/TomekBobrowicz 👍 --- */
* {
font-size: 97%;
font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
font-weight: bold;
}
window#waybar {
background-color: rgba(26,27,38,0);
border-bottom: 1px solid rgba(26,27,38,0);
border-radius: 0px;
color: #E6B673;
}
#workspaces {
background: #0F1419;
margin: 5px;
padding: 0px 1px;
border-radius: 15px;
border: 0px;
font-style: normal;
color: #0F1419;
}
#workspaces button {
padding: 0px 5px;
margin: 4px 3px;
border-radius: 15px;
border: 0px;
color: #0F1419;
background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF);
opacity: 0.5;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#workspaces button.active {
padding: 0px 5px;
margin: 4px 3px;
border-radius: 15px;
border: 0px;
color: #0F1419;
background: linear-gradient(45deg, #59C2FF, #D2A6FF);
opacity: 1.0;
min-width: 40px;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#workspaces button:hover {
border-radius: 15px;
color: #0F1419;
background: linear-gradient(45deg, #59C2FF, #D2A6FF);
opacity: 0.8;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
@keyframes gradient_horizontal {
0% {
background-position: 0% 50%;
}
50% {
background-position: 100% 50%;
}
100% {
background-position: 0% 50%;
}
}
@keyframes swiping {
0% {
background-position: 0% 200%;
}
100% {
background-position: 200% 200%;
}
}
tooltip {
background: #0F1419;
border: 1px solid #D2A6FF;
border-radius: 10px;
}
tooltip label {
color: #F3F4F5;
}
#window {
color: #E6E1CF;
background: #0F1419;
border-radius: 50px 15px 50px 15px;
margin: 5px;
padding: 2px 20px;
}
#temperature,
#memory {
color: #E6B673;
background: #0F1419;
border-radius: 50px 15px 50px 15px;
margin: 5px;
padding: 2px 20px;
}
#custom-swaync,
#idle_inhibitor,
#clock {
color: #B8CC52;
background: #0F1419;
border-radius: 15px 50px 15px 50px;
margin: 5px;
padding: 2px 20px;
}
#cpu {
color: #F3F4F5;
background: #0F1419;
border-radius: 50px 15px 50px 15px;
margin: 5px;
padding: 2px 20px;
}
#disk {
color: #B8CC52;
background: #0F1419;
border-radius: 50px 15px 50px 15px;
margin: 5px;
padding: 2px 20px;
}
#battery {
color: #F07178;
background: #0F1419;
border-radius: 15px 50px 15px 50px;
margin: 5px;
padding: 2px 20px;
}
#network {
color: #FF8F40;
background: #0F1419;
border-radius: 50px 15px 50px 15px;
margin: 5px;
padding: 2px 20px;
}
#custom-hyprbindings {
color: #D2A6FF;
background: #0F1419;
border-radius: 15px 50px 15px 50px;
margin: 5px;
padding: 2px 20px;
}
#tray {
color: #E6E1CF;
background: #0F1419;
border-radius: 15px 30px 30px 50px;
margin: 5px 0px 5px 5px;
padding: 2px 20px;
}
#pulseaudio {
color: #59C2FF;
background: #0F1419;
border-radius: 50px 15px 50px 15px;
margin: 5px;
padding: 2px 20px;
}
#custom-notification {
color: #95E6CB;
background: #0F1419;
border-radius: 15px 50px 15px 50px;
margin: 5px;
padding: 2px 20px;
}
#custom-weather {
color: #59C2FF;
background: #0F1419;
border-radius: 0px 50px 15px 0px;
margin: 5px 0px;
padding: 2px 15px 2px 5px;
}
#custom-menu {
color: #59C2FF;
background: #0F1419;
border-radius: 0px 15px 50px 0px;
margin: 5px 5px 5px 0px;
padding: 1px 15px;
}
#custom-power {
color: #D2A6FF;
background: #0F1419;
border-radius: 15px 0px 0px 50px;
margin: 5px 0px;
padding: 2px 5px 2px 15px;
}

297
config/waybar/style/[Dark] Half-Moon.css

@ -0,0 +1,297 @@
/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
/* ....................................*/
/* ..........Half Moon.................. */
/* NOTE: This is only for some waybar configs */
/* --- 👍 shared by https://github.com/TomekBobrowicz 👍 --- */
* {
font-size: 97%;
font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
font-weight: bold;
}
window#waybar {
background-color: rgba(26,27,38,0);
border-bottom: 1px solid rgba(26,27,38,0);
border-radius: 0px;
color: #E6B673;
}
#taskbar,
#workspaces {
background: #0F1419;
margin: 5px;
padding: 0px 1px;
border-radius: 15px;
border: 0px;
font-style: normal;
color: #0F1419;
}
#taskbar button,
#workspaces button {
padding: 0px 5px;
margin: 4px 3px;
border-radius: 15px;
border: 0px;
color: #0F1419;
background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF);
opacity: 0.5;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#taskbar button.active,
#workspaces button.active {
padding: 0px 5px;
margin: 4px 3px;
border-radius: 15px;
border: 0px;
color: #0F1419;
background: linear-gradient(45deg, #59C2FF, #D2A6FF);
opacity: 1.0;
min-width: 40px;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#workspaces button:hover {
border-radius: 15px;
color: #0F1419;
background: linear-gradient(45deg, #59C2FF, #D2A6FF);
opacity: 0.8;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
@keyframes gradient_horizontal {
0% {
background-position: 0% 50%;
}
50% {
background-position: 100% 50%;
}
100% {
background-position: 0% 50%;
}
}
@keyframes swiping {
0% {
background-position: 0% 200%;
}
100% {
background-position: 200% 200%;
}
}
tooltip {
background: #0F1419;
border: 1px solid #D2A6FF;
border-radius: 10px;
}
tooltip label {
color: #F3F4F5;
}
#window {
color: #E6E1CF;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#temperature,
#memory {
color: #E6B673;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#custom-light_dark,
#custom-swaync,
#idle_inhibitor,
#clock {
color: #B8CC52;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#bluetooth {
color: blue;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#custom-cycle_wall,
#cpu {
color: #F3F4F5;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#disk {
color: #B8CC52;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#backlight,
#battery {
color: #F07178;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#backlight {
color: white;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#network {
color: #FF8F40;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#custom-hyprbindings {
color: #D2A6FF;
background: #0F1419;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#tray {
color: #E6E1CF;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#pulseaudio {
color: #59C2FF;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#custom-notification {
color: #95E6CB;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#custom-weather {
color: #59C2FF;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#custom-menu {
color: #59C2FF;
background: #0F1419;
border-radius: 0px 15px 50px 0px;
margin: 5px 5px 5px 0px;
padding: 1px 15px;
}
#custom-power {
color: #D2A6FF;
background: #0F1419;
border-radius: 15px 0px 0px 50px;
margin: 5px 0px;
padding: 2px 5px 2px 15px;
}
#custom-lock {
color: red;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#keyboard-state {
color: green;
background: #0F1419;
border-radius: 50px 50px;
margin: 5px;
padding: 2px 15px;
}
#battery.critical:not(.charging) {
color: #f53c3c;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#pulseaudio-slider slider {
min-width: 0px;
min-height: 0px;
opacity: 0;
background-image: none;
border: none;
box-shadow: none;
}
#pulseaudio-slider trough {
min-width: 80px;
min-height: 5px;
border-radius: 5px;
background-color: #6E6A86;
}
#pulseaudio-slider highlight {
min-height: 10px;
border-radius: 5px;
background-color: purple;
}
#backlight-slider slider {
min-width: 0px;
min-height: 0px;
opacity: 0;
background-image: none;
border: none;
box-shadow: none;
}
#backlight-slider trough {
min-width: 80px;
min-height: 10px;
border-radius: 5px;
background-color: #6E6A86;
}
#backlight-slider highlight {
min-width: 10px;
border-radius: 5px;
background-color: purple;
}

30
copy.sh

@ -124,26 +124,38 @@ while true; do
# Check if the answer is valid # Check if the answer is valid
if [[ "$answer" == "y" ]]; then if [[ "$answer" == "y" ]]; then
# Modify waybar config if 12hr is selected # Modify waybar config if 12hr is selected
sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules 2>&1 | tee -a "$LOG" || true
sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules 2>&1 | tee -a "$LOG" || true
# for hyprlock # for hyprlock
sed -i 's|^# text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|' ./config/hypr/hyprlock.conf sed -i 's|^# text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|' ./config/hypr/hyprlock.conf
sed -i 's|^text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|# text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|' ./config/hypr/hyprlock.conf sed -i 's|^text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|# text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|' ./config/hypr/hyprlock.conf
# for SDDM (custom theme) # for SDDM (simple-sddm)
sddm_folder="/usr/share/sddm/themes/simple-sddm" sddm_folder="/usr/share/sddm/themes/simple-sddm"
if [ -d "$sddm_folder" ]; then if [ -d "$sddm_folder" ]; then
echo "Simple sddm exists. Editing to 12H format" echo "Simple sddm exists. Editing to 12H format" 2>&1 | tee -a "$LOG"
sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf" sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true
sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf" sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true
echo "12H format set to SDDM theme successfully." echo "12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG"
fi fi
# for SDDM (simple-sddm-2)
sddm_folder_2="/usr/share/sddm/themes/simple-sddm-2"
if [ -d "$sddm_folder_2" ]; then
echo "Simple sddm 2 exists. Editing to 12H format" 2>&1 | tee -a "$LOG"
sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder_2/theme.conf" 2>&1 | tee -a "$LOG" || true
sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder_2/theme.conf" 2>&1 | tee -a "$LOG" || true
echo "12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG"
fi
break break
elif [[ "$answer" == "n" ]]; then elif [[ "$answer" == "n" ]]; then
echo "You chose not to change to 12H format." echo "You chose not to change to 12H format." 2>&1 | tee -a "$LOG"
break break
else else
echo "Invalid choice. Please enter y for yes or n for no." echo "Invalid choice. Please enter y for yes or n for no."

Loading…
Cancel
Save