Merge remote-tracking branch 'origin/nixos' into nixos
This commit is contained in:
commit
56044695df
3 changed files with 13 additions and 6 deletions
|
@ -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
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
{
|
{
|
||||||
|
@ -57,4 +57,8 @@ with lib;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
synology-drive-client
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,10 +10,14 @@ let
|
||||||
text = ''
|
text = ''
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if [[ $# -eq 1 ]]; then
|
options=$(fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf --filter "''$*")
|
||||||
selected=$1
|
|
||||||
|
if [[ -z $options ]]; then
|
||||||
|
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
|
||||||
|
|
Loading…
Reference in a new issue