diff --git a/modules/xmonad/default.nix b/modules/xmonad/default.nix index 21e540f..27fc4fb 100644 --- a/modules/xmonad/default.nix +++ b/modules/xmonad/default.nix @@ -6,32 +6,6 @@ let cfg = config.programs.xmonad; xmonadConfig = with pkgs; callPackage ./buildXmonad.nix {inherit (pkgs.haskellPackages) xmonad-masser; } cfg.dhallConfigPath cfg.packages; - gifs = pkgs.callPackage ./gifs.nix {}; - saver_mpv = pkgs.writeScript "saver_mpv" '' - #!${pkgs.bash}/bin/bash - PATH=${makeBinPath [pkgs.mpv pkgs.coreutils pkgs.findutils]}:$PATH - video=`find ${gifs} -type f | sort -R | head -n 1` - mpv \ - --no-input-terminal \ - --really-quiet \ - --scale=oversample \ - --loop \ - --no-stop-screensaver \ - --wid="''${XSCREENSAVER_WINDOW}" \ - --no-audio "$video" & - exec ${pkgs.xsecurelock}/libexec/xsecurelock/saver_blank - ''; - lock = pkgs.writeScript "lock.sh" '' - #!${pkgs.bash}/bin/bash - PATH=${makeBinPath [pkgs.gnupg pkgs.coreutils pkgs.findutils]}:$PATH - - gpg-connect-agent reloadagent /bye - - - export XSECURELOCK_SAVER=${saver_mpv} - export XSECURELOCK_PASSWORD_PROMPT="emoticon" - ${pkgs.xsecurelock}/bin/xsecurelock - ''; in { options = { @@ -61,10 +35,6 @@ in { xcalib i3lock ]; - services.screen-locker = { - enable = true; - lockCmd = "${lock}"; - }; xsession = { enable = true; windowManager.xmonad = {