From 9602ffeafb1704cb52401449b858c5f8679ffc1b Mon Sep 17 00:00:00 2001
From: Smirnov Olexander <ss2316544@gmail.com>
Date: Thu, 21 Apr 2022 14:34:00 +0300
Subject: [PATCH] Migrate form `yay` to `paru`, updated config fir fish, vscode

---
 README.md               |  2 +-
 bin/arch-upd            |  2 +-
 config/fish/config.fish |  3 +++
 vscode/settings.json    | 47 +++++++++++++++++++++++++++++++++++------
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 558cb41..4966af8 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 ## Install dependencys
 ```bash
 sudo pacman -S git alacritty github-cli neovim tmux zsh ttf-jetbrains-mono
-yay -S rcm visual-studio-code-bin
+paru -S rcm visual-studio-code-bin
 ```
 
 ## And install deps
diff --git a/bin/arch-upd b/bin/arch-upd
index e8b0edf..92322a5 100755
--- a/bin/arch-upd
+++ b/bin/arch-upd
@@ -1,4 +1,4 @@
 #!/bin/sh
 sudo pacman -Syyuu --noconfirm
-yay -Sua --noconfirm
+paru -Sua --noconfirm
 sudo pacman -Rs $(pacman -Qdtq) --noconfirm
diff --git a/config/fish/config.fish b/config/fish/config.fish
index de232de..ec4093e 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -8,12 +8,15 @@ set -g PATH $HOME/.local/bin $PATH
 set -g PATH $HOME/.golang/bin $PATH
 set -g PATH $HOME/.yarn/bin $PATH
 set -g PATH $HOME/.cargo/bin $PATH
+set -g PATH $HOME/.deno/bin $PATH
 
 set fish_greeting
 if status is-interactive
     starship init fish | source
     zoxide init fish | source
     fnm env | source
+
+    source ~/.asdf/asdf.fish
 end
 
 function fish_user_key_bindings
diff --git a/vscode/settings.json b/vscode/settings.json
index 35379f1..01f5c25 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -1,16 +1,23 @@
 {
   "update.showReleaseNotes": false,
-  "workbench.tips.enabled": false,
+  "window.zoomLevel": 1,
   "window.titleBarStyle": "custom",
+  "window.menuBarVisibility": "compact",
+  "workbench.tips.enabled": false,
   "workbench.startupEditor": "readme",
   "workbench.editor.untitled.hint": "hidden",
+  "workbench.activityBar.visible": false,
   "extensions.ignoreRecommendations": true,
   "explorer.compactFolders": false,
   "explorer.confirmDragAndDrop": false,
   "explorer.confirmDelete": false,
-  "terminal.integrated.fontSize": 15,
+  "explorer.experimental.fileNesting.enabled": true,
+  "explorer.experimental.fileNesting.patterns": {
+    "package.json": "package-lock.json, yarn.lock, tsconfig*.json, yarn-error.log, .prettier*, .bsb.lock, bsconfig*.json"
+  },
+  "terminal.integrated.fontSize": 16,
   "files.trimTrailingWhitespace": true,
-  "editor.fontFamily": "Jetbrains Mono, monospace",
+  "editor.fontFamily": "Jetbrains Mono",
   "editor.cursorBlinking": "expand",
   "editor.fontSize": 16,
   "editor.smoothScrolling": true,
@@ -24,6 +31,34 @@
   "git.confirmSync": false,
   "git.enableSmartCommit": true,
   "go.formatTool": "gofumpt",
-  "window.menuBarVisibility": "compact",
-  "workbench.activityBar.visible": false,
-}
\ No newline at end of file
+  "vim.hlsearch": true,
+  "vim.useSystemClipboard": true,
+  "vim.surround": true,
+  "vim.leader": "<space>",
+  "vim.insertModeKeyBindings": [{ "before": ["j", "k"], "after": ["<esc>"] }],
+  "vim.normalModeKeyBindings": [
+    { "before": ["K"], "commands": ["editor.action.showHover"] },
+    { "before": ["leader", "h"], "commands": [":nohl"] },
+    { "before": ["leader", "w"], "commands": ["workbench.action.files.save"] },
+    {
+      "before": ["leader", "c"],
+      "commands": ["workbench.action.closeActiveEditor"]
+    },
+    { "before": ["leader", "e"], "commands": ["workbench.view.explorer"] },
+    { "before": ["leader", "f"], "commands": ["workbench.action.quickOpen"] }
+  ],
+  "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
+  "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
+  "[prisma]": {
+    "editor.defaultFormatter": "Prisma.prisma"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "typescript.updateImportsOnFileMove.enabled": "always",
+  "terminal.integrated.commandsToSkipShell": [
+    "language-julia.interrupt"
+  ],
+  "julia.symbolCacheDownload": true,
+  "julia.enableTelemetry": false
+}