From 785518d9b447bb233b204fe3d9f1a74914c4dd51 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 1 Feb 2025 22:33:56 +0100 Subject: refactor(modules/swaylock): Migrate to by-name --- flake/nixosConfigurations/common.nix | 1 + .../by-name/sw/swaylock/images/GTDcanonical.png | Bin 0 -> 34659 bytes modules/by-name/sw/swaylock/images/commands.jpg | Bin 0 -> 629695 bytes .../sw/swaylock/images/duwon-lee-tempano-port.jpg | Bin 0 -> 671125 bytes modules/by-name/sw/swaylock/images/gnu.png | Bin 0 -> 327518 bytes modules/by-name/sw/swaylock/module.nix | 27 ++++++++++++++++++--- modules/home.legacy/conf/default.nix | 1 - modules/home.legacy/conf/swaylock/GTDcanonical.png | Bin 34659 -> 0 bytes modules/home.legacy/conf/swaylock/commands.jpg | Bin 629695 -> 0 bytes modules/home.legacy/conf/swaylock/default.nix | 10 -------- .../conf/swaylock/duwon-lee-tempano-port.jpg | Bin 671125 -> 0 bytes modules/home.legacy/conf/swaylock/gnu.png | Bin 327518 -> 0 bytes 12 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 modules/by-name/sw/swaylock/images/GTDcanonical.png create mode 100644 modules/by-name/sw/swaylock/images/commands.jpg create mode 100644 modules/by-name/sw/swaylock/images/duwon-lee-tempano-port.jpg create mode 100644 modules/by-name/sw/swaylock/images/gnu.png delete mode 100644 modules/home.legacy/conf/swaylock/GTDcanonical.png delete mode 100644 modules/home.legacy/conf/swaylock/commands.jpg delete mode 100644 modules/home.legacy/conf/swaylock/default.nix delete mode 100644 modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg delete mode 100644 modules/home.legacy/conf/swaylock/gnu.png diff --git a/flake/nixosConfigurations/common.nix b/flake/nixosConfigurations/common.nix index 8071c6a9..3c244cf0 100644 --- a/flake/nixosConfigurations/common.nix +++ b/flake/nixosConfigurations/common.nix @@ -109,6 +109,7 @@ less.enable = true; lf.enable = true; river.enable = true; + swaylock.enable = true; taskwarrior.enable = true; yambar.enable = true; yt.enable = true; diff --git a/modules/by-name/sw/swaylock/images/GTDcanonical.png b/modules/by-name/sw/swaylock/images/GTDcanonical.png new file mode 100644 index 00000000..ef41d79d Binary files /dev/null and b/modules/by-name/sw/swaylock/images/GTDcanonical.png differ diff --git a/modules/by-name/sw/swaylock/images/commands.jpg b/modules/by-name/sw/swaylock/images/commands.jpg new file mode 100644 index 00000000..54016503 Binary files /dev/null and b/modules/by-name/sw/swaylock/images/commands.jpg differ diff --git a/modules/by-name/sw/swaylock/images/duwon-lee-tempano-port.jpg b/modules/by-name/sw/swaylock/images/duwon-lee-tempano-port.jpg new file mode 100644 index 00000000..d72f32d1 Binary files /dev/null and b/modules/by-name/sw/swaylock/images/duwon-lee-tempano-port.jpg differ diff --git a/modules/by-name/sw/swaylock/images/gnu.png b/modules/by-name/sw/swaylock/images/gnu.png new file mode 100644 index 00000000..d07dee3e Binary files /dev/null and b/modules/by-name/sw/swaylock/images/gnu.png differ diff --git a/modules/by-name/sw/swaylock/module.nix b/modules/by-name/sw/swaylock/module.nix index 6cbcef28..fc296de7 100644 --- a/modules/by-name/sw/swaylock/module.nix +++ b/modules/by-name/sw/swaylock/module.nix @@ -1,4 +1,25 @@ -{...}: { - # otherwise swaylock can't access the user password. - security.pam.services.swaylock = {}; +{ + config, + lib, + ... +}: let + cfg = config.soispha.programs.swaylock; +in { + options.soispha.programs.swaylock = { + enable = lib.mkEnableOption "swaylock"; + }; + + config = lib.mkIf cfg.enable { + # otherwise swaylock can't access the user password. + security.pam.services.swaylock = {}; + + home-manager.users.soispha.programs.swaylock = { + enable = true; + settings = { + image = "${./images/duwon-lee-tempano-port.jpg}"; + scaling = "stretch"; + color = "000000"; + }; + }; + }; } diff --git a/modules/home.legacy/conf/default.nix b/modules/home.legacy/conf/default.nix index 38cbc915..848bcccf 100644 --- a/modules/home.legacy/conf/default.nix +++ b/modules/home.legacy/conf/default.nix @@ -28,7 +28,6 @@ ./ssh ./starship ./swayidle - ./swaylock ./taskwarrior ./timewarrior ./tridactyl diff --git a/modules/home.legacy/conf/swaylock/GTDcanonical.png b/modules/home.legacy/conf/swaylock/GTDcanonical.png deleted file mode 100644 index ef41d79d..00000000 Binary files a/modules/home.legacy/conf/swaylock/GTDcanonical.png and /dev/null differ diff --git a/modules/home.legacy/conf/swaylock/commands.jpg b/modules/home.legacy/conf/swaylock/commands.jpg deleted file mode 100644 index 54016503..00000000 Binary files a/modules/home.legacy/conf/swaylock/commands.jpg and /dev/null differ diff --git a/modules/home.legacy/conf/swaylock/default.nix b/modules/home.legacy/conf/swaylock/default.nix deleted file mode 100644 index d662cb78..00000000 --- a/modules/home.legacy/conf/swaylock/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{...}: { - programs.swaylock = { - enable = true; - settings = { - image = "${./duwon-lee-tempano-port.jpg}"; - scaling = "center"; - color = "000000"; - }; - }; -} diff --git a/modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg b/modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg deleted file mode 100644 index d72f32d1..00000000 Binary files a/modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg and /dev/null differ diff --git a/modules/home.legacy/conf/swaylock/gnu.png b/modules/home.legacy/conf/swaylock/gnu.png deleted file mode 100644 index d07dee3e..00000000 Binary files a/modules/home.legacy/conf/swaylock/gnu.png and /dev/null differ -- cgit 1.4.1