feat(packages): prefer nix packages

Author: spywhere

migrate.sh

@@ -12,16 +12,16 @@ let
   inherit (package) mkPackage;
 EOF
   printf 'in mkPackage %s {\n' "$1"
-  printf '  config = {\n'
   if test -n "$2"; then
-    printf '    optional = true;\n'
+    printf '  optional = true;\n'
   fi
   if test -n "$3"; then
-    printf '    only = [ %s ];\n' "$3"
+    printf '  only = [ %s ];\n' "$3"
   fi
   if test -n "$4"; then
-    printf '    except = [ %s ];\n' "$4"
+    printf '  except = [ %s ];\n' "$4"
   fi
+  printf '  config = {\n'
   printf '    %s = [ %s ];\n' "$5" "$6"
   printf '  };\n}\n'
 }
@@ -101,14 +101,16 @@ validate_package() {
     except="$(parse_profiles except $profiles)"
   fi
 
-  if contains "$content" "use_brew formula"; then
+  if contains "$content" "use_nix"; then
+    migrate_to_nix "$1" "pkgs.$(read_match "$content" "use_nix" | item_at 3 | strip)" nixpkgs.add "$optional" "$only" "$except"
+  elif contains "$content" "use_brew formula"; then
     migrate_to_nix "$1" "$(read_match "$content" "use_brew formula" | item_at 3 | normalize)" brew.add.formula "$optional" "$only" "$except"
   elif contains "$content" "use_brew cask"; then
     migrate_to_nix "$1" "$(read_match "$content" "use_brew cask" | item_at 3 | normalize | xargs sh -c 'out="";for i in $*; do case "$1" in -*) continue;; *);; esac;if test -n "$out"; then out="$out ";fi;out="$out\"$i\""; done; printf "%s" "$out"' sh)" brew.add.cask "$optional" "$only" "$except"
   elif contains "$content" "use_brew_tap"; then
     migrate_to_nix "$1" "$(read_match "$content" "use_brew_tap" | item_at 2 | normalize | xargs sh -c 'out="";for i in $*; do case "$1" in -*) continue;; *);; esac;if test -n "$out"; then out="$out ";fi;out="$out\"$i\""; done; printf "%s" "$out"' sh)" brew.add.tap "$optional" "$only" "$except"
-  elif contains "$content" "has_executable"; then
-    migrate_to_nix "$1" "pkgs.$(read_match "$content" "has_executable" | item_at 2 | strip)" nixpkgs.add "$optional" "$only" "$except"
+  # elif contains "$content" "has_executable"; then
+  #   migrate_to_nix "$1" "pkgs.$(read_match "$content" "has_executable" | item_at 2 | strip)" nixpkgs.add "$optional" "$only" "$except"
   else
     printf ' skipped\n'
     return 1

packages/airbuddy.sh

@@ -13,4 +13,5 @@ fi
 
 has_app 'AirBuddy'
 
+# use_nix 'airbuddy'
 use_brew cask 'airbuddy'

packages/aldente.sh

@@ -14,4 +14,5 @@ fi
 has_app 'AlDente'
 
 profile -work
+# use_nix 'aldente'
 use_brew cask 'aldente'

packages/autoconf.sh

@@ -14,4 +14,5 @@ fi
 has_executable 'autoconf'
 
 # neovim rebuild dependencies
+# use_nix 'autoconf'
 use_apt 'autoconf'

packages/automake.sh

@@ -14,5 +14,6 @@ fi
 has_executable 'automake'
 
 # neovim rebuild dependencies
+# use_nix 'automake'
 use_apt 'automake'
 use_brew formula 'automake'

packages/bash.sh

@@ -13,5 +13,6 @@ fi
 
 has_string 'version 5\.[0-9]*\.[0-9]*' bash --version
 
+# use_nix 'bash'
 use_apt 'bash'
 use_brew formula 'bash'

packages/bat.sh

@@ -32,5 +32,6 @@ case "$cpu_type" in
     ;;
 esac
 
+# use_nix 'bat'
 use_brew formula 'bat'
 use_dpkg 'bat' "https://github.com/sharkdp/bat" "%url/releases/download/v%version/bat${libc_type}_%version_$cpu_type.deb" "0.19.0"

packages/betterdisplay.sh

@@ -13,4 +13,5 @@ fi
 
 has_app 'BetterDisplay'
 
+# use_nix 'betterdisplay'
 use_brew cask 'betterdisplay'

packages/bitwarden-cli.sh

@@ -13,4 +13,5 @@ fi
 
 has_executable 'bw'
 
+# use_nix 'bitwarden-cli'
 use_brew formula 'bitwarden-cli'

packages/bitwarden.sh

@@ -13,4 +13,5 @@ fi
 
 has_app 'Bitwarden'
 
+# use_nix 'bitwarden-desktop'
 use_mas 'bitwarden' '1352778147'