commit afc39aef83b4376cdb90e462386cc43dd558d17e · ryan.freumh.org/nixos

flake.nix

···

       88
       88
        
                     inherit system;

     

       89
       89
        
                     config = nixpkgsConfig;

     

       90
       90
        
                   }).sonarr;

     

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

     

       91
       92
        
               })

     

       92
       93
        
               inputs.nur.overlays.default

     

       93
       94
        
             ];

+1 -1

home/gui/sway.nix

···

       18
       18
        
           '';

     

       19
       19
        
           locked = "--locked";

     

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

     

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

     

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

     

       22
       22
        
           enable_output = "swaymsg output $laptop_output enable";

     

       23
       23
        
           disable_output = "swaymsg output $laptop_output disable";

     

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

+18 -1

home/gui/timewall.toml

···

       3
       3
        
       lon = 0

     

       4
       4
        
       

     

       5
       5
        
       [setter]

     

       6
       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" ]

     

       6
       6
       +
       # TODO something better

     

       7
       7
       +
       command = [

     

       8
       8
       +
           "sh",

     

       9
       9
       +
           "-c",

     

       10
       10
       +
           """

     

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

     

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

     

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

     

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

     

       15
       15
       +
           fi;

     

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

     

       17
       17
       +
       	sleep 1

     

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

     

       19
       19
       +
               kill $old_pid &&

     

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

     

       21
       21
       +
           fi

     

       22
       22
       +
       	"""

     

       23
       23
       +
       ]

-1

home/gui/wm/scripts/swayidle_suspend.sh

···

       10
       10
        
       	timeout 240 'loginctl lock-session'\

     

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

     

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

     

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

     

       14
       13

+3 -1

modules/gui/sway.nix

···

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

     

       24
       24
        
             extraPackages = with pkgs; [

     

       25
       25
        
               jq

     

       26
       26
       -
               swaylock

     

       26
       26
       +
               swaylock-plugin

     

       27
       27
        
               swayidle

     

       28
       28
        
               wl-clipboard

     

       29
       29
        
               clipman

     
···

       55
       55
        
             isAllowed = true;

     

       56
       56
        
             isSystem = false;

     

       57
       57
        
           };

     

       58
       58
       +
       

     

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

     

       58
       60
        
         };

     

       59
       61
        
       }

+88

pkgs/swaylock-plugin.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         cairo,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         fetchpatch,

     

       7
       7
       +
         gdk-pixbuf,

     

       8
       8
       +
         libxcrypt,

     

       9
       9
       +
         libxkbcommon,

     

       10
       10
       +
         meson,

     

       11
       11
       +
         ninja,

     

       12
       12
       +
         nix-update-script,

     

       13
       13
       +
         pam,

     

       14
       14
       +
         pkg-config,

     

       15
       15
       +
         scdoc,

     

       16
       16
       +
         versionCheckHook,

     

       17
       17
       +
         wayland,

     

       18
       18
       +
         wayland-protocols,

     

       19
       19
       +
         wayland-scanner,

     

       20
       20
       +
       }:

     

       21
       21
       +
       

     

       22
       22
       +
       stdenv.mkDerivation (finalAttrs: {

     

       23
       23
       +
         pname = "swaylock-plugin";

     

       24
       24
       +
         version = "1.8.0";

     

       25
       25
       +
         src = fetchFromGitHub {

     

       26
       26
       +
           owner = "mstoeckl";

     

       27
       27
       +
           repo = "swaylock-plugin";

     

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

     

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

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         strictDeps = true;

     

       33
       33
       +
         depsBuildBuild = [ pkg-config ];

     

       34
       34
       +
         nativeInstallCheckInputs = [

     

       35
       35
       +
           versionCheckHook

     

       36
       36
       +
         ];

     

       37
       37
       +
         nativeBuildInputs = [

     

       38
       38
       +
           meson

     

       39
       39
       +
           ninja

     

       40
       40
       +
           pkg-config

     

       41
       41
       +
           scdoc

     

       42
       42
       +
           wayland-scanner

     

       43
       43
       +
         ];

     

       44
       44
       +
         buildInputs = [

     

       45
       45
       +
           cairo

     

       46
       46
       +
           libxcrypt

     

       47
       47
       +
           gdk-pixbuf

     

       48
       48
       +
           libxkbcommon

     

       49
       49
       +
           pam

     

       50
       50
       +
           wayland

     

       51
       51
       +
           wayland-protocols

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         patches = [

     

       55
       55
       +
           # To remove for release > 1.8.0

     

       56
       56
       +
           (fetchpatch {

     

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

     

       58
       58
       +
             hash = "sha256-r1BSubdnd0HzXvNDJm1qhdEltL27dHjPR1WlxaraHlc=";

     

       59
       59
       +
           })

     

       60
       60
       +
         ];

     

       61
       61
       +
       

     

       62
       62
       +
         mesonFlags = [

     

       63
       63
       +
           "-Dpam=enabled"

     

       64
       64
       +
           "-Dgdk-pixbuf=enabled"

     

       65
       65
       +
           "-Dman-pages=enabled"

     

       66
       66
       +
         ];

     

       67
       67
       +
       

     

       68
       68
       +
         passthru = {

     

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

     

       70
       70
       +
         };

     

       71
       71
       +
       

     

       72
       72
       +
         meta = {

     

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

     

       74
       74
       +
           longDescription = ''

     

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

     

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

     

       77
       77
       +
             subcommand to generate the lockscreen background.

     

       78
       78
       +
       

     

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

     

       80
       80
       +
           '';

     

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

     

       82
       82
       +
           mainProgram = "swaylock-plugin";

     

       83
       83
       +
           license = lib.licenses.mit;

     

       84
       84
       +
           platforms = lib.platforms.linux;

     

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

     

       86
       86
       +
         };

     

       87
       87
       +
       })

     

       88
       88
       +