From 391e67547a92288674598e8c52d580412f82b981 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Tue, 24 Sep 2024 13:49:49 -0700
Subject: hyprlock: use pywal-nix

---
 home/ebisu/default.nix                           |   2 +-
 home/ebisu/fortune/desktop/hyprland/hyprlock.nix |  28 +++++++++++++++--------
 home/ebisu/fortune/rice/fastfetch.nix            |   7 ++----
 home/ebisu/logo.png                              | Bin 887397 -> 784197 bytes
 home/ebisu/wallpaper.jpg                         | Bin 0 -> 4099060 bytes
 home/ebisu/wallpaper.png                         | Bin 3744245 -> 0 bytes
 6 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 home/ebisu/wallpaper.jpg
 delete mode 100644 home/ebisu/wallpaper.png

diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix
index 53332b6..321bfd2 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.png;
+  pywal-nix.wallpaper = ./wallpaper.jpg;
 
   home = {
     inherit username;
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprlock.nix b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
index 4141a85..0c0bb2c 100644
--- a/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
@@ -1,4 +1,14 @@
-{ pkgs, config, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  inherit (config.pywal-nix.colourScheme) colours;
+
+  rawHex = colour: lib.removePrefix "#" colour;
+in
 {
   programs.hyprlock = {
     enable = true;
@@ -45,12 +55,12 @@
           fail_text = "";
 
           # Colour
-          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
+          outer_color = "rgb(${rawHex colours.color0})";
+          inner_color = "rgb(${rawHex colours.color0})";
+          font_color = "rgb(${rawHex colours.color6})";
+          check_color = "rgb(${rawHex colours.color1})";
+          fail_color = "rgb(${rawHex colours.color3})";
+          capslock_color = "rgb(${rawHex colours.color2})";
 
           # Shadow
           shadow_passes = 1;
@@ -64,7 +74,7 @@
           # Text
           text = "cmd[update:60000] LC_ALL='ja_JP.utf8' TZ=America/Los_Angeles date '+%H時%M分'";
           position = "75, -75";
-          color = "rgba(9BB8F290)"; # blue
+          color = "rgba(${rawHex colours.color6}90)";
 
           # Font
           font_size = 120;
@@ -79,7 +89,7 @@
           # Text
           text = "cmd[update:60000] LC_ALL='ja_JP.utf8' TZ=America/Los_Angeles date '+%b%-e日(%a)'";
           position = "75, 0";
-          color = "rgba(9BB8F270)"; # blue
+          color = "rgba(${rawHex colours.color6}70)";
 
           # Font
           font_size = 40;
diff --git a/home/ebisu/fortune/rice/fastfetch.nix b/home/ebisu/fortune/rice/fastfetch.nix
index 41782ce..b382709 100644
--- a/home/ebisu/fortune/rice/fastfetch.nix
+++ b/home/ebisu/fortune/rice/fastfetch.nix
@@ -6,11 +6,8 @@
     settings = {
       logo = {
         source = "${config.home.homeDirectory}/${flakeDirectory}/home/${config.home.username}/logo.png";
-        width = 30;
-
-        padding = {
-          top = 0;
-        };
+        width = 22;
+        padding.top = 0;
       };
 
       modules = [
diff --git a/home/ebisu/logo.png b/home/ebisu/logo.png
index d82d93e..c0e0001 100644
Binary files a/home/ebisu/logo.png and b/home/ebisu/logo.png differ
diff --git a/home/ebisu/wallpaper.jpg b/home/ebisu/wallpaper.jpg
new file mode 100644
index 0000000..7c165cc
Binary files /dev/null and b/home/ebisu/wallpaper.jpg differ
diff --git a/home/ebisu/wallpaper.png b/home/ebisu/wallpaper.png
deleted file mode 100644
index b0db6b0..0000000
Binary files a/home/ebisu/wallpaper.png and /dev/null differ
-- 
cgit v1.2.3