From fdec3cf0a80d9d19645095ef97b7fddabddbfeed Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Sun, 21 Jul 2024 14:49:16 +0800
Subject: [PATCH] home/swaylock: use upstream swaylock

---
 home/applications/sway/default.nix     | 20 ++++---------
 home/applications/swaylock/default.nix | 41 ++++++--------------------
 pkgs/background.nix                    | 24 +++++++++++++++
 pkgs/default.nix                       |  2 ++
 4 files changed, 40 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/background.nix

diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix
index d5d7151..7d60edd 100644
--- a/home/applications/sway/default.nix
+++ b/home/applications/sway/default.nix
@@ -1,20 +1,10 @@
 {
-  config,
-  pkgs,
   lib,
+  config,
+  inputs,
+  pkgs,
   ...
-}: let
-  # https://www.pixiv.net/en/artworks/49983419
-  image = pkgs.fetchurl {
-    url = "https://i.pximg.net/img-original/img/2015/04/23/12/43/35/49983419_p0.jpg";
-    hash = "sha256-JZ5VmsjVjZfHXpx3JxzAyYzZppZmgH38AiAA+B0TDiw=";
-    curlOptsList = ["-e" "https://www.pixiv.net/"];
-  };
-  # Crop 100px on top and bottom
-  background = pkgs.runCommandLocal "49983419_p0.jpg" {} ''
-    ${lib.getExe pkgs.imagemagick} convert ${image} -crop 3500x1600+0+100 $out
-  '';
-in {
+}: {
   imports = [
     ../i3status-rust
     ../kanshi
@@ -56,7 +46,7 @@ in {
       ];
 
       ### Visuals
-      output."*".bg = "${background} fill";
+      output."*".bg = "${inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.background} fill";
       bars = [
         {
           statusCommand = "${lib.getExe pkgs.i3status-rust} $HOME/.config/i3status-rust/config-default.toml";
diff --git a/home/applications/swaylock/default.nix b/home/applications/swaylock/default.nix
index 03c446e..0b10977 100644
--- a/home/applications/swaylock/default.nix
+++ b/home/applications/swaylock/default.nix
@@ -1,39 +1,16 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
   programs.swaylock = {
     enable = true;
-    package = pkgs.swaylock-effects;
     settings = {
       daemonize = true;
-      screenshots = true;
-      clock = true;
-      indicator = true;
-
-      # i forgot which colorscheme is this
-      # TODO: switch to tokyonight
-      line-color = "cdd6f4ff";
-      text-color = "cdd6f4ff";
-      inside-color = "1e1e2eff";
-      ring-color = "313244ff";
-
-      line-ver-color = "cdd6f4ff";
-      text-ver-color = "cdd6f4ff";
-      inside-ver-color = "1e1e2eff";
-      ring-ver-color = "313244ff";
-
-      line-clear-color = "cdd6f4ff";
-      text-clear-color = "cdd6f4ff";
-      inside-clear-color = "1e1e2eff";
-      ring-clear-color = "313244ff";
-
-      line-wrong-color = "cdd6f4ff";
-      text-wrong-color = "313244ff";
-      inside-wrong-color = "f38ba8ff";
-      ring-wrong-color = "313244ff";
-
-      key-hl-color = "cba6f7ff";
-      effect-blur = "7x5";
-      effect-vignette = "0.5:0.5";
-      fade-in = 0.2;
+      show-failed-attempts = true;
+      show-keyboard-layout = true;
+      image = toString inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.background.dark;
+      scaling = "fill";
     };
   };
 }
diff --git a/pkgs/background.nix b/pkgs/background.nix
new file mode 100644
index 0000000..7000b8c
--- /dev/null
+++ b/pkgs/background.nix
@@ -0,0 +1,24 @@
+{
+  fetchurl,
+  imagemagick,
+  runCommandLocal,
+}:
+runCommandLocal "49983419_p0.jpg" {
+  nativeBuildInputs = [imagemagick];
+
+  # https://www.pixiv.net/en/artworks/49983419
+  image = fetchurl {
+    url = "https://i.pximg.net/img-original/img/2015/04/23/12/43/35/49983419_p0.jpg";
+    hash = "sha256-JZ5VmsjVjZfHXpx3JxzAyYzZppZmgH38AiAA+B0TDiw=";
+    curlOptsList = ["-e" "https://www.pixiv.net/"];
+  };
+
+  outputs = ["out" "dark"];
+} ''
+  magick $image -crop 3500x1600+0+100 $out
+  magick $image \
+    -crop 3500x1600+0+100 \
+    -blur 8x8 \
+    -brightness-contrast -10,0 \
+    $dark
+''
diff --git a/pkgs/default.nix b/pkgs/default.nix
index f44ff82..d5665af 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,6 +6,8 @@ in {
   # https://github.com/NixOS/nixpkgs/pull/308720
   pixivfe = callPackage ./pixivfe.nix {};
 
+  background = callPackage ./background.nix {};
+
   scripts = lib.makeScope pkgs.newScope (self: let
     inherit (self) callPackage;
   in {