Перевёл dotfiles на stow

47 files changed, 77 insertions, 11 deletions

diff --git a/nvim/.editorconfig b/config/nvim/.editorconfig
index 2e6feec..2e6feec 100644
--- a/nvim/.editorconfig
+++ b/config/nvim/.editorconfig
diff --git a/nvim/.gitignore b/config/nvim/.gitignore
index 67dcbc2..67dcbc2 100644
--- a/nvim/.gitignore
+++ b/config/nvim/.gitignore
diff --git a/config/nvim/Session.vim b/config/nvim/Session.vim
new file mode 100644
index 0000000..510124f
--- /dev/null
+++ b/config/nvim/Session.vim
@@ -0,0 +1,54 @@
+let SessionLoad = 1
+let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1
+let v:this_session=expand("<sfile>:p")
+silent only
+silent tabonly
+cd ~/projects/dotfiles/nvim
+if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
+  let s:wipebuf = bufnr('%')
+endif
+let s:shortmess_save = &shortmess
+if &shortmess =~ 'A'
+  set shortmess=aoOA
+else
+  set shortmess=aoO
+endif
+badd +6 init.lua
+badd +25 lua/plugins/theme.lua
+badd +1 lua/plugins/tree.lua
+argglobal
+%argdel
+edit lua/plugins/tree.lua
+argglobal
+balt lua/plugins/theme.lua
+setlocal fdm=expr
+setlocal fde=nvim_treesitter#foldexpr()
+setlocal fmr={{{,}}}
+setlocal fdi=#
+setlocal fdl=6
+setlocal fml=1
+setlocal fdn=20
+setlocal fen
+let s:l = 1 - ((0 * winheight(0) + 22) / 44)
+if s:l < 1 | let s:l = 1 | endif
+keepjumps exe s:l
+normal! zt
+keepjumps 1
+normal! 0
+tabnext 1
+if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
+  silent exe 'bwipe ' . s:wipebuf
+endif
+unlet! s:wipebuf
+set winheight=1 winwidth=20
+let &shortmess = s:shortmess_save
+let s:sx = expand("<sfile>:p:r")."x.vim"
+if filereadable(s:sx)
+  exe "source " . fnameescape(s:sx)
+endif
+let &g:so = s:so_save | let &g:siso = s:siso_save
+set hlsearch
+nohlsearch
+doautoall SessionLoadPost
+unlet SessionLoad
+" vim: set ft=vim :
diff --git a/nvim/colors/neonxp.lua b/config/nvim/colors/neonxp.lua
index 1d7ab9f..1d7ab9f 100644
--- a/nvim/colors/neonxp.lua
+++ b/config/nvim/colors/neonxp.lua
diff --git a/nvim/init.lua b/config/nvim/init.lua
index e495d97..f6fd4ab 100644
--- a/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -35,3 +35,4 @@ require("autocommands")
 require("lsp")
 require("syntax")
 -- require("dap")
+vim.cmd [[colorscheme nightfly]]
diff --git a/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index d0ab947..6b58a8b 100644
--- a/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -3,7 +3,7 @@
   "auto-save.nvim": { "branch": "main", "commit": "37c82fd548e3f5ffc2d9d020a65dac1044584f44" },
   "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
   "codecompanion.nvim": { "branch": "main", "commit": "9edf22cb71711cd7fab7671a25ed5424011a379d" },
-  "conform.nvim": { "branch": "master", "commit": "f643d1b51d1d3d14c8641a46ce44f6bce73c2697" },
+  "conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "go.nvim": { "branch": "master", "commit": "a3455f48cff718a86275115523dcc735535a13aa" },
   "goerr-nvim": { "branch": "main", "commit": "d30ba1cab652e78dbf6a644eb4823be57e9af203" },
@@ -15,10 +15,11 @@
   "lsp_signature.nvim": { "branch": "master", "commit": "a4e3c15dfdce8783c074539b1835edae75fa63d5" },
   "lspsaga.nvim": { "branch": "main", "commit": "920b1253e1a26732e53fac78412f6da7f674671d" },
   "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
