transition from specresurs

fonts
2024-06-03 21:53:37 +07:00 · 2024-03-23 21:10:23 +07:00
4 changed files with 83 additions and 31 deletions
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env fish

 # need to rewrite in future
-sudo apt install npm python3-venv ruby-dev -y
+sudo apt install -y npm python3-venv ruby-dev pkg-config
+python3 -m pip install --upgrade pip
+fish_add_path ~/.local/bin
 pip3 install --upgrade pynvim
 sudo gem install neovim

@@ -50,12 +52,18 @@ if test (string match -ri "ru" "$LANG")
        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_INSTALL
+        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)"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)"FiraCode"(set_color white)")";
 			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) ";
+        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 green; 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\")";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Пропатчен шрифт для иконок  (\"nvim-tree/nvim-web-devicons\")";
    end
  end
 else
@@ -99,12 +107,18 @@ else
        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_INSTALL
+        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)"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)"FiraCode"(set_color white)")";
 			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) ";
+        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 green; 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 "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\")";
+        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
@@ -152,7 +166,7 @@ if test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "bmewburn/vscode-intelephense"

 	# Установка
-	npm i intelephense 1> /dev/null 2> /dev/null 
+	sudo npm i -g intelephense 1> /dev/null 2> /dev/null

 	print LSP_INTELEPHENSE_INSTALLED
 end
@@ -165,7 +179,7 @@ if test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "hrsh7th/vscode-langservers-extracted"

 	# Установка
-	npm i vscode-langservers-extracted 1> /dev/null 2> /dev/null 
+	sudo npm i -g vscode-langservers-extracted 1> /dev/null 2> /dev/null

 	print LSP_VSCODE-LANGSERVERS_INSTALLED
 end
@@ -178,7 +192,7 @@ if test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "aca/emmet-ls"

 	# Установка
-	npm i emmet-ls 1> /dev/null 2> /dev/null 
+	sudo npm i -g emmet-ls 1> /dev/null 2> /dev/null

 	print LSP_EMMET_INSTALLED
 end
@@ -191,7 +205,7 @@ if test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "antonk52/cssmodules-language-server"

 	# Установка
-	npm i cssmodules-language-server 1> /dev/null 2> /dev/null 
+	sudo npm i -g cssmodules-language-server 1> /dev/null 2> /dev/null

 	print LSP_CSSMODULES_INSTALLED
 end
@@ -240,7 +254,7 @@ if test (string match -ri 'y' "$RESPONSE")
 	# Запрошена установка "vasilevich/nginxbeautifier"

 	# Установка
-	npm i nginxbeautifier 1> /dev/null 2> /dev/null 
+	sudo npm i -g nginxbeautifier 1> /dev/null 2> /dev/null

 	print FORMATTER_NGINX_INSTALLED
 end
@@ -253,31 +267,64 @@ if test (string match -ri 'y' "$RESPONSE")
 	# Accepted installation of "prettier/vim-prettier"

 	npm i prettier 1> /dev/null 2> /dev/null
-G
+	sudo npm i -g prettier 1> /dev/null 2> /dev/null
+
 	print FORMATTER_PRETTIER_INSTALLED
 end

+print FONTS
+
 # Installation request
-set RESPONSE (read -n 1 -p "print FONT_PATCH")
+set RESPONSE (read -n 1 -p "print FONT_INSTALL")
 bind -e y
-
 if test (string match -ri 'y' "$RESPONSE")
-	# Accepted to patching the font
+	# Accepted installation of the FiraCode font
+	
+	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
+	rm FiraCode.zip
+	fc-cache -f -v

-	cd ~/
-	wget https://github.com/ryanoasis/nerd-fonts/releases/latest/download/FontPatcher.zip
-	unzip FontPatcher.zip -d font_patcher
-	cd font_patcher
+	print FONT_INSTALLED

-	#if not type -q python && type -q python3
-	if not type -q python
-		# alias python=python3
-		sudo apt install python-is-python3 -y
+	if type -q dconf
+		# GNOME
+
+		# if (string match (lsb_release -i | grep -Po '[^\s]*$') Ubuntu))
+		# 	sudo apt-get install dconf
+		# end
 	end

-	sudo apt install fontforge python3-fontforge -y
+	# dconf write /apps/gnome-terminal/profiles/Default/font FiraCodeNerdFontMono-Medium.ttf
+	# gconftool-2 --set /apps/gnome-terminal/profiles/Default/use_system_font --type=boolean false
+	# gconftool-2 --set /apps/gnome-terminal/profiles/Default/font --type string FiraCodeNerdFontMono-Medium.ttf
+else
+	# Denied installation of the FiraCode font
+	
+	# Installation request
+	set RESPONSE (read -n 1 -p "print FONT_PATCH")
+	bind -e y

-	./font-patcher (read -p "print FONT_CHOOSE")
+	if test (string match -ri 'y' "$RESPONSE")
+		# Accepted to patching the font

-	print FONT_PATCHED
+		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
 end
--- a/lua/keymaps/plugins.lua
+++ b/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 })
--- a/lua/plugins/packer.lua
+++ b/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)
--- a/lua/settings/system.lua
+++ b/lua/settings/system.lua
@@ -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'
Author	SHA1	Message	Date
Arsen Mirzaev Tatyano-Muradovich	68c1b808d4	transition from specresurs	2024-06-03 21:53:37 +07:00
Arsen Mirzaev Tatyano-Muradovich	45eefc9403	fonts	2024-03-23 21:10:23 +07:00