modules/swaylock: init; set background to sway's

4 files changed, 39 insertions, 15 deletions

diff --git a/modules/workstation/windowing/sway/config.in b/modules/workstation/windowing/sway/config.in
index bef6dab444b6..95cdc124e50d 100644
--- a/modules/workstation/windowing/sway/config.in
+++ b/modules/workstation/windowing/sway/config.in
@@ -34,7 +34,6 @@ for_window [title="Firefox - Sharing Indicator"] {
 }
 
 input * natural_scroll enabled
-output * bg @wallpaper@ fill
 
 bindsym $mod+Return exec alacritty
 bindsym $mod+backslash exec firefox
diff --git a/modules/workstation/windowing/sway/default.nix b/modules/workstation/windowing/sway/default.nix
index e05779e5513d..d0e7e556fc52 100644
--- a/modules/workstation/windowing/sway/default.nix
+++ b/modules/workstation/windowing/sway/default.nix
@@ -1,32 +1,36 @@
 { pkgs, lib, config, ... }:
 
+let
+  inherit (lib) mkOption optionalString;
+  inherit (lib.types) lines nullOr path;
+in
+
 {
-  imports = [ ./swayidle ];
+  imports = [ ./swayidle ./swaylock ];
 
   options = {
-    programs.sway.extraConfig = with lib; mkOption {
-      type = types.lines;
+    programs.sway.extraConfig = mkOption {
+      type = lines;
       description = "Lines to append to sway's config file";
       default = "";
     };
+
+    programs.sway.wallpaper = mkOption {
+      type = nullOr path;
+      description = "Path to wallpaper for sway and swaylock";
+      default = null;
+    };
   };
 
   config = let
     cfg = config.programs.sway;
 
-    wallpaper = pkgs.fetchurl {
-      url = https://mir-s3-cdn-cf.behance.net/project_modules/2800_opt_1/36731876964505.5c793fa788b5d.jpg;
-      sha256 = "1c6camdipng8ws41sgpcxzrxb96crgip3wirqjgf2ajn60qg3v64";
-
-      meta = with lib; {
-        homepage = https://www.behance.net/gallery/76964505/IQOO-style-frame-and-scene-design;
-      };
-    };
-
     configFile = pkgs.substituteAll {
       src = ./config.in;
-      inherit choose_workspace status_command wallpaper;
-      inherit (cfg) extraConfig;
+      inherit choose_workspace status_command;
+      extraConfig = cfg.extraConfig + optionalString (cfg.wallpaper != null) ''
+        output * bg ${cfg.wallpaper} fill
+      '';
     };
 
     status_command = "${pkgs.runCommandCC "status" {} ''
@@ -46,6 +50,15 @@
     environment.systemPackages = with pkgs; [ bemenu choose ];
 
     programs.sway.enable = true;
+    programs.sway.wallpaper = pkgs.fetchurl {
+      url = https://mir-s3-cdn-cf.behance.net/project_modules/2800_opt_1/36731876964505.5c793fa788b5d.jpg;
+      sha256 = "1c6camdipng8ws41sgpcxzrxb96crgip3wirqjgf2ajn60qg3v64";
+
+      meta = {
+        homepage = https://www.behance.net/gallery/76964505/IQOO-style-frame-and-scene-design;
+      };
+    };
+
     programs.swayidle.enable = true;
 
     users.users.qyliss.xdg.config.paths."sway/config" = configFile;
diff --git a/modules/workstation/windowing/sway/swaylock/config.in b/modules/workstation/windowing/sway/swaylock/config.in
new file mode 100644
index 000000000000..784bf9b511da
--- /dev/null
+++ b/modules/workstation/windowing/sway/swaylock/config.in
@@ -0,0 +1,2 @@
+image=@wallpaper@
+indicator-idle-visible
diff --git a/modules/workstation/windowing/sway/swaylock/default.nix b/modules/workstation/windowing/sway/swaylock/default.nix
new file mode 100644
index 000000000000..ac556643f795
--- /dev/null
+++ b/modules/workstation/windowing/sway/swaylock/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, config, ... }:
+
+{
+  imports = [ ../../../../xdg ];
+
+  users.users.qyliss.xdg.config.paths."swaylock/config" = pkgs.substituteAll {
+    src = ./config.in;
+    wallpaper = config.programs.sway.wallpaper;
+  };
+}