-  "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
+  "nightfly": { "branch": "master", "commit": "8c55003e89f321a48a8cd4bb426dd3e7c58f0646" },
+  "nvim-dap": { "branch": "master", "commit": "ea82027c3447dc1a022be9a9884de276c05cd33a" },
   "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
   "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" },
+  "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
diff --git a/nvim/lua/autocommands.lua b/config/nvim/lua/autocommands.lua
index 802d9e9..802d9e9 100644
--- a/nvim/lua/autocommands.lua
+++ b/config/nvim/lua/autocommands.lua
diff --git a/nvim/lua/commands.lua b/config/nvim/lua/commands.lua
index 8a987b0..8a987b0 100644
--- a/nvim/lua/commands.lua
+++ b/config/nvim/lua/commands.lua
diff --git a/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index 76919a8..76919a8 100644
--- a/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
diff --git a/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua
index f12ecae..f12ecae 100644
--- a/nvim/lua/lsp.lua
+++ b/config/nvim/lua/lsp.lua
diff --git a/nvim/lua/myplugins/resize.lua b/config/nvim/lua/myplugins/resize.lua
index 8af6c3b..8af6c3b 100644
--- a/nvim/lua/myplugins/resize.lua
+++ b/config/nvim/lua/myplugins/resize.lua
diff --git a/nvim/lua/options.lua b/config/nvim/lua/options.lua
index a0b7dbb..8d55306 100644
--- a/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -62,4 +62,7 @@ vim.filetype.add({
 		[".*/todo.txt"] = "todotxt",
 	},
 })
