hyprlock: revert to scaffold

6 files changed, 116 insertions, 20 deletions

diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix
index 321bfd2..53332b6 100644
--- a/home/ebisu/default.nix
+++ b/home/ebisu/default.nix
@@ -14,7 +14,7 @@
 
   programs.home-manager.enable = true;
   nix.package = pkgs.nix;
-  pywal-nix.wallpaper = ./wallpaper.jpg;
+  pywal-nix.wallpaper = ./wallpaper.png;
 
   home = {
     inherit username;
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprlock.nix b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
index 96edf76..4141a85 100644
--- a/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
@@ -1,14 +1,4 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-let
-  inherit (config.pywal-nix.colourScheme) colours special;
-
-  rawHex = colour: lib.removePrefix "#" colour;
-in
+{ pkgs, config, ... }:
 {
   programs.hyprlock = {
     enable = true;
@@ -55,12 +45,12 @@ in
           fail_text = "";
 
           # Colour
-          outer_color = "rgb(${rawHex special.background})";
-          inner_color = "rgb(${rawHex special.background})";
-          font_color = "rgb(${rawHex special.foreground})";
-          check_color = "rgb(${rawHex colours.colour6})";
-          fail_color = "rgb(D67C8E)";
-          capslock_color = "rgb(D6A37C)";
+          outer_color = "rgb(1D2433)"; # bg
+          inner_color = "rgb(1D2433)"; # bg
+          font_color = "rgb(BDD9F2)"; # fg
+          check_color = "rgb(9BB8F2)"; # blue
+          fail_color = "rgb(D67C8E)"; # red
+          capslock_color = "rgb(D6A37C)"; # orange
 
           # Shadow
           shadow_passes = 1;
@@ -74,7 +64,7 @@ in
           # Text
           text = "cmd[update:60000] LC_ALL='ja_JP.utf8' TZ=America/Los_Angeles date '+%H時%M分'";
           position = "75, -75";
-          color = "rgba(${rawHex special.foreground}df)";
+          color = "rgba(9BB8F290)"; # blue
 
           # Font
           font_size = 120;
@@ -89,7 +79,7 @@ in
           # Text
           text = "cmd[update:60000] LC_ALL='ja_JP.utf8' TZ=America/Los_Angeles date '+%b%-e日(%a)'";
           position = "75, 0";
-          color = "rgba(${rawHex special.foreground}cf)";
+          color = "rgba(9BB8F270)"; # blue
 
           # Font
           font_size = 40;
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprlock.nix.bak b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix.bak
new file mode 100644
index 0000000..96edf76
--- /dev/null
+++ b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix.bak
@@ -0,0 +1,106 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  inherit (config.pywal-nix.colourScheme) colours special;
+
+  rawHex = colour: lib.removePrefix "#" colour;
+in
+{
+  programs.hyprlock = {
+    enable = true;
+
+    # https://github.com/hyprwm/hyprlock/issues/128#issuecomment-2063629880
+    package = pkgs.hyprlock.overrideAttrs {
+      version = "git";
+
+      src = pkgs.fetchFromGitHub {
+        owner = "hyprwm";
+        repo = "hyprlock";
+        rev = "2bce52f";
+        sha256 = "36qa6MOhCBd39YPC0FgapwGRHZXjstw8BQuKdFzwQ4k=";
+      };
+
+      patchPhase = ''
+        substituteInPlace src/core/hyprlock.cpp \
+          --replace "5000" "16"
+      '';
+    };
+
+    settings = {
+      general = {
+        disable_loading_bar = false;
+        hide_cursor = true;
+        ignore_empty_input = true;
+        grace = 10;
+      };
+
+      background = [ { path = "${config.pywal-nix.wallpaper}"; } ];
+
+      input-field = [
+        {
+          # Size & Position
+          size = "500, 75";
+          position = "0, 0";
+
+          # Other
+          fade_on_empty = true;
+          dots_size = 0.2;
+          dots_spacing = 0.5;
+          outline_thickness = 3;
+          placeholder_text = "";
+          fail_text = "";
+
+          # Colour
+          outer_color = "rgb(${rawHex special.background})";
+          inner_color = "rgb(${rawHex special.background})";
+          font_color = "rgb(${rawHex special.foreground})";
+          check_color = "rgb(${rawHex colours.colour6})";
+          fail_color = "rgb(D67C8E)";
+          capslock_color = "rgb(D6A37C)";
+
+          # Shadow
+          shadow_passes = 1;
+          shadow_size = 8;
+          shadow_boost = 0.6;
+        }
+      ];
+
+      label = [
+        {
+          # Text
+          text = "cmd[update:60000] LC_ALL='ja_JP.utf8' TZ=America/Los_Angeles date '+%H時%M分'";
+          position = "75, -75";
+          color = "rgba(${rawHex special.foreground}df)";
+
+          # Font
+          font_size = 120;
+          font_family = "SF Pro, Hiragino Sans";
+
+          # Shadow
+          shadow_passes = 1;
+          shadow_size = 6;
+          shadow_boost = 0.75;
+        }
+        {
+          # Text
+          text = "cmd[update:60000] LC_ALL='ja_JP.utf8' TZ=America/Los_Angeles date '+%b%-e日(%a)'";
+          position = "75, 0";
+          color = "rgba(${rawHex special.foreground}cf)";
+
+          # Font
+          font_size = 40;
+          font_family = "SF Pro, Hiragino Sans";
+
+          # Shadow
+          shadow_passes = 1;
+          shadow_size = 4;
+          shadow_boost = 0.9;
+        }
+      ];
+    };
+  };
+}
diff --git a/home/ebisu/logo.png b/home/ebisu/logo.png
index c0e0001..d82d93e 100644
--- a/home/ebisu/logo.png
+++ b/home/ebisu/logo.png
diff --git a/home/ebisu/wallpaper.jpg b/home/ebisu/wallpaper.jpg
deleted file mode 100644
index 7c165cc..0000000
--- a/home/ebisu/wallpaper.jpg
+++ /dev/null
diff --git a/home/ebisu/wallpaper.png b/home/ebisu/wallpaper.png
new file mode 100644
index 0000000..b0db6b0
--- /dev/null
+++ b/home/ebisu/wallpaper.png