mirror of
https://github.com/nix-community/home-manager.git
synced 2026-06-05 21:02:51 +00:00
Revert "swaylock: warn on implicit enable default"
This reverts commit 45e3b622b1.
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
@@ -13,24 +13,11 @@ in
|
||||
options.programs.swaylock = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
inherit
|
||||
(lib.hm.deprecations.mkStateVersionOptionDefault {
|
||||
inherit (config.home) stateVersion;
|
||||
since = "23.05";
|
||||
optionPath = [
|
||||
"programs"
|
||||
"swaylock"
|
||||
"enable"
|
||||
];
|
||||
legacy = {
|
||||
value = cfg.settings != { };
|
||||
text = "config.programs.swaylock.settings != { }";
|
||||
};
|
||||
current.value = false;
|
||||
})
|
||||
default
|
||||
defaultText
|
||||
;
|
||||
default = lib.versionOlder config.home.stateVersion "23.05" && (cfg.settings != { });
|
||||
defaultText = lib.literalExpression ''
|
||||
true if state version < 23.05 and settings ≠ { },
|
||||
false otherwise
|
||||
'';
|
||||
example = true;
|
||||
description = ''
|
||||
Whether to enable swaylock.
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
{
|
||||
home.stateVersion = "23.05";
|
||||
|
||||
programs.swaylock.settings = {
|
||||
color = "808080";
|
||||
};
|
||||
|
||||
nmt.script = ''
|
||||
assertPathNotExists home-files/.config/swaylock/config
|
||||
'';
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
{ lib, pkgs, ... }:
|
||||
lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
|
||||
swaylock-current-default-disabled = import ./current-default-disabled.nix;
|
||||
swaylock-disabled = import ./disabled.nix;
|
||||
swaylock-settings = import ./settings.nix;
|
||||
swaylock-enabled = import ./enabled.nix;
|
||||
|
||||
Reference in New Issue
Block a user