diff --git a/modules/home/hyprland/hyprlock.nix b/modules/home/hyprland/hyprlock.nix
index e582223..2b0dbf2 100644
--- a/modules/home/hyprland/hyprlock.nix
+++ b/modules/home/hyprland/hyprlock.nix
@@ -2,41 +2,89 @@
 {
   programs.hyprlock = {
     enable = true;
-    general = {
-      disable_loading_bar = true;
-      hide_cursor = true;
-    };
 
-    background = [{
-      path = /home/liv/nixos-config/modules/home/hyprland/lockscreen.png;
-      blur_passes = 0;
-      color = "rgb(1e1e2e)"; # base
-    }];
-
-    input-field = [{
-      size = "300, 60";
-      outline_thickness = 4;
-      dots_size = 0.2;
-      dots_spacing = 0.5;
-      dots_center = true;
-      outer_color = "rgb(cba6f7)"; # mauve
-      inner_color = "rgba(24, 24, 36, 1)";
-   #  inner_color = $surface0;
-      font_color = "rgba(203, 164, 243, 1)";
-   #  font_color = $text;
-      fade_on_empty = false;
-      placeholder_text = "\<span foreground\=\'\#\#cba6f7\'\>\󰌾  Logged in as \<span foreground\=\'\#\#cba6f7\'\>\<b\>\$USER\<\/b\>\<\/span\>\<\/span\>";
-   #  placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>;
-      hide_input = false;
-      check_color = "rgb(cba6f7)"; # mauve
-      fail_color = "rgb(f38ba8)";
-      fail_text = "\<i\>\<b\>\(\$ATTEMPTS\)\<\/b\>\<\/i\>";
-      capslock_color = "rgb(f9e2af)";
-      position = "0\, \-48";
-      halign = "center";
-      valign = "center";
-    }];
+    extraConfig = ''
+      source = $HOME/nixos-config/modules/home/hyprland/mocha.conf
+      
+      $accent = $mauve
+      $accentAlpha = $mauveAlpha
+      $font = JetBrainsMono Nerd Font
+      
+      # GENERAL
+      general {
+        disable_loading_bar = true
+        hide_cursor = true
+      }
+      
+      # BACKGROUND
+      background {
+        monitor =
+        path = ~/.config/background
+        blur_passes = 0
+        color = $base
+      }
+      
+      # TIME
+      #label {
+      #    monitor =
+      #    text = cmd[update:30000] echo "$(date +"%R")"
+      #    color = $text
+      #    font_size = 90
+      #    font_family = $font
+      #    position = -30, 0
+      #    halign = right
+      #    valign = top
+      #}
+      
+      # DATE 
+      #label {
+      #    monitor = 
+      #    text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
+      #    color = $text
+      #    font_size = 25
+      #    font_family = $font
+      #    position = -30, -150
+      #    halign = right
+      #    valign = top
+      #}
+      
+      # USER AVATAR
+      
+      #image {
+      #    monitor = 
+      #    path = ~/.face
+      #    size = 100
+      #    border_color = $accent
+      #
+      #    position = 0, 75
+      #    halign = center
+      #    valign = center
+      #}
+      
+      # INPUT FIELD
+      input-field {
+        monitor =
+        size = 300, 60
+        outline_thickness = 4
+        dots_size = 0.2
+        dots_spacing = 0.5
+        dots_center = true
+        outer_color = $accent
+        inner_color = rgba(24, 24, 36, 1)
+       #inner_color = $surface0
+        font_color = rgba(203, 164, 243, 1)
+       #font_color = $text
+        fade_on_empty = false
+        placeholder_text = <span foreground="##$accentAlpha">󰌾  Logged in as <span foreground="##$accentAlpha"><b>$USER</b></span></span>
+       #placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
+        hide_input = false
+        check_color = $accent
+        fail_color = $red
+        fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
+        capslock_color = $yellow
+        position = 0, -48
+        halign = center
+        valign = center
+      }'';
   };
-
-
 }