xd

7 files changed, 66 insertions, 16 deletions

diff --git a/wallust/templates/foot b/wallust/templates/foot
index 151ecae..4f487ba 100644
--- a/wallust/templates/foot
+++ b/wallust/templates/foot
@@ -10,7 +10,7 @@ blink=yes
 [scrollback]
 indicator-position=none
 
-[colors]
+[colors-dark]
 foreground={{foreground | strip}}
 background={{background | strip}}
 
diff --git a/wallust/templates/niri b/wallust/templates/niri
index 3f454cb..579c061 100644
--- a/wallust/templates/niri
+++ b/wallust/templates/niri
@@ -116,12 +116,56 @@ overview {
 }
 
 animations {
-  // off
+	window-resize {
+		spring damping-ratio=0.75 stiffness=250 epsilon=0.0001
+	}
+	window-open {
+		duration-ms 500
+		curve "ease-out-expo"
+		custom-shader r"
+			// Fall from Top
+			vec4 open_color(vec3 coords_geo, vec3 size_geo) {
+				float progress = niri_clamped_progress * niri_clamped_progress;
+				vec2 coords = (coords_geo.xy - vec2(0.5, 0.0)) * size_geo.xy;
+				coords.y += (1.0 - progress) * 1440.0;
+				float random = (niri_random_seed - 0.5) / 2.0;
+				random = sign(random) - random;
+				float max_angle = 0.5 * random;
+				float angle = (1.0 - progress) * max_angle;
+				mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle));
+				coords = rotate * coords;
+				coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 0.0), 1.0);
+				vec3 coords_tex = niri_geo_to_tex * coords_geo;
+				return texture2D(niri_tex, coords_tex.st);
+			}
+		"
+	}
+	window-close {
+		duration-ms 500
+		curve "linear"
+		custom-shader r"
+			// Fall and Rotate
+			vec4 close_color(vec3 coords_geo, vec3 size_geo) {
+				float progress = niri_clamped_progress * niri_clamped_progress;
+				vec2 coords = (coords_geo.xy - vec2(0.5, 1.0)) * size_geo.xy;
+				coords.y -= progress * 1440.0;
+				float random = (niri_random_seed - 0.5) / 2.0;
+				random = sign(random) - random;
+				float max_angle = 0.5 * random;
+				float angle = progress * max_angle;
+				mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle));
+				coords = rotate * coords;
+				coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 1.0), 1.0);
+				vec3 coords_tex = niri_geo_to_tex * coords_geo;
+				return texture2D(niri_tex, coords_tex.st);
+			}
+		"
+	}
 }
 
 layer-rule {
-    match namespace="^swww-daemon$"
-    place-within-backdrop true
+  match namespace="^wallpaper$"
+  place-within-backdrop true
 }
 
 window-rule {
@@ -135,6 +179,7 @@ window-rule {
 }
 window-rule {
   match app-id="SFML"
+	open-floating true
 }
 window-rule {
 	match is-floating=true
@@ -150,10 +195,13 @@ switch-events {
 binds {
   Mod+Backslash { show-hotkey-overlay; }
 
-  Mod+Return         hotkey-overlay-title="Spawn Terminal"      { spawn "foot"; }
-  Mod+Space          hotkey-overlay-title="Spawn Applauncher"   { spawn "rofi" "-show" "drun" "-theme" "~/.config/rofi/applauncher.rasi"; }
-  Mod+Escape         hotkey-overlay-title="Spawn Powermenu"     { spawn "~/.config/scripts/powermenu"; }
-  Mod+W              hotkey-overlay-title="Spawn Wallpapermenu" { spawn "~/.config/scripts/wallpapermenu"; }
+  Mod+Return			hotkey-overlay-title="Spawn Terminal"       { spawn "foot"; }
+  Mod+Space				hotkey-overlay-title="Spawn Applauncher"		{ spawn "rofi" "-show" "drun" "-theme" "~/.config/rofi/applauncher.rasi"; }
+  Mod+Escape			hotkey-overlay-title="Spawn Powermenu"      { spawn "~/.config/scripts/powermenu"; }
+  Mod+W						hotkey-overlay-title="Spawn Wallpapermenu"  { spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/"; }
+  Mod+Alt+W																										{ spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Misc/Backgrounds/"; }
+  Mod+Shift+W			hotkey-overlay-title="Random Wallpaper"     { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/"; }
+  Mod+Shift+Alt+W																							{ spawn-sh "~/.config/scripts/set_random ~/Pictures/Misc/Backgrounds/"; }
 
   XF86AudioRaiseVolume  allow-when-locked=true { spawn "pamixer" "-i" "5"; }
   XF86AudioLowerVolume  allow-when-locked=true { spawn "pamixer" "-d" "5"; }
@@ -225,6 +273,7 @@ binds {
   Mod+Ctrl+R  { reset-window-height; }
   Mod+F       { maximize-column; }
   Mod+Shift+F { fullscreen-window; }
+	Mod+Ctrl+F  { maximize-window-to-edges; }
   Mod+C       { center-column; }
 
   Mod+Minus { set-column-width "-1%"; }
diff --git a/wallust/templates/rofi-applauncher b/wallust/templates/rofi-applauncher
index f27e4b4..0dfb8a4 100644
--- a/wallust/templates/rofi-applauncher
+++ b/wallust/templates/rofi-applauncher
@@ -36,5 +36,5 @@ element-text {
 	color: inherit;
 }
 element selected {
-	color: {{color4}};
+	color: {{color1}};
 }
diff --git a/wallust/templates/rofi-wallpapermenu b/wallust/templates/rofi-wallpapermenu
index fe4fe13..b1ea0da 100644
--- a/wallust/templates/rofi-wallpapermenu
+++ b/wallust/templates/rofi-wallpapermenu
@@ -38,7 +38,8 @@ element-icon {
 	margin: -100 0;
 	squared: true;
 }
-element selected{
+element selected {
 	text-color: inherit;
+	border: 5;
 	border-color: {{color4}};
 }
diff --git a/wallust/templates/swaylock b/wallust/templates/swaylock
index e17ce46..2a8a860 100644
--- a/wallust/templates/swaylock
+++ b/wallust/templates/swaylock
@@ -7,7 +7,7 @@ font-size=50
 
 clock
 timestr=%H:%M:%S
-datestr=%a %D
+datestr=%a %d/%m/%y
 
 image={{wallpaper}}
 effect-blur=5x2
diff --git a/wallust/templates/waybar b/wallust/templates/waybar
index 7b3fb02..da7690b 100644
--- a/wallust/templates/waybar
+++ b/wallust/templates/waybar
@@ -69,7 +69,7 @@ tooltip label {
   color: {{foreground}};
 }
 
-#bluetooth.off, #pulseaudio.muted, #network.disconnected, #battery.warning, #idle_inhibitor.deactivated {
+#bluetooth.off, #pulseaudio.muted, #network.disconnected, #battery.warning, #battery.notempty, #idle_inhibitor.deactivated {
   background: {{color0}};
 }
 #bluetooth.off {
@@ -81,7 +81,7 @@ tooltip label {
 #network.disconnected {
   color: {{color5}};
 }
-#battery.warning {
+#battery.warning, #battery.notempty {
   color: {{color6}};
 }
 #battery.charging {
diff --git a/wallust/wallust.toml b/wallust/wallust.toml
index 94a6665..9a63624 100644
--- a/wallust/wallust.toml
+++ b/wallust/wallust.toml
@@ -1,8 +1,8 @@
-backend = "kmeans"
+backend = "full"
 check_contrast = true
-color_space = "lab"
+color_space = "salience"
 fallback_generator = "complementary"
-palette = "ansidark16"
+palette = "dark16"
 
 [templates]
 foot =								{ src = "foot",								dst = "~/.config/foot/foot.ini" }