diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index ef5a639..855c581 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -48,7 +48,6 @@ with lib; { pavucontrol stable.libreoffice # HACK to fix build error stable.signal-desktop - synology-drive-client texlive.combined.scheme-full thunderbird vlc diff --git a/modules/profiles/personal.nix b/modules/profiles/personal.nix index 6bf7167..e7d9e6e 100644 --- a/modules/profiles/personal.nix +++ b/modules/profiles/personal.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ lib, pkgs, ... }: with lib; { @@ -57,4 +57,8 @@ with lib; }; }; }; + + environment.systemPackages = with pkgs; [ + synology-drive-client + ]; } diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix index ef01b1f..aba543a 100644 --- a/modules/programs/tmux.nix +++ b/modules/programs/tmux.nix @@ -9,15 +9,19 @@ let runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd ]; text = '' #!/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 - selected=$1 + if [[ -z $options ]]; then + exit 1 + elif [[ $(wc -l <<< "$options") -eq 1 ]]; then + selected="$options" else - selected=$(fd -gH '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf) + selected=$(echo "$options" | fzf --query="$*") fi if [[ -z $selected ]]; then - exit 0 + exit 0 fi selected_name=$(basename "$selected" | tr . _)