Merge remote-tracking branch 'origin/nixos' into nixos

nixos
Moritz Böhme 2023-04-26 14:30:27 +02:00
commit 56044695df
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
3 changed files with 13 additions and 6 deletions

View File

@ -48,7 +48,6 @@ with lib; {
pavucontrol pavucontrol
stable.libreoffice # HACK to fix build error stable.libreoffice # HACK to fix build error
stable.signal-desktop stable.signal-desktop
synology-drive-client
texlive.combined.scheme-full texlive.combined.scheme-full
thunderbird thunderbird
vlc vlc

View File

@ -1,4 +1,4 @@
{ lib, ... }: { lib, pkgs, ... }:
with lib; with lib;
{ {
@ -57,4 +57,8 @@ with lib;
}; };
}; };
}; };
environment.systemPackages = with pkgs; [
synology-drive-client
];
} }

View File

@ -9,15 +9,19 @@ let
runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd ]; runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd ];
text = '' text = ''
#!/usr/bin/env bash #!/usr/bin/env bash
options=$(fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf --filter "''$*")
if [[ $# -eq 1 ]]; then if [[ -z $options ]]; then
selected=$1 exit 1
elif [[ $(wc -l <<< "$options") -eq 1 ]]; then
selected="$options"
else else
selected=$(fd -gH '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf) selected=$(echo "$options" | fzf --query="$*")
fi fi
if [[ -z $selected ]]; then if [[ -z $selected ]]; then
exit 0 exit 0
fi fi
selected_name=$(basename "$selected" | tr . _) selected_name=$(basename "$selected" | tr . _)