From 3d0c27cd3d7c5e7b7460c3e87c033eb7d5cdfe98 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 15 May 2022 03:47:27 +0700
Subject: [PATCH] nvim: use yarn instead of npm for install scripts

---
 playbooks/roles/system/tasks/main.yml           | 2 +-
 roles/nvim/files/nvim/scripts/lint/cspell       | 4 ++--
 roles/nvim/files/nvim/scripts/lint/markdownlint | 4 ++--
 roles/nvim/files/nvim/scripts/lint/stylelint    | 4 ++--
 roles/nvim/files/nvim/scripts/lint/write_good   | 4 ++--
 roles/nvim/files/nvim/scripts/lsp/ansiblels     | 4 ++--
 roles/nvim/files/nvim/scripts/lsp/bashls        | 4 ++--
 roles/nvim/files/nvim/scripts/lsp/dockerls      | 4 ++--
 roles/nvim/files/nvim/scripts/lsp/emmet_ls      | 4 ++--
 roles/nvim/files/nvim/scripts/lsp/tailwindcss   | 4 ++--
 roles/nvim/files/nvim/scripts/lsp/tsserver      | 4 ++--
 roles/nvim/files/nvim/scripts/lsp/vscode        | 4 ++--
 roles/shells/tasks/main.yml                     | 2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/playbooks/roles/system/tasks/main.yml b/playbooks/roles/system/tasks/main.yml
index 8532542..63e48b6 100644
--- a/playbooks/roles/system/tasks/main.yml
+++ b/playbooks/roles/system/tasks/main.yml
@@ -22,7 +22,7 @@
       gnupg-doc, jq, iproute2, gst-plugins-pipewire, sops, imagemagick,
       libarchive-tools, libffi-dev, qalc, love, bombadillo, mupdf-tools,
       man-pages-posix, man-pages, meson, mpc, mpd, mpdris2, pavucontrol-qt,
-      mpv, mpv-mpris, ncmpcpp, neovim, npm, yarn, pandoc, k9s, rustscan,
+      mpv, mpv-mpris, ncmpcpp, neovim, yarn, pandoc, k9s, rustscan,
       py3-pynvim, newsboat, ngrep, nmap, nushell, packer, rsync, clifm,
       pcmanfm-qt, pinentry-qt, pipewire, sway, swappy, sshfs, step-cli, xh,
       pipewire-pulse, playerctl, qimgv, qt5ct, pipewire-tools, kubectl,
