guix primer

9 files changed, 33 insertions, 32 deletions

diff --git a/wallust/templates/foot b/mirenn/home/files/dotfiles/.config/wallust/templates/foot
index 09f97ed..6dfe5e6 100644
--- a/wallust/templates/foot
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/foot
@@ -1,7 +1,6 @@
-font=Hack Nerd Font:size=10,Sazanami Gothic:size=10,Noto Color Emoji:size=10
+font=Cica:size=10
 pad=10x10x10x10 center
 dpi-aware=yes
-term=foot-extra
 
 [cursor]
 style=block
diff --git a/wallust/templates/mako b/mirenn/home/files/dotfiles/.config/wallust/templates/mako
index 0211d7c..e06ab00 100644
--- a/wallust/templates/mako
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/mako
@@ -5,7 +5,7 @@ border-color={{color2}}
 border-radius=0
 default-timeout=5000
 ignore-timeout=1
-font=Noto Color Emoji 10, Sazanami Gothic 10, Hack Nerd Font 10
+font=Cica 10
 text-color={{foreground}}
 outer-margin=0,5,15,0
 anchor=bottom-right
diff --git a/wallust/templates/niri b/mirenn/home/files/dotfiles/.config/wallust/templates/niri
index b2e7812..95760b9 100644
--- a/wallust/templates/niri
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/niri
@@ -1,6 +1,8 @@
 prefer-no-csd
 screenshot-path "~/Pictures/Screenshots/%Y%m%d-%H%M%S.png"
 spawn-sh-at-startup "fish -c 'swaybg -i $IMG &'"
+spawn-at-startup "waybar"
+spawn-at-startup "swayidle" "-w"
 
 environment {
   QT_QPA_PLATFORM "wayland"
@@ -120,24 +122,24 @@ animations {
 	window-resize {
 		spring damping-ratio=0.75 stiffness=250 epsilon=0.0001
 	}
-	window-open {
-		duration-ms 500
-		curve "ease-out-expo"
+  window-open {
+		duration-ms 250
+		curve "ease-out-quad"
 		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);
+			vec4 zoom_in(vec3 coords_geo, vec3 size_geo) {
+				float progress = niri_clamped_progress;
+				float scale = progress;
+				vec2 coords = (coords_geo.xy - vec2(0.5, 0.5)) * size_geo.xy;
+				coords = coords / scale;
+				coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 0.5), 1.0);
 				vec3 coords_tex = niri_geo_to_tex * coords_geo;
-				return texture2D(niri_tex, coords_tex.st);
+				vec4 color = texture2D(niri_tex, coords_tex.st);
+				color.a *= progress;
+
+				return color;
+			}
+			vec4 open_color(vec3 coords_geo, vec3 size_geo) {
+				return zoom_in(coords_geo, size_geo);
 			}
 		"
 	}
@@ -196,13 +198,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-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/"; }
-  Mod+Shift+W			hotkey-overlay-title="Random Wallpaper"     { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/"; }
-  Mod+Alt+W																										{ spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/Alt/"; }
-  Mod+Alt+Shift+W																							{ spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/Alt/"; }
+  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+Shift+W		hotkey-overlay-title="Random Wallpaper"     { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/"; }
+  // Mod+Alt+W							    { spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/Alt/"; }
+  // Mod+Alt+Shift+W						    { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/Alt/"; }
 
   XF86AudioRaiseVolume  allow-when-locked=true { spawn "pamixer" "-i" "5"; }
   XF86AudioLowerVolume  allow-when-locked=true { spawn "pamixer" "-d" "5"; }
diff --git a/wallust/templates/nvim b/mirenn/home/files/dotfiles/.config/wallust/templates/nvim
index c5e966d..c5e966d 100644
--- a/wallust/templates/nvim
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/nvim
diff --git a/wallust/templates/rofi-applauncher b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-applauncher
index 359fce6..5a07aae 100644
--- a/wallust/templates/rofi-applauncher
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-applauncher
@@ -10,14 +10,14 @@ configuration {
 * {
 	background-color: {{background}};
 	color: {{foreground}};
-	font: "Hack Nerd Font 10";
+	font: "Cica 10";
 }
 window {
 	location: north west;
 	anchor: center;
-	width: 589;
+	width: 710;
 	y-offset: -22;
-	x-offset: 260;
+	x-offset: 220;
 	padding: 3 5 3 3;
 }
 mainbox {
diff --git a/wallust/templates/rofi-powermenu b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-powermenu
index 0ce26aa..0ce26aa 100644
--- a/wallust/templates/rofi-powermenu
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-powermenu
diff --git a/wallust/templates/rofi-wallpapermenu b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-wallpapermenu
index b1ea0da..70cd711 100644
--- a/wallust/templates/rofi-wallpapermenu
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-wallpapermenu
@@ -3,7 +3,7 @@
 * {
 	background-color: {{background}};
 	color: {{foreground}};
-	font: "Hack Nerd Font 10";
+	font: "Cica 10";
 }
 window {
 	border: 1;
diff --git a/wallust/templates/swaylock b/mirenn/home/files/dotfiles/.config/wallust/templates/swaylock
index 2a8a860..5e4e273 100644
--- a/wallust/templates/swaylock
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/swaylock
@@ -2,7 +2,7 @@ indicator-caps-lock
 indicator-idle-visible
 indicator-radius=100
 
-font=Hack Nerd Font
+font=Cica
 font-size=50
 
 clock
diff --git a/wallust/templates/waybar b/mirenn/home/files/dotfiles/.config/wallust/templates/waybar
index da7690b..3ff730c 100644
--- a/wallust/templates/waybar
+++ b/mirenn/home/files/dotfiles/.config/wallust/templates/waybar
@@ -1,5 +1,5 @@
 * {
-  font-family: Hack Nerd Font;
+  font-family: Cica;
 }
 
 window#waybar {