From 3ddd0323861e7626f5d98eaeb8a7f0bbc2baef77 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sat, 21 Oct 2023 14:33:55 +0200 Subject: [PATCH] feat: move xss-lock to laptop only --- hosts/laptop/default.nix | 13 +++++++++++++ modules/desktop/dm/sddm.nix | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 9375b77..cbb2174 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -67,6 +67,19 @@ brillo.enable = true; }; + programs = { + xss-lock = let + xsecurelock = (pkgs.xsecurelock.overrideAttrs(attrs: { + postInstall = attrs.postInstall or "" + '' + wrapProgram $out/bin/xsecurelock --set XSECURELOCK_COMPOSITE_OBSCURER 0 + ''; + })); + in { + enable = true; + lockerCommand = "${xsecurelock}/bin/xsecurelock"; + }; + }; + services = { tlp.enable = true; # TLP and auto-cpufreq for power management logind.lidSwitch = "lock"; # lock on lid close diff --git a/modules/desktop/dm/sddm.nix b/modules/desktop/dm/sddm.nix index 5d235c6..d863cdc 100644 --- a/modules/desktop/dm/sddm.nix +++ b/modules/desktop/dm/sddm.nix @@ -2,11 +2,6 @@ let themes = pkgs.callPackage ./sddm-themes/sugar-dark.nix {}; - xsecurelock = (pkgs.xsecurelock.overrideAttrs(attrs: { - postInstall = attrs.postInstall or "" + '' - wrapProgram $out/bin/xsecurelock --set XSECURELOCK_COMPOSITE_OBSCURER 0 - ''; - })); in { environment.systemPackages = with pkgs; [ themes.sddm-sugar-dark @@ -17,13 +12,6 @@ in { libsForQt5.qt5.qtsvg ]; - programs = { - xss-lock = { - enable = true; - lockerCommand = "${xsecurelock}/bin/xsecurelock"; - }; - }; - services = { xserver = { displayManager.sddm = { -- 2.48.1