commit c87109e4c02a0b5f6690b63a97b1f7461e64bad4 · ryan.freumh.org/nixos

-1

flake.nix

···

       88
        
                     inherit system;

     

       89
        
                     config = nixpkgsConfig;

     

       90
        
                   }).sonarr;

     

       91
       -
                 swaylock-plugin = prev.callPackage ./pkgs/swaylock-plugin.nix { };

     

       92
        
               })

     

       93
        
               inputs.nur.overlays.default

     

       94
        
             ];

···

       88
        
                     inherit system;

     

       89
        
                     config = nixpkgsConfig;

     

       90
        
                   }).sonarr;

     

       0
        
       
     

       91
        
               })

     

       92
        
               inputs.nur.overlays.default

     

       93
        
             ];

+1 -1

home/gui/sway.nix

···

       18
        
           '';

     

       19
        
           locked = "--locked";

     

       20
        
           polkit_gnome = "${pkgs.polkit_gnome}";

     

       21
       -
           locker = ''swaylock-plugin -f --command "timewall set --daemon"'';

     

       22
        
           enable_output = "swaymsg output $laptop_output enable";

     

       23
        
           disable_output = "swaymsg output $laptop_output disable";

     

       24
        
           drun = "wofi -i --show drun --allow-images -a";

···

       18
        
           '';

     

       19
        
           locked = "--locked";

     

       20
        
           polkit_gnome = "${pkgs.polkit_gnome}";

     

       21
       +
           locker = "swaylock -f -i ~/.cache/timewall/last_image";

     

       22
        
           enable_output = "swaymsg output $laptop_output enable";

     

       23
        
           disable_output = "swaymsg output $laptop_output disable";

     

       24
        
           drun = "wofi -i --show drun --allow-images -a";

+1 -18

home/gui/timewall.toml

···

       3
        
       lon = 0

     

       4
        
       

     

       5
        
       [setter]

     

       6
       -
       # TODO something better

     

       7
       -
       command = [

     

       8
       -
           "sh",

     

       9
       -
           "-c",

     

       10
       -
           """

     

       11
       -
           ln -fs %f ~/.cache/timewall/last_image

     

       12
       -
           pid_file=~/.cache/timewall/pid-$(ps -o ppid= -p $(ps -o ppid= -p $$ | tr -d " ") | tr -d " ")

     

       13
       -
           if [ -f "$pid_file" ]; then

     

       14
       -
               old_pid=$(cat "$pid_file")

     

       15
       -
           fi;

     

       16
       -
           (setsid sh -c 'swaybg -i %f -c 282828 -m fill >/dev/null 2>&1 & echo $! > '"$pid_file"' && disown')

     

       17
       -
       	sleep 1

     

       18
       -
           if kill -0 $old_pid 2>/dev/null; then

     

       19
       -
               kill $old_pid &&

     

       20
       -
               echo "Killed old swaybg process with PID $old_pid" >&2;

     

       21
       -
           fi

     

       22
       -
       	"""

     

       23
       -
       ]

···

       3
        
       lon = 0

     

       4
        
       

     

       5
        
       [setter]

     

       6
       +
       command = [ "sh", "-c", "ln -fs %f ~/.cache/timewall/last_image && (setsid swaybg -i %f -c 282828 -m fill >/dev/null 2>&1 &) && (sleep 1; (grep -v $(pgrep -nf ^swaybg) <(pgrep -f ^swaybg) | tee ~/x | xargs kill)) && exit 0" ]

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

home/gui/wm/scripts/swayidle_suspend.sh

···

       10
        
       	timeout 240 'loginctl lock-session'\

     

       11
        
       	timeout 300 'systemctl suspend-then-hibernate'\

     

       12
        
       	before-sleep 'playerctl -a pause; loginctl lock-session'\

     

       0
        
       
     

       13

···

       10
        
       	timeout 240 'loginctl lock-session'\

     

       11
        
       	timeout 300 'systemctl suspend-then-hibernate'\

     

       12
        
       	before-sleep 'playerctl -a pause; loginctl lock-session'\

     

       13
       +
       	after-resume 'pkill -x swaylock; timewall set; loginctl lock-session' # for timewall

     

       14

+1 -3

modules/gui/sway.nix

···

       23
        
             wrapperFeatures.gtk = true; # so that gtk works properly

     

       24
        
             extraPackages = with pkgs; [

     

       25
        
               jq

     

       26
       -
               swaylock-plugin

     

       27
        
               swayidle

     

       28
        
               wl-clipboard

     

       29
        
               clipman

     
···

       55
        
             isAllowed = true;

     

       56
        
             isSystem = false;

     

       57
        
           };

     

       58
       -
       

     

       59
       -
           security.pam.services.swaylock-plugin = {};

     

       60
        
         };

     

       61
        
       }

