From 6cdbdeff1a5198f85ce6ab317fffb05ea9ec5b13 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 19 Feb 2024 10:55:53 +0300 Subject: [PATCH] home/wm: use db-tool instead of betterlockscreen --- .../window_manager/betterlockscreen.nix | 46 ------------------ home/modules/window_manager/default.nix | 1 - home/modules/window_manager/xmonad_config.hs | 2 +- nixos/hosts/home/xmonad_projects.secret.nix | Bin 777 -> 914 bytes 4 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 home/modules/window_manager/betterlockscreen.nix diff --git a/home/modules/window_manager/betterlockscreen.nix b/home/modules/window_manager/betterlockscreen.nix deleted file mode 100644 index f4c597f..0000000 --- a/home/modules/window_manager/betterlockscreen.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, lib, pkgs, ... }: - - -let - inherit (config.services.betterlockscreen) package; -in -{ - services.betterlockscreen = { - enable = true; - arguments = [ "--display 1" "--" "-e" ]; - inactiveInterval = 15; - }; - - systemd.user.timers.updateBetterlockscreenImage = { - Unit = { - Description = "Update betterlockscreen image timer"; - After = [ "graphical-session.target" "timers.target" ]; - }; - - Timer = { - OnUnitActiveSec = "60min"; - OnBootSec = "10s"; - }; - - Install = { - WantedBy = [ "graphical-session.target" "timers.target" ]; - }; - }; - - systemd.user.services.updateBetterlockscreenImage = { - Unit = { - Description = "Update betterlockscreen image"; - After = [ "graphical-session.target" ]; - }; - - Service = { - Type = "oneshot"; - Environment = "PATH=/run/current-system/sw/bin"; - ExecStart = "${package}/bin/betterlockscreen --display 1 --fx '' --update ${config.home.homeDirectory}/pictures/wallpapers"; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - }; -} diff --git a/home/modules/window_manager/default.nix b/home/modules/window_manager/default.nix index 59cf02f..7a6437a 100644 --- a/home/modules/window_manager/default.nix +++ b/home/modules/window_manager/default.nix @@ -4,6 +4,5 @@ imports = [ ./xmonad.nix ./polybar.nix - ./betterlockscreen.nix ]; } diff --git a/home/modules/window_manager/xmonad_config.hs b/home/modules/window_manager/xmonad_config.hs index 550cb5b..e5d4207 100644 --- a/home/modules/window_manager/xmonad_config.hs +++ b/home/modules/window_manager/xmonad_config.hs @@ -348,7 +348,7 @@ myKeys conf = system_kb = [ -- Lock screen - ("M4-l", spawn "betterlockscreen --lock --display 1 -- -e"), + ("M4-l", spawn "dm-tool lock"), -- Quit xmonad ("M4-S-q", io exitSuccess) ] diff --git a/nixos/hosts/home/xmonad_projects.secret.nix b/nixos/hosts/home/xmonad_projects.secret.nix index 3dd31378315999c0b5f4b2bd110569d1c93366fb..da2efeabae85e028b37803fd6f1420e5eb69d168 100644 GIT binary patch literal 914 zcmV;D18w{OM@dveQdv+`08n^jY{91|T4$5!=$L{!+hOKNls&808ggjMeY7ZoQQ2&~d7z;1d z&eg~LVR5rC7lrMHlrYWj5PyV@wkE5buh5@T4jub&&tmrI=tdV?6qk) zvH=M2NhbPz69e7Thpl8norzb4gw9s}zu@6TR-r14CDZ9N({i^U(S%`)h%GWEuL#2s zPd?D^A9WO%%3BfDcS1OM)PjlDVNB&Icg@=PFT0^d!hEMaUgq>`RA8IW(L~}Zp*Ji3 zFbuB^%rv@WsjQ)U97{AkoJ=hAhl&AXKkrlXC!$f5Av`YcS5gY0dJa&RT|;L0X;u4~ zTL}z8JbEQ@AwLB)`q${;woP9Po{g5#{H@tBP9Z9u)F>Kua}n%VuDL-s&kTyAfP`;j zB^(ib-JAEy=iW+LyX-h|_rwu2_aG6#>ZC*Tyx$(LsJcA{RuyweU!JD#ykJm(LMDsX zCbo#w7~pT=qQIWT^L+lmMKqN#E-7-l9w+cK4hV`CI*p$iQ0SsX2WPm-7_T13T^hBy zj~Ek~vpqUp7D-Ekg?1R~u}km0euuL=2g~>xUsT>hr_`%1=5Qct@&ZTx;VLPCU!3u6 z|H0C27*#-%B~Fbs=WCf2bA=?~Jkx_`KYSd=uo=ZiO|M5k>zZOt8^yi_7w1kglx4Xo zkej1>r)fPHicZ9cP3JKO*LZXo5F4O|E!M_N_f16JPmeamUQvi_dNdnfZEB_%;I^e% zI?lkbz=wyF6ZV{<*SD9KNrw`%=!$}=!rn-e7>~M*tN!q40HaVpif*GhEJecFGBDR) zkv|#|rWQF{9?35QYa#GV+`n}Si; zAV~e$92K8O#|%py4|{1}g6*nGZ;59VK5B9;*i_jx5YY4C8B1f>mAIIZ5zrHD2VaX9 z`WuPmyMvb7jH^WKXRy*FzLI^6WrI+XiooXXA^}V!jV)Y`z3(5U#Hb+@%z%BnHZu5< z)4bt78QxFYw7Z)Q#~#xtW9Mxr(bRE^17&)M4OhA#3LXDH(z*f$bWD40zTx*Rvu&z= z1-zUg8ZgSBXC9w$(13f(5A+~(OfcrHJ?6sk<%k>CMH Hg%SES-AsW?