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

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

modules/profiles/personal.nix

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

modules/programs/tmux.nix

@@ -10,14 +10,18 @@ let
     text = ''
       #!/usr/bin/env bash
       
-      if [[ $# -eq 1 ]]; then
-          selected=$1
+      options=$(fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf --filter "''$*")
+
+      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 . _)