rework lockscreen

1 files changed, 48 insertions, 52 deletions

diff --git a/programs/hypr/hyprlock.nix b/programs/hypr/hyprlock.nix
index a93bfa4..6dc5181 100644
--- a/programs/hypr/hyprlock.nix
+++ b/programs/hypr/hyprlock.nix
@@ -2,7 +2,14 @@
   config,
   lib,
   ...
-}: {
+}:
+
+let
+  fg = "rgb(${config.theme.colors.fg})";
+  bg = "rgb(${config.theme.colors.bg})";
+  error = "rgb(${config.theme.colors.error})";
+  trans = "rgba(0,0,0,0)";
+in {
   default.lockScreen = lib.mkDefault "hyprlock";
 
   home-manager.users.${config.user} = {
@@ -11,77 +18,66 @@
 
       settings = {
         background = {
-          monitor = "";
-          path = config.theme.wallpaper;
-          blur_passes = 3;
-          contrast = 0.8916;
-          brightness = 0.8172;
-          vibrancy = 0.1696;
+          path = config.theme.lockscreen;
+          color = bg;
+          blur_passes = 0;
+          blur_size = 2;
+          noise = 0;
+          contrast = 0;
+          brightness = 0;
+          vibrancy = 0;
           vibrancy_darkness = 0.0;
         };
 
-        general = {
-          no_fade_in = false;
-          grace = 0;
-          disable_loading_bar = true;
-        };
-
+        # Password Input
         input-field = {
-          monitor = "";
-          size = "250, 60";
-          outline_thickness = 2;
-          dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
-          dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
+          size = "300, 30";
+          outline_thickness = 0;
+          dots_size = 0.25;
+          dots_spacing = 0.55;
           dots_center = true;
-          outer_color = "rgba(0, 0, 0, 0)";
-          inner_color = "rgba(0, 0, 0, 0.5)";
-          font_color = "rgb(${config.theme.colors.fg})";
-          font_family = config.theme.font.regular;
+          dots_rounding = -1;
+          outer_color = trans;
+          inner_color = trans;
+          font_color = fg;
           fade_on_empty = false;
-          placeholder_text = "<i><span foreground=\"##${config.theme.colors.fg}\">Input Password...</span></i>";
+          placeholder_text = "Enter Password";
           hide_input = false;
-          position = "0, -120";
+          check_color = error;
+          fail_color = error;
+          capslock_color = -1;
+          numlock_color = -1;
+          bothlock_color = -1;
+          invert_numlock = false;
+          swap_font_color = false;
+          font_family = config.theme.font.regular;
+          position = "0, 50";
           halign = "center";
-          valign = "center";
+          valign = "bottom";
         };
 
         label = [
-          # Clock
+          # Date
           {
-            monitor = "";
-            text = "cmd[update:1000] echo \"$(date +\"%-H:%M:%S\")\"";
-            font_size = 80;
-            font_color = "rgb(${config.theme.colors.fg})";
+            text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\"";
+            color = fg;
+            font_size = 20;
             font_family = config.theme.font.header;
-            position = "0, 500";
+            position = "0, -100";
             halign = "center";
-            valign = "center";
+            valign = "top";
           }
-
-          # Name
+          # Clock
           {
-            monitor = "";
-            text = config.fullName;
-            font_color = "rgb(${config.theme.colors.fg})";
+            text = "cmd[update:1000] echo \"$(date +\"%k:%M:%S\")\"";
+            color = fg;
+            font_size = 90;
             font_family = config.theme.font.header;
-            font_size = 25;
-            position = "0, 50";
+            position = "0, -130";
             halign = "center";
-            valign = "center";
+            valign = "top";
           }
         ];
-
-        # Profile image
-        image = {
-          monitor = "";
-          path = config.theme.avatar;
-          size = 300;
-          rounding = -1;
-          border_size = 0;
-          position = "0, 250";
-          halign = "center";
-          valign = "center";
-        };
       };
     };
   };