diff --git a/roles/nvim/files/nvim/scripts/lint/cspell b/roles/nvim/files/nvim/scripts/lint/cspell
index 28e579f..cabe3f8 100755
--- a/roles/nvim/files/nvim/scripts/lint/cspell
+++ b/roles/nvim/files/nvim/scripts/lint/cspell
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lint/cspell"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lint || true
-npm install cspell@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add cspell@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lint/markdownlint b/roles/nvim/files/nvim/scripts/lint/markdownlint
index 7f4a86b..46e17a2 100755
--- a/roles/nvim/files/nvim/scripts/lint/markdownlint
+++ b/roles/nvim/files/nvim/scripts/lint/markdownlint
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lint/markdownlint"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lint || true
-npm install markdownlint-cli@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add markdownlint-cli@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lint/stylelint b/roles/nvim/files/nvim/scripts/lint/stylelint
index 6e968aa..b63011c 100755
--- a/roles/nvim/files/nvim/scripts/lint/stylelint
+++ b/roles/nvim/files/nvim/scripts/lint/stylelint
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lint/stylelint"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lint || true
-npm install stylelint@latest stylelint-config-standard@latest stylelint-config-standard-scss@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add stylelint@latest stylelint-config-standard@latest stylelint-config-standard-scss@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lint/write_good b/roles/nvim/files/nvim/scripts/lint/write_good
index 2853960..d4d6245 100755
--- a/roles/nvim/files/nvim/scripts/lint/write_good
+++ b/roles/nvim/files/nvim/scripts/lint/write_good
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lint/write_good"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lint || true
-npm install write-good@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add write-good@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lsp/ansiblels b/roles/nvim/files/nvim/scripts/lsp/ansiblels
index ca9fb48..68fa9f8 100755
--- a/roles/nvim/files/nvim/scripts/lsp/ansiblels
+++ b/roles/nvim/files/nvim/scripts/lsp/ansiblels
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lsp/ansiblels"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lsp || true
-npm install @ansible/ansible-language-server@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add @ansible/ansible-language-server@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lsp/bashls b/roles/nvim/files/nvim/scripts/lsp/bashls
index b84abb7..4d43329 100755
--- a/roles/nvim/files/nvim/scripts/lsp/bashls
+++ b/roles/nvim/files/nvim/scripts/lsp/bashls
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lsp/bashls"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lsp || true
-npm install bash-language-server@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add bash-language-server@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lsp/dockerls b/roles/nvim/files/nvim/scripts/lsp/dockerls
index 8b18d7b..c68d9c5 100755
--- a/roles/nvim/files/nvim/scripts/lsp/dockerls
+++ b/roles/nvim/files/nvim/scripts/lsp/dockerls
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lsp/dockerls"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lsp || true
-npm install dockerfile-language-server-nodejs@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add dockerfile-language-server-nodejs@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lsp/emmet_ls b/roles/nvim/files/nvim/scripts/lsp/emmet_ls
index 27e4272..81a7376 100755
--- a/roles/nvim/files/nvim/scripts/lsp/emmet_ls
+++ b/roles/nvim/files/nvim/scripts/lsp/emmet_ls
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lsp/emmet_ls"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lsp || true
-npm install emmet-ls@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add emmet-ls@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lsp/tailwindcss b/roles/nvim/files/nvim/scripts/lsp/tailwindcss
index 728a18c..32559a8 100755
--- a/roles/nvim/files/nvim/scripts/lsp/tailwindcss
+++ b/roles/nvim/files/nvim/scripts/lsp/tailwindcss
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lsp/tailwindcss"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lsp || true
-npm install @tailwindcss/language-server
+[ ! -f package.json ] && yarn init -y || true
+yarn add @tailwindcss/language-server@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lsp/tsserver b/roles/nvim/files/nvim/scripts/lsp/tsserver
index d62efe3..d5276db 100755
--- a/roles/nvim/files/nvim/scripts/lsp/tsserver
+++ b/roles/nvim/files/nvim/scripts/lsp/tsserver
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lsp/tsserver"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lsp || true
-npm install typescript@latest typescript-language-server@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add typescript@latest typescript-language-server@latest
 
 cd ${current_path}
diff --git a/roles/nvim/files/nvim/scripts/lsp/vscode b/roles/nvim/files/nvim/scripts/lsp/vscode
index 7d07bc4..ca9ce84 100755
--- a/roles/nvim/files/nvim/scripts/lsp/vscode
+++ b/roles/nvim/files/nvim/scripts/lsp/vscode
@@ -6,7 +6,7 @@ server_path="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lsp/vscode"
 [ ! -d "${server_path}" ] && mkdir -p "${server_path}"
 cd ${server_path}
 
-[ ! -f package.json ] && npm init -y --scope=lsp || true
-npm install vscode-langservers-extracted@latest
+[ ! -f package.json ] && yarn init -y || true
+yarn add vscode-langservers-extracted@latest
 
 cd ${current_path}
diff --git a/roles/shells/tasks/main.yml b/roles/shells/tasks/main.yml
index c4c58d2..cc0b4d2 100644
--- a/roles/shells/tasks/main.yml
+++ b/roles/shells/tasks/main.yml
@@ -40,7 +40,7 @@
     - name: fish | Download fzf_key_bindings.fish
       get_url:
         url: https://github.com/junegunn/fzf/raw/master/shell/key-bindings.fish
-        dest: ~/.config/fish/functions/fzf_key_bindings.fish
+        dest: ~/.config/fish/conf.d/fzf_key_bindings.fish
         mode: 0644
 
     - name: fish | Install fisher