From 1e2888851ed5c4f3f4b3a3017d49ebe76e848974 Mon Sep 17 00:00:00 2001
From: voidarc <admin@voidarc.co.uk>
Date: Tue, 18 Aug 2026 11:43:34 +0100
Subject: [PATCH] fixed hyprlock import stuff

---
 modules/features/hyprlock/default.nix   | 114 +++++++++++++++++++++++-
 modules/features/hyprlock/hyprlock.conf | 110 -----------------------
 2 files changed, 113 insertions(+), 111 deletions(-)
 delete mode 100644 modules/features/hyprlock/hyprlock.conf

diff --git a/modules/features/hyprlock/default.nix b/modules/features/hyprlock/default.nix
index a7ff428..5201f48 100644
--- a/modules/features/hyprlock/default.nix
+++ b/modules/features/hyprlock/default.nix
@@ -11,7 +11,119 @@
   perSystem = {pkgs, ...}: {
     packages.hyprlock = inputs.wrappers.wrappers.hyprlock.wrap {
       inherit pkgs;
-      "hyprlock.conf".path = ./hyprlock.conf;
+      "hyprlock.conf".content = ''
+        source = ${./mocha.conf}
+
+        $accent = $mauve
+        $accentAlpha = $mauveAlpha
+        $font = FiraMono Nerd Font
+
+        # GENERAL
+        general {
+          hide_cursor = true
+        }
+
+        # BACKGROUND
+        background {
+          monitor =
+          path = screenshot
+          blur_passes = 3
+          color = rgba(0, 0, 0, 0)
+        }
+
+
+        # LAYOUT
+        label {
+          monitor =
+          text = Layout: $LAYOUT
+          color = $text
+          font_size = 25
+          font_family = $font
+          position = 30, -30
+          halign = left
+          valign = top
+        }
+
+        # TIME
+        label {
+          monitor =
+          text = $TIME
+          color = $text
+          font_size = 90
+          font_family = $font
+          position = -30, 0
+          halign = right
+          valign = top
+        }
+
+        # DATE
+        label {
+          monitor =
+          text = cmd[update:43200000] date +"%A, %d %B %Y"
+          color = $text
+          font_size = 25
+          font_family = $font
+          position = -30, -150
+          halign = right
+          valign = top
+        }
+
+        # FINGERPRINT
+        {
+          monitor = "";
+          text = "$FPRINTPROMPT";
+          color = "$text";
+          font_size = 14;
+          font_family = $font;
+          position = "0, -107";
+          halign = "center";
+          valign = "center";
+        }
+
+        image {
+          path = ${./cat.png}
+          size = 240
+          border_color = transparent
+          rounding = 0
+          position = 0, 7px
+        }
+
+        # USER AVATAR
+        image {
+          monitor =
+          path = $HOME/.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.2
+          dots_center = true
+          outer_color = $accent
+          inner_color = $surface0
+          font_color = $text
+          fade_on_empty = false
+          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, -47
+          halign = center
+          valign = center
+        }
+
+
+      '';
     };
   };
 }
diff --git a/modules/features/hyprlock/hyprlock.conf b/modules/features/hyprlock/hyprlock.conf
deleted file mode 100644
index cfb0912..0000000
--- a/modules/features/hyprlock/hyprlock.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-source = ./mocha.conf
-
-$accent = $mauve
-$accentAlpha = $mauveAlpha
-$font = FiraMono Nerd Font
-
-# GENERAL
-general {
-  hide_cursor = true
-}
-
-# BACKGROUND
-background {
-  monitor =
-  path = screenshot
-  blur_passes = 3
-  color = rgba(0, 0, 0, 0)
-}
-
-
-# LAYOUT
-label {
-  monitor =
-  text = Layout: $LAYOUT
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = 30, -30
-  halign = left
-  valign = top
-}
-
-# TIME
-label {
-  monitor =
-  text = $TIME
-  color = $text
-  font_size = 90
-  font_family = $font
-  position = -30, 0
-  halign = right
-  valign = top
-}
-
-# DATE
-label {
-  monitor =
-  text = cmd[update:43200000] date +"%A, %d %B %Y"
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = -30, -150
-  halign = right
-  valign = top
-}
-
-# FINGERPRINT
-{
-  monitor = "";
-  text = "$FPRINTPROMPT";
-  color = "$text";
-  font_size = 14;
-  font_family = $font;
-  position = "0, -107";
-  halign = "center";
-  valign = "center";
-}
-
-image {
-  path = ./cat.png
-  size = 240
-  border_color = transparent
-  rounding = 0
-  position = 0, 7px
-}
-
-# USER AVATAR
-image {
-  monitor =
-  path = $HOME/.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.2
-  dots_center = true
-  outer_color = $accent
-  inner_color = $surface0
-  font_color = $text
-  fade_on_empty = false
-  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, -47
-  halign = center
-  valign = center
-}
-