punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: punkfairie:ddd49ed84f6f4cbe9b59a6c09eb46e7267cd3ae2
Branches Tags
punkfairie:main
...
compare: punkfairie:59e99a54a7288fbfd729d39ddccf7e1e6e41b4d5
Branches Tags
punkfairie:main

2 commits
ddd49ed84f ... 59e99a54a7

Author SHA1 Message Date
punkfairie
59e99a54a7
fix(home): Disable screenlocking on generic Linux 
It's broken - won't accept correct passwords
 2024-11-24 18:18:47 -08:00
punkfairie
b72c4a2150
feat(home): i3lock -> betterlockscreen 2024-11-24 12:46:20 -08:00
2 changed files with 10 additions and 5 deletions
Show stats Expand all files Collapse all files

9
modules/home/services/screen-locker/default.nix
View file

@ -6,23 +6,26 @@
...
}:
let
inherit (lib) mkEnableOption mkIf;
inherit (lib) mkEnableOption mkIf getExe;
cfg = config.marleyos.services.screen-locker;
hasXorg = config.xsession.enable;
hasI3 = config.xsession.windowManager.i3.enable;
in
{
options.marleyos.services.screen-locker.enable = mkEnableOption "screen-locker";
config = mkIf (cfg.enable && hasXorg) {
home.packages = with pkgs; [
betterlockscreen
];
services.screen-locker = {
enable = true;
inactiveInterval = 20;
# exec xss-lock {xss-lock.extraOptions} -- {lockCmd}
xss-lock.extraOptions = [ "--transfer-sleep-lock" ];
lockCmd = if hasI3 then "${pkgs.i3lock}/bin/i3lock --nofork" else "";
lockCmd = "${getExe pkgs.betterlockscreen} -l";
};
};
}

6
modules/home/xorg/i3/default.nix
View file

@ -14,9 +14,10 @@ let
listToAttrs
getExe
;
inherit (lib.marleyos) enabled;
inherit (lib.marleyos) enabled disabled;
cfg = config.marleyos.xorg.i3;
isGenericLinux = config.targets.genericLinux.enable;
in
{
options.marleyos.xorg.i3.enable = mkEnableOption "i3";
@ -28,7 +29,8 @@ in
dunst = enabled;
picom = enabled;
polybar = enabled;
screen-locker = enabled;
# broken on non-nixOS
screen-locker = if isGenericLinux then enabled else disabled;
};
};