update ly version and update config

4 files changed, 31 insertions, 8 deletions

diff --git a/modules/apps/hyprlock.nix b/modules/apps/hyprlock.nix
index 8c6bb6a..6d4d238 100644
--- a/modules/apps/hyprlock.nix
+++ b/modules/apps/hyprlock.nix
@@ -50,7 +50,11 @@ in {
             fade_on_empty = false;
             placeholder_text =
               "Enter Password"
-              + (optionals config.fingerprint " or Touch Fingerprint");
+              + (
+                if config.fingerprint
+                then " or Touch Fingerprint"
+                else ""
+              );
             hide_input = false;
             check_color = error;
             fail_color = error;
diff --git a/modules/desktops/ly.nix b/modules/desktops/ly.nix
index 6cde7f5..672f918 100644
--- a/modules/desktops/ly.nix
+++ b/modules/desktops/ly.nix
@@ -1,32 +1,36 @@
-
 {
   lib,
   config,
   pkgs,
+  self,
+  system,
   ...
 }: let
   inherit (lib) mkIf;
   cfg = config.desktops;
 in {
   config = mkIf cfg.ly {
-
     # display manager
     services.displayManager.ly = {
       enable = true;
+      package = self.packages.${system}.ly;
+
       settings = let
         base = "0x00${config.theme.colors.base}";
         text = "0x00${config.theme.colors.text}";
+        bold = "0x01${config.theme.colors.text}";
         error = "0x00${config.theme.colors.error}";
         save_file = pkgs.writeText "ly-prefs" ''
           ${config.user}
-          0
+          1
         '';
       in {
         # general
         clear_password = true;
         default_input = "password";
-        numlock = true;
-        hide_f1_commands = true;
+        xinitrc = "null";
+        hide_version_string = true;
+        hide_key_hints = true;
         # state (evil)
         tty = 1;
         save = false;
@@ -35,11 +39,11 @@ in {
         # background
         bg = base;
         error_bg = base;
-        blank_box = false;
+        blank_box = true;
         # foreground
         fg = text;
         error_fg = error;
-        border_fg = text;
+        border_fg = bold;
       };
     };
 
diff --git a/pkgs/default.nix b/pkgs/default.nix
index e3b3f45..45e32bb 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,5 +2,6 @@
   arcanist = pkgs.callPackage ./arcanist {};
   astal = pkgs.callPackage ./astal inputs;
   libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {};
+  ly = pkgs.callPackage ./ly {};
   unofficial-homestuck-collection = pkgs.callPackage ./unofficial-homestuck-collection {};
 }
diff --git a/pkgs/ly/default.nix b/pkgs/ly/default.nix
new file mode 100644
index 0000000..26c2abd
--- /dev/null
+++ b/pkgs/ly/default.nix
@@ -0,0 +1,14 @@
+{
+  ly,
+  fetchFromGitea,
+  ...
+}:
+ly.overrideAttrs {
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "AnErrupTion";
+    repo = "ly";
+    rev = "3ad0c003803999075c1333fe5af6954369d04af4";
+    hash = "sha256-AiRUISUHKb6Lq0TNLb4ioAoBxT2mPqBW+9+0nw9tgks=";
+  };
+}