alejandro-angulo/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Configured wallpaper for swaylock

Browse source
This commit is contained in:
Alejandro Angulo 2023-03-29 22:58:04 -07:00
parent 2a6f844ff1
commit 207364a427
Signed by: alejandro-angulo
GPG key ID: 75579581C74554B6
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/desktop/addons/swaylock/default.nix
View file

@ -7,6 +7,7 @@
}: }:
with lib; let with lib; let
cfg = config.aa.desktop.addons.swaylock; cfg = config.aa.desktop.addons.swaylock;
user_cfg = config.home-manager.users.${config.aa.user.name};
in { in {
options.aa.desktop.addons.swaylock = with types; { options.aa.desktop.addons.swaylock = with types; {
enable = mkEnableOption "swaylock"; enable = mkEnableOption "swaylock";
@ -15,6 +16,12 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [swaylock]; environment.systemPackages = with pkgs; [swaylock];
aa.home.extraOptions = {
programs.swaylock.settings = {
image = "${user_cfg.xdg.dataHome}/${config.aa.desktop.sway.wallpaperPath}";
};
};
# Workaround for https://github.com/NixOS/nixpkgs/issues/158025 # Workaround for https://github.com/NixOS/nixpkgs/issues/158025
# This comment specifically: https://github.com/NixOS/nixpkgs/issues/158025#issuecomment-1344766809 # This comment specifically: https://github.com/NixOS/nixpkgs/issues/158025#issuecomment-1344766809
security.pam.services.swaylock = {}; security.pam.services.swaylock = {};

3
modules/desktop/sway/default.nix
View file

@ -108,7 +108,6 @@ in {
# TODO: Should this live at the system configuration level? # TODO: Should this live at the system configuration level?
output = { output = {
# TODO: Set up wallpaper # TODO: Set up wallpaper
# "*".bg = "${wallpaper} fill";
"*".bg = "${user_cfg.xdg.dataHome}/${cfg.wallpaperPath} fill"; "*".bg = "${user_cfg.xdg.dataHome}/${cfg.wallpaperPath} fill";
"eDP-1".scale = "1"; "eDP-1".scale = "1";
@ -175,8 +174,6 @@ in {
"${modifier}+c" = "kill"; "${modifier}+c" = "kill";
"${modifier}+p" = "exec ${menu}"; "${modifier}+p" = "exec ${menu}";
"${modifier}+z" = "reload"; "${modifier}+z" = "reload";
# TODO: Reintroduce this. Failing because config.home.homeDirectory is not set
# "${modifier}+x" = "exec swaylock -i ${config.home.homeDirectory}/dotfiles/users/alejandro/sway/wallpaper.png";
"${modifier}+x" = "exec swaylock"; "${modifier}+x" = "exec swaylock";
# Volume control # Volume control