wiro.world
yep, more dotfiles
move custom swaylock to lpkgs
+21
-13
+5
-2
home-manager/fragments/sway.nix
+5
-2
home-manager/fragments/sway.nix
···
2
2
config,
3
3
lib,
4
4
pkgs,
5
+
lpkgs,
5
6
6
7
isDarwin,
7
8
...
8
9
}:
9
10
10
11
let
12
+
inherit (config.local) flags;
11
13
cfg = config.local.fragment.sway;
12
14
cfg-sway = config.wayland.windowManager.sway.config;
13
15
···
30
32
31
33
programs.swaylock = {
32
34
enable = true;
35
+
package = if !flags.onlyCached then lpkgs.swaylock else pkgs.swaylock;
33
36
settings = {
34
37
ignore-empty-password = true;
35
38
show-failed-attempts = true;
36
39
37
40
# relies on custom swaylock version in `overlays/patches.nix`
38
-
indicator-y-position = -100;
41
+
indicator-y-position = if !flags.onlyCached then -100 else 100;
39
42
indicator-x-position = 100;
40
43
};
41
44
};
···
250
253
sleep 1
251
254
252
255
${grim} $tmpimg
253
-
${lib.getExe pkgs.swaylock} --image $tmpimg
256
+
${lib.getExe config.programs.swaylock.package} --image $tmpimg
254
257
255
258
rm $tmpimg
256
259
''}";
-11
overlays/patches.nix
-11
overlays/patches.nix
···
1
1
final: prev:
2
2
3
-
with final.lib;
4
-
5
3
{
6
-
# TODO: remove once github:swaywm/swaylock#369 is merged
7
-
swaylock = prev.swaylock.overrideAttrs (old: {
8
-
src = prev.fetchFromGitHub {
9
-
owner = "mrnossiom";
10
-
repo = "swaylock";
11
-
rev = "1e949610081ea0788d9fba6f0d7c909d7b62e9e0";
12
-
hash = "sha256-3YN6n5mYB7r1Xk22AGYMusNbA6aBD6OMU3Gn9OOuS6o=";
13
-
};
14
-
});
15
4
}
+1
pkgs/default.nix
+1
pkgs/default.nix
···
22
22
lsr = callPackage ./lsr { };
23
23
names = callPackage ./names.nix { };
24
24
probe-rs-udev-rules = callPackage ./probe-rs-udev-rules.nix { };
25
+
swaylock = callPackage ./swaylock.nix { };
25
26
26
27
# Import packages defined in foreign repositories
27
28
inherit (agenix.packages.${system}) agenix;
+15
pkgs/swaylock.nix
+15
pkgs/swaylock.nix
···
1
+
{
2
+
swaylock,
3
+
fetchFromGitHub,
4
+
...
5
+
}:
6
+
7
+
# TODO: remove once github:swaywm/swaylock#369 is merged
8
+
swaylock.overrideAttrs (old: {
9
+
src = fetchFromGitHub {
10
+
owner = "mrnossiom";
11
+
repo = "swaylock";
12
+
rev = "1e949610081ea0788d9fba6f0d7c909d7b62e9e0";
13
+
hash = "sha256-3YN6n5mYB7r1Xk22AGYMusNbA6aBD6OMU3Gn9OOuS6o=";
14
+
};
15
+
})