diff --git a/flake.lock b/flake.lock index ad1fa1d3..bcd3cb88 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "arcexprs": { "flake": false, "locked": { - "lastModified": 1681150414, - "narHash": "sha256-4bUR89x6XbXBADLUMc/DCZ9hyDJawdEB1wL3XluSotk=", + "lastModified": 1681750980, + "narHash": "sha256-5n4zGcbTKI1tUSKzQTGGzJHOgizJtz1BVwzu6UrAABY=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "fd91689d363fad2215860424aed36cd425232ba7", + "rev": "03bf6d3a7d50436c8e45d9b5c2e251d2dbd79cde", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1681468923, - "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=", + "lastModified": 1681814024, + "narHash": "sha256-DPxY/dIxegJ443OJ8jJDusZxX1cbhNe/r3XjG/KifCk=", "owner": "nix-community", "repo": "home-manager", - "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", + "rev": "cd5723734acbffa63e11a69cf6767f8ef69f6517", "type": "github" }, "original": { @@ -428,11 +428,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681465517, - "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", + "lastModified": 1681737997, + "narHash": "sha256-pHhjgsIkRMu80LmVe8QoKIZB6VZGRRxFmIvsC5S89k4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", + "rev": "f00994e78cd39e6fc966f0c4103f908e63284780", "type": "github" }, "original": { @@ -444,11 +444,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1681005198, - "narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=", + "lastModified": 1681613598, + "narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e45cc0138829ad86e7ff17a76acf2d05e781e30a", + "rev": "1040ce5f652b586da95dfd80d48a745e107b9eac", "type": "github" }, "original": { @@ -476,11 +476,11 @@ }, "nur": { "locked": { - "lastModified": 1681574466, - "narHash": "sha256-FXDrYaVbTHiQKqodEe3sViHo0yWyY4wBosfjf/XlD5o=", + "lastModified": 1681818355, + "narHash": "sha256-A29uoPDtF3Jw5u9BDWhXyZxzhLrUURHJmR47cbO1zEo=", "owner": "nix-community", "repo": "nur", - "rev": "794fc802e2254c6b6bde1beda50832c5a78fc9f2", + "rev": "25eeb98c8378d0d716816b05c8441953b84aec2f", "type": "github" }, "original": { @@ -665,11 +665,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681209176, - "narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=", + "lastModified": 1681821469, + "narHash": "sha256-CoEr/MiWFzLkC+BI8rC4naJobsOYTccx3D4kUvABsg8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "00d5fd73756d424de5263b92235563bc06f2c6e1", + "rev": "edb40ecd6734c7f4daab74e9fa6c08e524bb629a", "type": "github" }, "original": { diff --git a/modules/home/swaylock.nix b/modules/home/swaylock.nix new file mode 100644 index 00000000..b53068ef --- /dev/null +++ b/modules/home/swaylock.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: with lib; + +let cfg = config.programs.swaylock; in +{ + options.programs.swaylock = { + colors = mkOption { + type = types.attrsOf types.str; + default = { }; + }; + }; + config.programs.swaylock.settings = mapAttrs' (arg: color: nameValuePair ("${arg}-color") (removePrefix "#" color)) cfg.colors; +} diff --git a/modules/home/theme.nix b/modules/home/theme.nix index 5537849a..ab4a5631 100644 --- a/modules/home/theme.nix +++ b/modules/home/theme.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ meta, config, pkgs, lib, ... }: /* This module: @@ -9,6 +9,9 @@ with lib; let cfg = config.nixfiles.theme; in { + imports = with meta; [ + modules.home.swaylock + ]; options.nixfiles.theme = { enable = mkEnableOption "kat's theme module"; sass = { @@ -66,7 +69,7 @@ let cfg = config.nixfiles.theme; in programs.swaylock = mkIf (cfg.swaylock) { enable = true; package = pkgs.swaylock-effects-develop; - args = { + settings = { screenshots = true; daemonize = true; show-failed-attempts = true;