-vim.cmd([[colorscheme neonxp]])
+
+vim.g.nightflyCursorColor = true
+vim.g.nightflyVirtualTextColor = true
+vim.g.nightflyTransparent = true
diff --git a/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 4ef30d4..0e9701d 100644
--- a/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -1,4 +1,5 @@
 require("lazy").setup({
+	{ "bluz71/vim-nightfly-colors", name = "nightfly", lazy = false, priority = 1000 },
 	{ "nvim-lua/plenary.nvim" },
 	{
 		"ray-x/guihua.lua",
diff --git a/nvim/lua/plugins/autosave.lua b/config/nvim/lua/plugins/autosave.lua
index 069afbf..069afbf 100644
--- a/nvim/lua/plugins/autosave.lua
+++ b/config/nvim/lua/plugins/autosave.lua
diff --git a/nvim/lua/plugins/blankline.lua b/config/nvim/lua/plugins/blankline.lua
index b74d9e6..b74d9e6 100644
--- a/nvim/lua/plugins/blankline.lua
+++ b/config/nvim/lua/plugins/blankline.lua
diff --git a/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/cmp.lua
index 43d911a..718d8cb 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/config/nvim/lua/plugins/cmp.lua
@@ -37,8 +37,14 @@ return {
 			},
 		},
 		cmdline = {
-			keymap = { preset = "inherit" },
-			completion = { menu = { auto_show = true } },
+			keymap = {
+				preset = "inherit",
+				['<Tab>'] = { 'show', 'accept' },
+			},
+			completion = {
+				menu = { auto_show = false },
+				ghost_text = { enabled = true },
+			},
 			sources = { "cmdline" },
 		},
 		snippets = { preset = "luasnip" },
diff --git a/nvim/lua/plugins/columns.lua b/config/nvim/lua/plugins/columns.lua
index 40806e2..40806e2 100644
--- a/nvim/lua/plugins/columns.lua
+++ b/config/nvim/lua/plugins/columns.lua
diff --git a/nvim/lua/plugins/conform.lua b/config/nvim/lua/plugins/conform.lua
index 3204d2d..3204d2d 100644
--- a/nvim/lua/plugins/conform.lua
+++ b/config/nvim/lua/plugins/conform.lua
diff --git a/nvim/lua/plugins/dap.lua b/config/nvim/lua/plugins/dap.lua
index ab44a1e..ab44a1e 100644
--- a/nvim/lua/plugins/dap.lua
+++ b/config/nvim/lua/plugins/dap.lua
diff --git a/nvim/lua/plugins/dap_go.lua b/config/nvim/lua/plugins/dap_go.lua
index 705fab7..705fab7 100644
--- a/nvim/lua/plugins/dap_go.lua
+++ b/config/nvim/lua/plugins/dap_go.lua
diff --git a/nvim/lua/plugins/dapui.lua b/config/nvim/lua/plugins/dapui.lua
index 5d35e1e..5d35e1e 100644
--- a/nvim/lua/plugins/dapui.lua
+++ b/config/nvim/lua/plugins/dapui.lua
diff --git a/nvim/lua/plugins/go.lua b/config/nvim/lua/plugins/go.lua
index 1078297..1078297 100644
--- a/nvim/lua/plugins/go.lua
+++ b/config/nvim/lua/plugins/go.lua
diff --git a/nvim/lua/plugins/goimpl.lua b/config/nvim/lua/plugins/goimpl.lua
index 0b906fa..0b906fa 100644
--- a/nvim/lua/plugins/goimpl.lua
+++ b/config/nvim/lua/plugins/goimpl.lua
diff --git a/nvim/lua/plugins/headlines.lua b/config/nvim/lua/plugins/headlines.lua
index 5d92245..5d92245 100644
--- a/nvim/lua/plugins/headlines.lua
+++ b/config/nvim/lua/plugins/headlines.lua
diff --git a/nvim/lua/plugins/lsp_saga.lua b/config/nvim/lua/plugins/lsp_saga.lua
index ab8177f..ab8177f 100644
--- a/nvim/lua/plugins/lsp_saga.lua
+++ b/config/nvim/lua/plugins/lsp_saga.lua
diff --git a/nvim/lua/plugins/lsp_signature.lua b/config/nvim/lua/plugins/lsp_signature.lua
index b9add0b..b9add0b 100644
--- a/nvim/lua/plugins/lsp_signature.lua
+++ b/config/nvim/lua/plugins/lsp_signature.lua
diff --git a/nvim/lua/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua
index c35b162..920e729 100644
--- a/nvim/lua/plugins/lualine.lua
+++ b/config/nvim/lua/plugins/lualine.lua
@@ -4,7 +4,7 @@ return {
 	opts = {
 		options = {
 			icons_enabled = true,
-			theme = "auto",
+			theme = "nightfly",
 			component_separators = { left = "", right = "" },
 			section_separators = { left = "", right = "" },
 			disabled_filetypes = {
diff --git a/nvim/lua/plugins/resize.lua b/config/nvim/lua/plugins/resize.lua
index f0c6175..7e22517 100644
--- a/nvim/lua/plugins/resize.lua
+++ b/config/nvim/lua/plugins/resize.lua
@@ -3,28 +3,28 @@ return {
 	dir = "~/.config/nvim/lua/myplugins",
 	keys = {
 		{
-			"<C-S-Left>",
+			"<C-A-Left>",
 			function()
 				require("myplugins.resize").ResizeLeft()
 			end,
 			silent = true,
 		},
 		{
-			"<C-S-Right>",
+			"<C-A-Right>",
 			function()
 				require("myplugins.resize").ResizeRight()
 			end,
 			silent = true,
 		},
 		{
-			"<C-S-Up>",
+			"<C-A-Up>",
 			function()
 				require("myplugins.resize").ResizeUp()
 			end,
 			silent = true,
 		},
 		{
-			"<C-S-Down>",
+			"<C-A-Down>",
 			function()
 				require("myplugins.resize").ResizeDown()
 			end,
diff --git a/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
index aabcd9c..aabcd9c 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
diff --git a/nvim/lua/plugins/todo.lua b/config/nvim/lua/plugins/todo.lua
index ee672ab..ee672ab 100644
--- a/nvim/lua/plugins/todo.lua
+++ b/config/nvim/lua/plugins/todo.lua
diff --git a/nvim/lua/plugins/tree.lua b/config/nvim/lua/plugins/tree.lua
index 3bf9eed..3bf9eed 100644
--- a/nvim/lua/plugins/tree.lua
+++ b/config/nvim/lua/plugins/tree.lua
diff --git a/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua
index 59e9294..59e9294 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/config/nvim/lua/plugins/treesitter.lua
diff --git a/nvim/lua/syntax/hjson.lua b/config/nvim/lua/syntax/hjson.lua
index a2e01ed..a2e01ed 100644
--- a/nvim/lua/syntax/hjson.lua
+++ b/config/nvim/lua/syntax/hjson.lua
diff --git a/nvim/lua/syntax/init.lua b/config/nvim/lua/syntax/init.lua
index d9f4dcb..d9f4dcb 100644
--- a/nvim/lua/syntax/init.lua
+++ b/config/nvim/lua/syntax/init.lua
diff --git a/nvim/lua/theme/asset/hsv-to-rgb.lua b/config/nvim/lua/theme/asset/hsv-to-rgb.lua
index 5a63f98..5a63f98 100644
--- a/nvim/lua/theme/asset/hsv-to-rgb.lua
+++ b/config/nvim/lua/theme/asset/hsv-to-rgb.lua
diff --git a/nvim/lua/theme/colors.lua b/config/nvim/lua/theme/colors.lua
index 6197328..6197328 100644
--- a/nvim/lua/theme/colors.lua
+++ b/config/nvim/lua/theme/colors.lua
diff --git a/nvim/lua/theme/modifiers.lua b/config/nvim/lua/theme/modifiers.lua
index 5f5b853..5f5b853 100644
--- a/nvim/lua/theme/modifiers.lua
+++ b/config/nvim/lua/theme/modifiers.lua
diff --git a/nvim/snippets/go.json b/config/nvim/snippets/go.json
index 353f79a..353f79a 100644
--- a/nvim/snippets/go.json
+++ b/config/nvim/snippets/go.json
diff --git a/nvim/snippets/package.json b/config/nvim/snippets/package.json
index 7c7e94a..7c7e94a 100644
--- a/nvim/snippets/package.json
+++ b/config/nvim/snippets/package.json
diff --git a/nvim/spell/en.utf-8.add b/config/nvim/spell/en.utf-8.add
index 98afcae..98afcae 100644
--- a/nvim/spell/en.utf-8.add
+++ b/config/nvim/spell/en.utf-8.add
diff --git a/nvim/spell/en.utf-8.add.spl b/config/nvim/spell/en.utf-8.add.spl
index 1fe94cc..1fe94cc 100644
--- a/nvim/spell/en.utf-8.add.spl
+++ b/config/nvim/spell/en.utf-8.add.spl
diff --git a/nvim/spell/ru.cp1251.spl b/config/nvim/spell/ru.cp1251.spl
index 5720ab0..5720ab0 100644
--- a/nvim/spell/ru.cp1251.spl
+++ b/config/nvim/spell/ru.cp1251.spl
diff --git a/nvim/spell/ru.cp1251.sug b/config/nvim/spell/ru.cp1251.sug
index 60f8823..60f8823 100644
--- a/nvim/spell/ru.cp1251.sug
+++ b/config/nvim/spell/ru.cp1251.sug
diff --git a/nvim/spell/ru.koi8-r.spl b/config/nvim/spell/ru.koi8-r.spl
index e503020..e503020 100644
--- a/nvim/spell/ru.koi8-r.spl
+++ b/config/nvim/spell/ru.koi8-r.spl
diff --git a/nvim/spell/ru.koi8-r.sug b/config/nvim/spell/ru.koi8-r.sug
index bdb7abe..bdb7abe 100644
--- a/nvim/spell/ru.koi8-r.sug
+++ b/config/nvim/spell/ru.koi8-r.sug
diff --git a/nvim/spell/ru.utf-8.spl b/config/nvim/spell/ru.utf-8.spl
index 96e7592..96e7592 100644
--- a/nvim/spell/ru.utf-8.spl
+++ b/config/nvim/spell/ru.utf-8.spl
diff --git a/nvim/spell/ru.utf-8.sug b/config/nvim/spell/ru.utf-8.sug
index ba5a361..ba5a361 100644
--- a/nvim/spell/ru.utf-8.sug
+++ b/config/nvim/spell/ru.utf-8.sug