···

       23
        
             wrapperFeatures.gtk = true; # so that gtk works properly

     

       24
        
             extraPackages = with pkgs; [

     

       25
        
               jq

     

       26
       +
               swaylock

     

       27
        
               swayidle

     

       28
        
               wl-clipboard

     

       29
        
               clipman

     
···

       55
        
             isAllowed = true;

     

       56
        
             isSystem = false;

     

       57
        
           };

     

       0
        
       
     

       0
        
       
     

       58
        
         };

     

       59
        
       }

-88

pkgs/swaylock-plugin.nix

···

       1
       -
       {

     

       2
       -
         lib,

     

       3
       -
         stdenv,

     

       4
       -
         cairo,

     

       5
       -
         fetchFromGitHub,

     

       6
       -
         fetchpatch,

     

       7
       -
         gdk-pixbuf,

     

       8
       -
         libxcrypt,

     

       9
       -
         libxkbcommon,

     

       10
       -
         meson,

     

       11
       -
         ninja,

     

       12
       -
         nix-update-script,

     

       13
       -
         pam,

     

       14
       -
         pkg-config,

     

       15
       -
         scdoc,

     

       16
       -
         versionCheckHook,

     

       17
       -
         wayland,

     

       18
       -
         wayland-protocols,

     

       19
       -
         wayland-scanner,

     

       20
       -
       }:

     

       21
       -
       

     

       22
       -
       stdenv.mkDerivation (finalAttrs: {

     

       23
       -
         pname = "swaylock-plugin";

     

       24
       -
         version = "1.8.0";

     

       25
       -
         src = fetchFromGitHub {

     

       26
       -
           owner = "mstoeckl";

     

       27
       -
           repo = "swaylock-plugin";

     

       28
       -
           rev = "refs/tags/v${finalAttrs.version}";

     

       29
       -
           hash = "sha256-Kd6Gqs+YnQu3qKfEeqW5CG38bU2gH2hqjoFEojWa8a4=";

     

       30
       -
         };

     

       31
       -
       

     

       32
       -
         strictDeps = true;

     

       33
       -
         depsBuildBuild = [ pkg-config ];

     

       34
       -
         nativeInstallCheckInputs = [

     

       35
       -
           versionCheckHook

     

       36
       -
         ];

     

       37
       -
         nativeBuildInputs = [

     

       38
       -
           meson

     

       39
       -
           ninja

     

       40
       -
           pkg-config

     

       41
       -
           scdoc

     

       42
       -
           wayland-scanner

     

       43
       -
         ];

     

       44
       -
         buildInputs = [

     

       45
       -
           cairo

     

       46
       -
           libxcrypt

     

       47
       -
           gdk-pixbuf

     

       48
       -
           libxkbcommon

     

       49
       -
           pam

     

       50
       -
           wayland

     

       51
       -
           wayland-protocols

     

       52
       -
         ];

     

       53
       -
       

     

       54
       -
         patches = [

     

       55
       -
           # To remove for release > 1.8.0

     

       56
       -
           (fetchpatch {

     

       57
       -
             url = "https://github.com/mstoeckl/swaylock-plugin/commit/337a6a31dc354426ebf32e31ded56a7e5d350c7a.patch";

     

       58
       -
             hash = "sha256-r1BSubdnd0HzXvNDJm1qhdEltL27dHjPR1WlxaraHlc=";

     

       59
       -
           })

     

       60
       -
         ];

     

       61
       -
       

     

       62
       -
         mesonFlags = [

     

       63
       -
           "-Dpam=enabled"

     

       64
       -
           "-Dgdk-pixbuf=enabled"

     

       65
       -
           "-Dman-pages=enabled"

     

       66
       -
         ];

     

       67
       -
       

     

       68
       -
         passthru = {

     

       69
       -
           updateScript = nix-update-script { };

     

       70
       -
         };

     

       71
       -
       

     

       72
       -
         meta = {

     

       73
       -
           description = "Screen locker for Wayland, forked from swaylock";

     

       74
       -
           longDescription = ''

     

       75
       -
             swaylock-pulgins is a fork of swaylock, a screen locking utility for Wayland compositors.

     

       76
       -
             On top of the usual swaylock features, it allow you to use a

     

       77
       -
             subcommand to generate the lockscreen background.

     

       78
       -
       

     

       79
       -
             Important note: You need to set "security.pam.services.swaylock-plugin = {};" manually.

     

       80
       -
           '';

     

       81
       -
           homepage = "https://github.com/mstoeckl/swaylock-plugin";

     

       82
       -
           mainProgram = "swaylock-plugin";

     

       83
       -
           license = lib.licenses.mit;

     

       84
       -
           platforms = lib.platforms.linux;

     

       85
       -
           maintainers = with lib.maintainers; [ picnoir ];

     

       86
       -
         };

     

       87
       -
       })

     

       88
       -