merge

.gitignore

@@ -0,0 +1,3 @@
+node_modules
+package.json
+package-lock.json

install.sh

@@ -1,4 +1,12 @@
-#!/usr/bin/fish
+#!/usr/bin/env fish
+
+# need to rewrite in future
+sudo apt install npm python3-venv ruby-dev -y
+pip3 install --upgrade pynvim
+sudo gem install neovim
+
+# Install NeoVim module for NPM
+sudo npm i -g neovim
 
 # Инициализация текста сообщений в зависимости от установленного языка в оболочке
 if test (string match -ri "ru" "$LANG")
@@ -38,6 +46,16 @@ if test (string match -ri "ru" "$LANG")
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить форматировщик для NGINX? (\"vasilevich/nginxbeautifier\") (y/N) ";
 			case FORMATTER_NGINX_INSTALLED
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Установлен форматировщик для NGINX (\"vasilevich/nginxbeautifier\")";
+			case FORMATTER_PRETTIER_INSTALL
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить форматировщик Prettier? (\"prettier/vim-prettier\") (y/N) ";
+			case FORMATTER_PRETTIER_INSTALLED
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Установлен форматировщик Prettier (\"prettier/vim-prettier\")";
+			case FONT_PATCH
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[ЗАДАЧА] "; set_color white; echo "Пропатчить шрифт для иконок? (\"nvim-tree/nvim-web-devicons\") (y/N) ";
+			case FONT_CHOOSE
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[ЗАДАЧА] "; set_color white; echo "Выбери шрифт (путь) ";
+			case FONT_PATCHED
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Пропатчен шрифт для иконок (\"nvim-tree/nvim-web-devicons\")";
     end
   end
 else
@@ -77,7 +95,17 @@ else
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install the formatter for NGINX? (\"vasilevich/nginxbeautifier\") (y/N) ";
 			case FORMATTER_NGINX_INSTALLED
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Installed the formatter for NGINX (\"vasilevich/nginxbeautifier\")";
-		end
+			case FORMATTER_PRETTIER_INSTALL
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install the formatter Prettier? (\"prettier/vim-prettier\") (y/N) ";
+			case FORMATTER_PRETTIER_INSTALLED
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Installed the formatter Prettier (\"prettier/vim-prettier\")";
+			case FONT_PATCH
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[TASK] "; set_color white; echo "Patch your font for icons? (\"nvim-tree/nvim-web-devicons\") (y/N) ";
+			case FONT_CHOOSE
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[TASK] "; set_color white; echo "Choose a font (path)";
+			case FONT_PATCHED
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Pathed the font for icons (\"nvim-tree/nvim-web-devicons\")";
+	end
 	end
 end
 
@@ -178,22 +206,28 @@ if test (string match -ri 'y' "$RESPONSE")
 	# Установка
 	curl -fsSL https://deno.land/install.sh | sh 1> /dev/null 2> /dev/null 
 
+	# TODO доделать нормально
+	set -g DENO_INSTALL "$HOME/.deno"
+	fish_add_path $DENO_INSTALL/bin
+
 	print LSP_DENO_INSTALLED
 end
 
 # Installation request
-set RESPONSE (read -n 1 -p "print LSP_LUA_INSTALL")
+set RESPONSE (read -n 1 -p "print LSP_LUA_INSTALL")GG
 bind -e y
 
 if test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "luals/lua-language-server"
 
 	# Установка
+	sudo apt install ninja-build -y
 	cd ~/
+	rm -rf lua-language-server 1> /dev/null 2> /dev/null
 	git clone https://github.com/LuaLS/lua-language-server 1> /dev/null 2> /dev/null 
 	cd lua-language-server
 	fish ./make.sh 1> /dev/null 2> /dev/null 
-  fish_add_path $(realpath ./)/bin 1> /dev/null 2> /dev/null 
+ 	fish_add_path $HOME/lua-language-server/bin 1> /dev/null 2> /dev/null 
 
 	print LSP_LUA_INSTALLED
 end
@@ -210,3 +244,40 @@ if test (string match -ri 'y' "$RESPONSE")
 
 	print FORMATTER_NGINX_INSTALLED
 end
+
+# Installation request
+set RESPONSE (read -n 1 -p "print FORMATTER_PRETTIER_INSTALL")
+bind -e y
+
+if test (string match -ri 'y' "$RESPONSE")
+	# Accepted installation of "prettier/vim-prettier"
+
+	npm i prettier 1> /dev/null 2> /dev/null
+G
+	print FORMATTER_PRETTIER_INSTALLED
+end
+
+# Installation request
+set RESPONSE (read -n 1 -p "print FONT_PATCH")
+bind -e y
+
+if test (string match -ri 'y' "$RESPONSE")
+	# Accepted to patching the font
+
+	cd ~/
+	wget https://github.com/ryanoasis/nerd-fonts/releases/latest/download/FontPatcher.zip
+	unzip FontPatcher.zip -d font_patcher
+	cd font_patcher
+
+	#if not type -q python && type -q python3
+	if not type -q python
+		# alias python=python3
+		sudo apt install python-is-python3 -y
+	end
+
+	sudo apt install fontforge python3-fontforge -y
+
+	./font-patcher (read -p "print FONT_CHOOSE")
+
+	print FONT_PATCHED
+end

lua/plugins/fidget.lua

@@ -1,5 +1,5 @@
 require('fidget').setup({
-	-- Options related to LSP progress subsystem
+		-- Options related to LSP progress subsystem
 	progress = {
 		poll_rate = 0,                -- How and when to poll for progress messages
 		suppress_on_insert = false,   -- Suppress new messages while in insert mode
@@ -91,5 +91,5 @@ require('fidget').setup({
 		float_precision = 0.01,      -- Limit the number of decimals displayed for floats
 		path =                       -- Where Fidget writes its logs to
 				string.format("%s/fidget.nvim.log", vim.fn.stdpath("cache")),
-	},
+	}
 })

lua/plugins/nvim-web-devicons.lua

@@ -1,5 +1,6 @@
 require('nvim-web-devicons').setup {
   override = {},
   color_icons = true,
-  default = false
+  default = true,
+	strict = true
 }

lua/plugins/packer.lua

@@ -166,7 +166,7 @@ return require('packer').startup(function(use)
 		run = 'composer install'
 	}
 
-	-- LSP-сервер для Fish Shell
+	-- LSP-сервер для Fish Shell 
 	use 'dag/vim-fish'
 
 	-- Цветовая тема
@@ -179,8 +179,8 @@ return require('packer').startup(function(use)
 	use 'chr4/nginx.vim'
 
 	-- Форматировщик Prettier
-	use {
-		'prettier/vim-prettier',
-		run = 'yarn install --frozen-lockfile --production'
-	}
+  use {
+      'prettier/vim-prettier',
+      run = 'yarn install --frozen-lockfile --production'
+  }
 end)