Merge pull request #221 from JaKooLit/development

Development

3 files changed, 308 insertions, 208 deletions

diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 7e8c1845..94590739 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -4,14 +4,18 @@
 
 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 {
-    grace = 1
+    grace = 0.5
 }
 
 background {
     monitor =
 	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
 
     # 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 +"%H:%M:%S") </big></b>" # 24H
     color = $color7
-    font_size = 94
+    font_size = 90
     font_family = JetBrains Mono Nerd Font 10
 
     position = 0, -150
@@ -87,7 +91,7 @@ label {
     monitor =
     text =    $USER
     color = $color7
-    font_size = 18
+    font_size = 24
     font_family = Inter Display Medium
 
     position = 0, 200
@@ -119,10 +123,10 @@ label {
 
 image {
     monitor =
-    path = $HOME/.config/rofi/.current_wallpaper
+    path = $picture # set the picture path above
     size = 230
-    rounding = -1
-    border_size = 4
+    rounding = -2
+    border_size = 1
     border_color = $color12
     rotate = 0
     reload_time = -1
diff --git a/config/waybar/style/Half-Moon.css b/config/waybar/style/Half-Moon.css
deleted file mode 100644
index 3fa290d7..00000000
--- a/config/waybar/style/Half-Moon.css
+++ /dev/null
@@ -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;
-
-  } 
diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css
new file mode 100644
index 00000000..4fff6025
--- /dev/null
+++ b/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;
+}
\ No newline at end of file