From 3daeab3b2e69b5b860019e7e49e1218402fc7868 Mon Sep 17 00:00:00 2001 From: Felix Suchert Date: Tue, 24 Jan 2023 10:53:08 +0100 Subject: [PATCH] Use swaylock-effects --- entropy/nixos/modules/sway.nix | 34 +++------------------------------- entropy/sway/config | 4 ++-- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/entropy/nixos/modules/sway.nix b/entropy/nixos/modules/sway.nix index 1f2a9cb..26d7d53 100644 --- a/entropy/nixos/modules/sway.nix +++ b/entropy/nixos/modules/sway.nix @@ -49,7 +49,7 @@ in enable = true; wrapperFeatures.gtk = true; # so that gtk works properly extraPackages = with pkgs; [ - swaylock + swaylock-effects swayidle xwayland # for legacy apps waybar @@ -91,6 +91,7 @@ in services.redshift = { enable = true; package = pkgs.gammastep; + executable = "/bin/gammastep"; temperature.night = 3500; }; @@ -107,38 +108,9 @@ in environment.etc."greetd/environments".text = '' ${pkgs.sway}/bin/sway - startx + ${pkgs.xorg.xinit}/bin/startx ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-wayland ${pkgs.fish}/bin/fish ''; - #environment.etc."greetd/gtkgreet.css".text = '' - #window { - #background-image: url("file://${pkgs.nixos-artwork.wallpapers.stripes-logo.gnomeFilePath}"); - #background-size: cover; - #background-position: center; - #} - #''; - - #services.xserver = { - ## under protest - #enable = true; - - ## graphics - ##videoDrivers = [ "modesetting" ]; - #useGlamor = true; - - ## use sddm for authentication - ##displayManager.sddm.enable = true; - #displayManager.lightdm = { - #enable = true; - #greeters.enso = { - #enable = true; - #theme = { - #name = "Dracula"; - #package = pkgs.dracula-theme; - #}; - #}; - #}; - #}; } diff --git a/entropy/sway/config b/entropy/sway/config index 056e5e3..681fcda 100644 --- a/entropy/sway/config +++ b/entropy/sway/config @@ -49,8 +49,8 @@ exec configure-gtk # Example configuration: # exec swayidle -w \ - timeout 300 'swaylock -f -c 000000ff' \ - before-sleep 'swaylock -f -c 000000ff' + timeout 300 'swaylock --screenshots --effect-blur 5x5 --effect-greyscale --fade-in 0.5' \ + before-sleep 'swaylock --screenshots --effect-blur 5x5 --effect-greyscale --fade-in 0.5' #exec swayidle -w \ #timeout 300 'swaylock -f -c 99999960' \ #timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \