Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move rbw-atomic-unlock out from scripts #1027

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions darwin/aarch64-darwin/VW2WRF4694.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
pkgs.vim
pkgs.zip
pkgs.devenv
pkgs.rbw-atomic-unlock
];

fonts.packages = with pkgs; [
Expand Down
12 changes: 0 additions & 12 deletions flake/helper-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@
'';
};

rbw-atomic-unlock = writeShellApplication {
name = "rbw-atomic-unlock";
runtimeInputs = [rbw util-linux];
text = ''
rbw_lock="/tmp/rbw-unlock.lock"
exec 200>"$rbw_lock"
flock -w 15 200
rbw unlocked || rbw unlock
'';
};

sk-sk = writeShellApplication {
name = "sk-sk";
runtimeInputs = [skim];
Expand Down Expand Up @@ -211,7 +200,6 @@
launch
project-select
rbw-git-creds
rbw-atomic-unlock
rofi-rbw
fuzzel-rbw
update-wifi-networks
Expand Down
10 changes: 10 additions & 0 deletions flake/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,16 @@
}} -d "$(pwd)" "$@"
'';
};
rbw-atomic-unlock = pkgs.writeShellApplication {
name = "rbw-atomic-unlock";
runtimeInputs = [pkgs.rbw pkgs.util-linux];
text = ''
rbw_lock="/tmp/rbw-unlock.lock"
exec 200>"$rbw_lock"
flock -w 15 200
rbw unlocked || rbw unlock
'';
};
tofuWithPlugins = pkgs.opentofu.withPlugins (
p:
map tofuProvider [p.null p.external p.hcloud p.cloudflare p.random p.tailscale]
Expand Down
1 change: 1 addition & 0 deletions profiles/defaults.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ in {
pkgs.powertop
pkgs.procs
pkgs.psmisc
pkgs.rbw-atomic-unlock
pkgs.ripgrep
pkgs.sd
pkgs.socat
Expand Down