aboutsummaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-02-02 19:06:49 +0100
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-02-02 19:06:49 +0100
commitad07b56d4bf43301aeced80c8e0af5b5342a9d26 (patch)
treed5bf0db3bb8c8e0c1a791480cb6d25bf86135195 /pkgs
parentfix(flake/packages): Use correct nvim package to override (diff)
downloadnixos-config-ad07b56d4bf43301aeced80c8e0af5b5342a9d26.zip
refactor(pkgs/lock): Migrate away from `sysLib`
Diffstat (limited to 'pkgs')
-rwxr-xr-xpkgs/by-name/lo/lock/lock.sh13
-rw-r--r--pkgs/by-name/lo/lock/package.nix10
2 files changed, 9 insertions, 14 deletions
diff --git a/pkgs/by-name/lo/lock/lock.sh b/pkgs/by-name/lo/lock/lock.sh
index 3101ef9a..4c5e1c01 100755
--- a/pkgs/by-name/lo/lock/lock.sh
+++ b/pkgs/by-name/lo/lock/lock.sh
@@ -1,18 +1,15 @@
-#!/usr/bin/env dash
-
-# shellcheck source=/dev/null
-SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH
+# shellcheck shell=bash
context="$(task _get rc.context)"
-[ "$context" ] && task context none
+[ -n "$context" ] && task context none
# We have ensured that only one task is active
active="$(task +ACTIVE _ids)"
-[ "$active" ] && task stop "$active"
+[ -n "$active" ] && task stop "$active"
swaylock
-[ "$active" ] && task start "$active"
+[ -n "$active" ] && task start "$active"
-[ "$context" ] && task context "$context"
+[ -n "$context" ] && task context "$context"
# vim: ft=sh
diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index 0e6e38d0..84cbe3d1 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -1,14 +1,12 @@
{
- sysLib,
+ writeShellApplication,
taskwarrior,
swaylock,
}:
-sysLib.writeShellScript {
+writeShellApplication {
name = "lock";
- src = ./lock.sh;
- generateCompletions = false;
- keepPath = false;
- dependencies = [
+ text = builtins.readFile ./lock.sh;
+ runtimeInputs = [
taskwarrior
swaylock
];