install.sh, keymaps, settings

install.sh

@@ -1,12 +1,29 @@
 #!/usr/bin/env fish
 
-# need to rewrite in future
+# Initializing the flags
-sudo apt install npm python3-venv ruby-dev -y
+set -l options (fish_opt -s v -l verbose)
-pip3 install --upgrade pynvim
+set options $options (fish_opt -s f -l force)
-sudo gem install neovim
+set options $options (fish_opt -s u -l update)
 
-# Install NeoVim module for NPM
+# Reading the flags
-sudo npm i -g neovim
+argparse $options -- $argv
+
+# Initializing the buffer of output
+set -l output (if set -q _flag_verbose; echo '/dev/tty'; else; echo '/dev/null'; end)
+
+if set -q _flag_update
+	begin
+		# need to rewrite in future (бляяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяя)
+		sudo apt install -y npm python3.10-venv ruby-dev pkg-config
+		python3 -m pip install --upgrade pip
+		fish_add_path ~/.local/bin
+		pip3 install --upgrade pynvim
+		sudo gem install neovim
+
+		# Install NeoVim module for NPM
+		sudo npm i -g neovim
+	end &> $output
+end
 
 # Инициализация текста сообщений в зависимости от установленного языка в оболочке
 if test (string match -ri "ru" "$LANG")
