installers/install-nix-packages-flake.sh

@@ -12,7 +12,7 @@ nix_packages=(
   "yq"
 
   "ruby"
-  "shellcheck"
+  "solargraph"
 
   # Neovim + Plugin dependencies
   "neovim"
@@ -20,10 +20,9 @@ nix_packages=(
   "fzf"
 
   # Language servers
-  "helm-ls" # Helm
+  "helm-ls"
-  "yaml-language-server" # Yaml
+  "yaml-language-server"
-  "lua-language-server" # Lua
+  "lua-language-server"
-  "solargraph" # Ruby
   
   # ProgrammingLanguages
   "lua52Packages.lua"
@@ -41,8 +40,6 @@ nix_packages=(
   "kubernetes-helm"
   "rancher"
 
-  # Remote programming tools
-  "lemonade"
 )
 unstable_packages=(
   # CVE in NixOS stable version of vault
@@ -51,9 +48,6 @@ unstable_packages=(
   # Need unstable latest up to date terraform/terragrunt
   "terraform"
   "terragrunt"
-
-  # Language servers
-  "gitlab-ci-ls"
 )
 
 
@@ -112,9 +106,7 @@ install_nix_packages()
   # The name of the package we are going to install, needed to check for presence/uninstall
   package_name=packages.x86_64-linux.myPackageCollection
   if [ "${nix_packages[*]}" ]; then
-    # Updated to process new nix profile format, proper processing probably needs JQ
+    if nix profile list | cut -d' ' -f 2 | grep -q "${package_name}"; then
-    # But JQ would be another dependency and this is good enough for now
-    if nix profile list --json | grep -i "\"attrPath\":\"${package_name}\""; then
       echo "Removing previous version of profile"
       nix profile remove "${package_name}"
     fi

installers/install-nix.sh

@@ -18,7 +18,7 @@ if [ "${USER:-}" == "root" ] || [ "${UID:-}" == "0" ]; then
 fi
 
 # Download the Nix installer and it's signature from NixOS.org
-curl -so install-nix https://releases.nixos.org/nix/nix-2.18.7/install
+curl -so install-nix https://releases.nixos.org/nix/nix-2.18.1/install
 
 # Run the installer
 sh ./install-nix
@@ -35,13 +35,7 @@ EOF
 rm -f ./install-nix
 
 # Enable flakes and the nix command
-NIX_CONF_DIR=~/.config/nix
+mkdir -p ~/.config/nix
-NIX_CONF_FILE=${NIX_CONF_DIR}/nix.conf
+cat <<EOF > ~/.config/nix/nix.conf
-mkdir -p ${NIX_CONF_DIR}
-cat <<EOF > ${NIX_CONF_FILE}
 experimental-features = flakes nix-command
 EOF
-# Conditionally add a link to system certificates for nix
-if [ -f /etc/ssl/certs/ca-certificates.crt ]; then
-  echo 'ssl-cert-file = /etc/ssl/certs/ca-certificates.crt' >> ${NIX_CONF_FILE}
-fi