@@ -51,15 +68,15 @@ if test (string match -ri "ru" "$LANG")
 			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_INSTALL
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить шрифт "; set_color cyan; echo "FiraCode"; set_color white; echo " ? (y/N) ";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить шрифт "(set_color cyan)"FiraCode"(set_color white)"? (y/N) ";
 			case FONT_INSTALLED
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Установлен шрифт "; set_color cyan; echo "FiraCode"; set_color white; echo " (выбери его в настройках твоего эмулятора терминала)";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Установлен шрифт "(set_color cyan)"FiraCode"(set_color white)" (выбери его в настройках твоего эмулятора терминала)";
 			case FONTS
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color magenta; echo -n "[ДАННЫЕ] "; set_color white; echo "Шрифты для GNOME эмулятора терминала: https://www.nerdfonts.com/font-downloads (моя рекомендация - "; set_color cyan; echo "FiraCode"; set_color white; echo ")";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color magenta; echo -n "[ДАННЫЕ] "; set_color white; echo "Шрифты для GNOME эмулятора терминала: https://www.nerdfonts.com/font-downloads (моя рекомендация - "(set_color cyan)"FiraCode"(set_color white)")";
 			case FONT_PATCH
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Пропатчить шрифт для иконок ? (\"nvim-tree/nvim-web-devicons\") (y/N) ";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; 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 blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Выбери шрифт (путь) ";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; 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
@@ -90,9 +107,9 @@ else
 			case LSP_CSSMODULES_INSTALLED
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Install the LSP-server for CSS (formatter) (\"antonk52/cssmodules-language-server\")";
 			case LSP_DENO_INSTALL
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install the LSP-server for JavaScript и PostScript? (\"denoland/deno\") (y/N) ";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install the LSP-server for JavaScript and PostScript? (\"denoland/deno\") (y/N) ";
 			case LSP_DENO_INSTALLED
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Installed the LSP-server for JavaScript и PostScript (\"denoland/deno\")";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Installed the LSP-server for JavaScript and PostScript (\"denoland/deno\")";
 			case LSP_LUA_INSTALL
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install the LSP-server for Lua? (\"luals/lua-language-server\") (y/N) ";
 			case LSP_LUA_INSTALLED
@@ -106,117 +123,145 @@ else
 			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_INSTALL
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install "; set_color cyan; echo "FiraCode"; set_color white; echo " font ? (y/N) ";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install "(set_color cyan)"FiraCode"(set_color white)" font? (y/N) ";
 			case FONT_INSTALLED
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Installed "; set_color cyan; echo "FiraCode"; set_color white; echo " font (select it in your terminal emulator settings)";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Installed "(set_color cyan)"FiraCode"(set_color white)" font (select it in your terminal emulator settings)";
 			case FONTS
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color magenta; echo -n "[INFO] "; set_color white; echo "Fonts for GNOME terminal emulator: https://www.nerdfonts.com/font-downloads (my recommendation - "; set_color cyan; echo "FiraCode"; set_color white; echo ")";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color magenta; echo -n "[INFO] "; set_color white; echo "Fonts for GNOME terminal emulator: https://www.nerdfonts.com/font-downloads (my recommendation - "(set_color cyan)"FiraCode"(set_color white)") ";
 			case FONT_PATCH
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Patch your font for icons ? (\"nvim-tree/nvim-web-devicons\") (y/N) ";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; 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 blue; echo -n "[TASK] "; set_color white; echo "Choose a font (path)";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Path to the font";
 			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
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print PACKER_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print PACKER_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	if test -d ~/.local/share/nvim/site/pack/packer/start/packer.nvim
 		# Найден репозиторий "wbthomason/packer.nvim"
 
+		if not set -q _flag_force
 			# Installation request
 			set RESPONSE (read -n 1 -p "print PACKER_EXISTS")
 			bind -e y
+		end
 
-		if test (string match -ri 'y' "$RESPONSE")
+		if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 			# Запрошена переустановка
 
+			begin 
 				# Деинициализация старого репозитория
-			rm -rf ~/.local/share/nvim/site/pack/packer/start/packer.nvim 1> /dev/null 2> /dev/null 
+				rm -rf ~/.local/share/nvim/site/pack/packer/start/packer.nvim 
 
 				# Инициализация репозитория
 				git clone --depth 1 https://github.com/wbthomason/packer.nvim\
-				~/.local/share/nvim/site/pack/packer/start/packer.nvim 1> /dev/null 2> /dev/null 
+					~/.local/share/nvim/site/pack/packer/start/packer.nvim 
+			end &> $output
 
 			print PACKER_INSTALLED
 		end
 	else 
 		# Не найден репозиторий "wbthomason/packer.nvim" 
 
+		begin
 			# Инициализация репозитория
 			git clone --depth 1 https://github.com/wbthomason/packer.nvim\
-		 ~/.local/share/nvim/site/pack/packer/start/packer.nvim 1> /dev/null 2> /dev/null 
+				~/.local/share/nvim/site/pack/packer/start/packer.nvim 
+		end &> $output
 
 		print PACKER_INSTALLED
 	end
 end
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print LSP_INTELEPHENSE_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print LSP_INTELEPHENSE_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "bmewburn/vscode-intelephense"
 
+	begin
 		# Установка
-	npm i intelephense 1> /dev/null 2> /dev/null 
+		sudo npm i -g intelephense
+	end &> $output
 
 	print LSP_INTELEPHENSE_INSTALLED
 end
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print LSP_VSCODE-LANGSERVERS_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print LSP_VSCODE-LANGSERVERS_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "hrsh7th/vscode-langservers-extracted"
 
+	begin
 		# Установка
-	npm i vscode-langservers-extracted 1> /dev/null 2> /dev/null 
+		sudo npm i -g vscode-langservers-extracted
+	end &> $output
 
 	print LSP_VSCODE-LANGSERVERS_INSTALLED
 end
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print LSP_EMMET_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print LSP_EMMET_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "aca/emmet-ls"
 
+	begin
 		# Установка
-	npm i emmet-ls 1> /dev/null 2> /dev/null 
+		sudo npm i -g emmet-ls
+	end &> $output
 
 	print LSP_EMMET_INSTALLED
 end
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print LSP_CSSMODULES_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print LSP_CSSMODULES_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "antonk52/cssmodules-language-server"
 
+	begin
 		# Установка
-	npm i cssmodules-language-server 1> /dev/null 2> /dev/null 
+		sudo npm i -g cssmodules-language-server
+	end &> $output
 
 	print LSP_CSSMODULES_INSTALLED
 end
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print LSP_DENO_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print LSP_DENO_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "denoland/deno"
 
+	begin
 		# Установка
-	curl -fsSL https://deno.land/install.sh | sh 1> /dev/null 2> /dev/null 
+		curl -fsSL https://deno.land/install.sh | sh 
+	end &> $output
 
 	# TODO доделать нормально
 	set -g DENO_INSTALL "$HOME/.deno"
@@ -225,71 +270,90 @@ if test (string match -ri 'y' "$RESPONSE")
 	print LSP_DENO_INSTALLED
 end
 
-# Installation request
-set RESPONSE (read -n 1 -p "print LSP_LUA_INSTALL")GG
-bind -e y
 
-if test (string match -ri 'y' "$RESPONSE")
+if not set -q _flag_force
+	# Installation request
+	set RESPONSE (read -n 1 -p "print LSP_LUA_INSTALL")
+	bind -e y
+end
+
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "luals/lua-language-server"
 
+	begin
 		# Установка
 		sudo apt install ninja-build -y
 		cd ~/
-	rm -rf lua-language-server 1> /dev/null 2> /dev/null
+		rm -rf lua-language-server
-	git clone https://github.com/LuaLS/lua-language-server 1> /dev/null 2> /dev/null 
+		git clone https://github.com/LuaLS/lua-language-server 
 		cd lua-language-server
-	fish ./make.sh 1> /dev/null 2> /dev/null 
+		fish ./make.sh 
- 	fish_add_path $HOME/lua-language-server/bin 1> /dev/null 2> /dev/null 
+		fish_add_path $HOME/lua-language-server/bin 
+	end &> $output
 
 	print LSP_LUA_INSTALLED
 end
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print FORMATTER_NGINX_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print FORMATTER_NGINX_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "vasilevich/nginxbeautifier"
 
+	begin
 		# Установка
-	npm i nginxbeautifier 1> /dev/null 2> /dev/null 
+		sudo npm i -g nginxbeautifier
+	end &> $output
 
 	print FORMATTER_NGINX_INSTALLED
 end
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print FORMATTER_PRETTIER_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print FORMATTER_PRETTIER_INSTALL")
+	bind -e y
+end
 
-if test (string match -ri 'y' "$RESPONSE")
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Accepted installation of "prettier/vim-prettier"
 
-	npm i prettier 1> /dev/null 2> /dev/null
+	begin
-G
+		npm i prettier
+		sudo npm i -g prettier
+	end &> $output
+
 	print FORMATTER_PRETTIER_INSTALLED
 end
 
 print FONTS
 
-# Installation request
+if not set -q _flag_force
-set RESPONSE (read -n 1 -p "print FONT_INSTALL")
+	# Installation request
-bind -e y
+	set RESPONSE (read -n 1 -p "print FONT_INSTALL")
-if test (string match -ri 'y' "$RESPONSE")
+	bind -e y
+end
+
+if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 	# Accepted installation of the FiraCode font
 	
+	begin
 		mkdir -p ~/.local/share/fonts/FiraCode
 		cd ~/.local/share/fonts/FiraCode
 		wget "https://github.com/ryanoasis/nerd-fonts/releases/download/v3.1.1/FiraCode.zip"
-	unzip FiraCode.zip
+		unzip -o FiraCode.zip
 		rm FiraCode.zip
 		fc-cache -f -v
+	end &> $output
 
 	print FONT_INSTALLED
 
-	if (type -q dconf)
+	if type -q dconf
 		# GNOME
 
-		# if (string match (lsb_release -i | grep -Po '[^\s]*$') Ubuntu))
+		# if (set -q _flag_force or string match (lsb_release -i | grep -Po '[^\s]*$') Ubuntu))
 		# 	sudo apt-get install dconf
 		# end
 	end
@@ -300,16 +364,19 @@ if test (string match -ri 'y' "$RESPONSE")
 else
 	# Denied installation of the FiraCode font
 	
+	if not set -q _flag_force
 		# Installation request
 		set RESPONSE (read -n 1 -p "print FONT_PATCH")
 		bind -e y
+	end
 
-	if test (string match -ri 'y' "$RESPONSE")
+	if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 		# Accepted to patching the font
 
+		begin
 			cd ~/
 			wget "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/FontPatcher.zip"
-		unzip FontPatcher.zip -d font_patcher
+			unzip -o FontPatcher.zip -d font_patcher
 			cd font_patcher
 
 			#if not type -q python && type -q python3
@@ -320,7 +387,14 @@ else
 
 			sudo apt install fontforge python3-fontforge -y
 
-		./font-patcher (read -p "print FONT_CHOOSE")
+		end &> $output
+	
+		# Initializing path to the font
+		set FONT (read -p "print FONT_CHOOSE")
+
+		begin
+			./font-patcher $FONT
+		end &> $output
 
 		print FONT_PATCHED
 	end

lua/keymaps/functions.lua

@@ -0,0 +1,2 @@
+-- Quick compilation with GCC and running
+vim.keymap.set('n', 'co', '<cmd>:!gcc -o test % && ./test', {noremap = true})

lua/keymaps/plugins.lua

@@ -30,6 +30,7 @@ vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, { noremap = true, sil
 lspconfig_on_attach = function(client, bufnr)
 	-- Активация завершения
 	vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+	-- vim.keymap.set({ 'n', 'v', 't' }, 'F', function() vim.lsp.buf.format { async = true } end, { noremap = true, silent = true, buffer = bufnr })
 
 	vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true, silent = true, buffer = bufnr })
 	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true, silent = true, buffer = bufnr })
@@ -54,19 +55,18 @@ vim.keymap.set({ 'n', 'v', 't' }, 'F', function()
 			vim.api.nvim_exec('w', false)
 			vim.api.nvim_exec('! nginxbeautifier -i %', false)
 			vim.api.nvim_exec('redraw', false)
-		elseif (vim.lsp.buf.server_ready()) then
+		elseif (not (vim.diff(vim.inspect(vim.lsp.buf_get_clients()), '{}') == '')) then
-			-- LSP-server is ready
+			-- LSP-server clients is ready
 
 			vim.lsp.buf.format { async = true }
 		else
-			-- LSP-server not found
+			-- LSP-server clients not found
 
 			vim.api.nvim_exec('PrettierAsync', false)
 		end
 	end,
 	{ noremap = true, silent = true, buffer = bufnr })
 
-
 --[[ lewis6991/gitsigns.nvim ]]
 -- Инициализация только после того, как LSP-сервер подключится к текущему буферу
 gitsigns_on_attach = function(bufnr)

lua/plugins/packer.lua

@@ -71,7 +71,7 @@ return require('packer').startup(function(use)
 	-- Интерфейс строки буфера файлов
 	use {
 		'akinsho/bufferline.nvim',
-		tag = "v3.*",
+		-- tag = "v3.*",
 		requires = 'nvim-tree/nvim-web-devicons',
 		config = function() require('plugins/bufferline') end
 	}
@@ -79,7 +79,7 @@ return require('packer').startup(function(use)
 	-- Интерфейс древовидной структуры файлов
 	use {
 		'nvim-neo-tree/neo-tree.nvim',
-		branch   = 'v2.x',
+		-- branch   = 'v2.x',
 		requires = {
 			'nvim-lua/plenary.nvim',
 			'kyazdani42/nvim-web-devicons',
@@ -137,7 +137,7 @@ return require('packer').startup(function(use)
 	-- Интерфейс для поиска
 	use {
 		'nvim-telescope/telescope.nvim',
-		tag = '0.1.1',
+		-- tag = '0.1.1',
 		config = function() require('plugins/telescope') end
 	}
 
@@ -181,6 +181,8 @@ return require('packer').startup(function(use)
 	-- Форматировщик Prettier
   use {
       'prettier/vim-prettier',
+			branch = 'master',
+			-- run = 'sudo npm i -g',
       run = 'yarn install --frozen-lockfile --production'
   }
 end)

lua/settings/system.lua

@@ -5,7 +5,7 @@ vim.opt.clipboard = 'unnamedplus'
 --vim.opt.completeopt = 'menuone,noselect'
 
 -- Не автокомментировать новые линии при переходе на новую строку
---vim.cmd('autocmd BufEnter * set fo-=c fo-=r fo-=o')
+vim.cmd('autocmd BufEnter * set fo-=c fo-=r fo-=o')
 
 -- Нумерация строк
 vim.opt.number = true
@@ -26,7 +26,9 @@ vim.opt_local.wrap = true
 vim.opt_local.cursorcolumn = true
 
 -- Выбор цветовой темы
-vim.cmd.colorscheme('default')
+-- vim.cmd.colorscheme('default')
+-- vim.cmd.colorscheme('koehler')
+vim.cmd.colorscheme('vim')
 
 -- Добавление ru_RU (переключать через <c-^>)
 vim.opt.keymap = 'russian-jcukenwin'