fix new update

2024-03-23 10:05:10 +03:00 · 2024-03-23 10:05:10 +03:00 · 8ec0e505bb
commit 8ec0e505bb
parent 2da7dd1d82
13 changed files with 103 additions and 88 deletions
--- a/configs/bspwm/themes/Chad
+++ b/configs/bspwm/themes/Chad
--- a/configs/bspwm/themes/Chad
+++ b/configs/bspwm/themes/Chad
@ -1,4 +1,4 @@
-background = /usr/share/backgrounds/chad.png
+background = /home/chatlanin/wallpapers/43.png
 theme = Qogir-dark
 icons = Qogir-dark
 cursor = ManjaTrix
--- a/configs/lazygit/state.yml
+++ b/configs/lazygit/state.yml
@ -1,6 +1,8 @@
 lastupdatecheck: 0
 recentrepos:
    - /mnt/raid/projects/tarch_os/repos/tarch-configs
+    - /mnt/raid/projects/algorithms
+    - /mnt/raid/projects/tarch_os/repos/tarch-themes
    - /mnt/raid/projects/tarch_os/repos/tarch-misc
    - /mnt/raid/projects/tarch_os/repos/tarch-bin
    - /mnt/raid/projects/tarch_os/repos/tarch-fonts
--- a/configs/nvim/lazy-lock.json
+++ b/configs/nvim/lazy-lock.json
@ -11,38 +11,39 @@
  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
+  "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
  "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
  "hop.nvim": { "branch": "master", "commit": "6d853addd6e11df8338b26e869a29b36f2c3e893" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
-  "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
+  "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" },
  "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" },
  "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
-  "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" },
-  "none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" },
+  "neoscroll.nvim": { "branch": "master", "commit": "21d52973bde32db998fc8b6590f87eb3c3c6d8e4" },
+  "none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" },
  "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "a9f191d5ba27a5943b8992bf618858fa7374758f" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "ab5ac73b065f5879b1405900b6b8633191525f51" },
  "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "16295b79410f131c4fa7870c663b4ace6a761fb2" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8c1831817d40925d22cd8a555296c44c02fdaaf5" },
  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
  "nvim-pasta": { "branch": "main", "commit": "b9fdc3f24c6cc47beb3e02069a3fae7fdaab4f77" },
-  "nvim-tree.lua": { "branch": "master", "commit": "041dbd18f440207ad161503a384e7c82d575db66" },
-  "nvim-treesitter": { "branch": "master", "commit": "7ff51f53b0efb6228df2e8539b51bb2e737b77f3" },
+  "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" },
+  "nvim-treesitter": { "branch": "master", "commit": "2014f8285e306f4c8a896c7d3af53fdd599e5a4f" },
  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
-  "nvim-web-devicons": { "branch": "master", "commit": "75df79feb02d5e0ec114e447453775d4d291ea03" },
+  "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
  "telescope-file-browser.nvim": { "branch": "master", "commit": "8839e3f8070dfafa5b0c0e4652700298e7b872c4" },
  "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" },
  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+  "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
  "vim-auto-save": { "branch": "master", "commit": "2e3e54ea4c0fc946c21b0a4ee4c1c295ba736ee8" },
  "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
  "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" },
-  "vimwiki": { "branch": "dev", "commit": "fde35bb87e45abe930eebef5ab99a16289e53789" },
+  "vimwiki": { "branch": "dev", "commit": "69318e74c88ef7677e2496fd0a836446ceac61e8" },
  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
--- a/configs/nvim/lua/core/mappings.lua
+++ b/configs/nvim/lua/core/mappings.lua
@ -8,7 +8,7 @@ M.load = function()
  kmap("", "<Space>", "<Nop>")

  -- переход к ошибкам
-  kmap("n", "<leader>e", ":lua vim.diagnostic.goto_prev({ border = \"rounded\" })<CR>")
+  kmap("n", "<leader>e", ":lua vim.diagnostic.goto_next({ border = \"rounded\" })<CR>")

  -- сдвиг выделенного блока
  kmap("v", "<", "<gv")
@ -48,14 +48,6 @@ M.load = function()
  -- переключение в tree
  kmap("n", "<leader>n", ":NvimTreeFocus<CR>")

-  -- навигация между окнами TMUX
-  vim.g.tmux_navigator_no_mappings = 1
-  -- noremap <silent> {Previous-Mapping} :<C-U>TmuxNavigatePrevious<cr>
-  kmap("n", "<C-h>", ":<C-U>TmuxNavigateLeft<cr>")
-  kmap("n", "<C-j>", ":<C-U>TmuxNavigateDown<cr>")
-  kmap("n", "<C-k>", ":<C-U>TmuxNavigateUp<cr>")
-  kmap("n", "<C-l>", ":<C-U>TmuxNavigateRight<cr>")
-
  -- kmap("n", "<C-h>", "<C-w>h")
  -- kmap("n", "<C-j>", "<C-w>j")
  -- kmap("n", "<C-k>", "<C-w>k")
@ -83,6 +75,7 @@ M.load = function()
  kmap("n", "<S-l>", ":BufferLineCycleNext<CR>")
  kmap("n", "<S-h>", ":BufferLineCyclePrev<CR>")

+  kmap("n", "<leader>t", ":TermExec cmd=clear go_back=0<CR>")
  -- HELP
  -- f-n - переход в текущей строке к слову начинающемуся на n (поиск вперед)
  -- F-n - переход в текущей строке к слову начинающемуся на n (поиск назад)
--- a/configs/nvim/lua/core/options.lua
+++ b/configs/nvim/lua/core/options.lua
@ -188,7 +188,11 @@ M.load = function()
    concealcursor = "vin",

    wildignorecase = true,
-    viminfo="'1000,f1"
+    viminfo="'1000,f1",
+
+    -- Разделение по умолчанию приведет к скачку ваших основных разделов при открытии боковой панели.
+    -- Чтобы предотвратить это, установите для параметра `splitkeep` значение `screen` или `topline`.
+    splitkeep = "screen"
  }

  -- Когда значение 'verbose' не равно нулю, печатаются сообщения (для отладки в stderr).
--- a/configs/nvim/lua/plugins/configs/alpha.lua
+++ b/configs/nvim/lua/plugins/configs/alpha.lua
@ -80,7 +80,7 @@ return {
        type = "group",
        val = {
          button(".", "  Open current",  ":ene <CR>:NvimTreeFindFileToggle<CR>"),
-          button("u", "  Update",        ":!backup_nvim<CR> | :PackerSync<CR>"),
+          button("u", "  Update",        ":!backup_nvim<CR> | :Lazy<CR>"),
          button("f", "  Find file",     ":Telescope find_files<CR>"),
          button("r", "  Recent File",   ":Telescope oldfiles<CR>"),
          button("w", "  Find Word",     ":Telescope live_grep<CR>"),
--- a/configs/nvim/lua/plugins/configs/lsp/lsp_configs.lua
+++ b/configs/nvim/lua/plugins/configs/lsp/lsp_configs.lua
@ -90,41 +90,11 @@ return {
      on_attach = on_attach,
    })

-    -- configure svelte server
-    lspconfig["svelte"].setup({
-      capabilities = capabilities,
-      on_attach = function(client, bufnr)
-        on_attach(client, bufnr)
-
-        vim.api.nvim_create_autocmd("BufWritePost", {
-          pattern = { "*.js", "*.ts" },
-          callback = function(ctx)
-            if client.name == "svelte" then
-              client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.file })
-            end
-          end,
-        })
-      end,
-    })
-
-    -- configure prisma orm server
-    lspconfig["prismals"].setup({
-      capabilities = capabilities,
-      on_attach = on_attach,
-    })
-
-    -- configure graphql language server
-    lspconfig["graphql"].setup({
-      capabilities = capabilities,
-      on_attach = on_attach,
-      filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
-    })
-
    -- configure emmet language server
    lspconfig["emmet_ls"].setup({
      capabilities = capabilities,
      on_attach = on_attach,
-      filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "svelte" },
+      filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "vue", "js", "tmpl" },
    })

    -- configure python server
@ -138,6 +108,10 @@ return {
      capabilities = capabilities,
      on_attach = on_attach,
    })
+    -- lspconfig["vetur-vls"].setup({
+    --   capabilities = capabilities,
+    --   on_attach = on_attach,
+    -- })

    -- configure lua server (with special settings)
    lspconfig["lua_ls"].setup({
@ -160,13 +134,34 @@ return {
      },
    })

-    -- configure for c#
-    -- нужно установить yay -S omnisharp-roslyn
-    local pid = vim.fn.getpid()
-    local omnisharp_bin = "/usr/bin/OmniSharp"
+    lspconfig["bashls"].setup({
+      capabilities = capabilities,
+      on_attach = on_attach,
+    })

-    lspconfig["omnisharp"].setup{
-      cmd = { omnisharp_bin, "--languageserver" , "--hostPID", tostring(pid) }
-    }
+    lspconfig["cmake"].setup({
+      capabilities = capabilities,
+      on_attach = on_attach,
+    })
+
+    lspconfig["cssmodules_ls"].setup({
+      capabilities = capabilities,
+      on_attach = on_attach,
+    })
+
+    lspconfig["jsonls"].setup({
+      capabilities = capabilities,
+      on_attach = on_attach,
+    })
+
+    lspconfig["vimls"].setup({
+      capabilities = capabilities,
+      on_attach = on_attach,
+    })
+
+    lspconfig["vuels"].setup({
+      capabilities = capabilities,
+      on_attach = on_attach,
+    })
  end,
 }
--- a/configs/nvim/lua/plugins/configs/lsp/mason.lua
+++ b/configs/nvim/lua/plugins/configs/lsp/mason.lua
@ -24,17 +24,20 @@ return {
    mason_lspconfig.setup({
      -- list of servers for mason to install
      ensure_installed = {
-        "tsserver",
        "html",
+        "tsserver",
        "cssls",
        "tailwindcss",
-        "svelte",
-        "lua_ls",
-        "graphql",
        "emmet_ls",
-        "prismals",
        "pyright",
-        "clangd"
+        "clangd",
+        "lua_ls",
+        "bashls",
+        "cmake",
+        "cssmodules_ls",
+        "jsonls",
+        "vimls",
+        "vuels",
      },
      -- auto-install configured servers (with lspconfig)
      automatic_installation = true  -- not the same as ensure_installed
@ -42,12 +45,12 @@ return {

    mason_tool_installer.setup({
      ensure_installed = {
-        "prettier", -- prettier formatter
        "stylua", -- lua formatter
+        "clang-format", -- c++ formatter
+        "prettier", -- prettier formatter
        "isort", -- python formatter
        "black", -- python formatter
        "pylint", -- python linter
-        "eslint_d" -- js linter
      }
    })
  end
--- a/configs/nvim/lua/plugins/configs/lsp/none_ls.lua
+++ b/configs/nvim/lua/plugins/configs/lsp/none_ls.lua
@ -30,23 +30,16 @@ return {
    -- configure null_ls
    null_ls.setup({
      -- add package.json as identifier for root (for typescript monorepos)
-      root_dir = null_ls_utils.root_pattern(".null-ls-root", "Makefile", ".git", "package.json"),
+      root_dir = null_ls_utils.root_pattern(".null-ls-root", "Makefile", ".git", "package.json", "meson.build"),
      -- setup formatters & linters
      sources = {
        --  to disable file types use
        --  "formatting.prettier.with({disabled_filetypes: {}})" (see null-ls docs)
-        formatting.prettier.with({
-          extra_filetypes = { "svelte" },
-        }), -- js/ts formatter
        formatting.stylua, -- lua formatter
        formatting.isort,
        formatting.black,
-        diagnostics.pylint,
-        diagnostics.eslint_d.with({ -- js/ts linter
-          condition = function(utils)
-            return utils.root_has_file({ ".eslintrc.js", ".eslintrc.cjs" }) -- only enable if root has .eslintrc.js or .eslintrc.cjs
-          end,
-        }),
+        formatting.cmake_format,
+        diagnostics.pylint
      },
      -- configure format on save
      on_attach = function(current_client, bufnr)
--- a/configs/nvim/lua/plugins/configs/tmux_navigator.lua
+++ b/configs/nvim/lua/plugins/configs/tmux_navigator.lua
@ -1,7 +0,0 @@
-- tmux плагин перемещения
-- см. core/mappings.lua
-return {
-  "christoomey/vim-tmux-navigator",
-  lazzy = false
-}
-
--- a/configs/nvim/lua/plugins/configs/toggleterm.lua
+++ b/configs/nvim/lua/plugins/configs/toggleterm.lua
@ -0,0 +1,31 @@
+-- терминал
+return {
+  "akinsho/toggleterm.nvim",
+  version = "*",
+  config = function()
+    require("toggleterm").setup{
+      size = function(term)
+        if term.direction == "horizontal" then
+          return 40
+        elseif term.direction == "vertical" then
+          return vim.o.columns * 1.4
+        end
+      end,
+    }
+
+    function _G.set_toggleterm_keymaps()
+      local opts = { buffer = 0 }
+      vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
+      vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
+      vim.keymap.set('t', 'kj', [[<C-\><C-n>]], opts)
+      vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
+      vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
+      vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
+      vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
+      vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
+    end
+
+    vim.cmd('autocmd! TermOpen term://* lua set_toggleterm_keymaps()')
+  end
+}
+
--- a/configs/nvim/lua/plugins/configs/treesitter.lua
+++ b/configs/nvim/lua/plugins/configs/treesitter.lua
@ -12,7 +12,7 @@ return {
        "lua",
        "vim",
        "cpp",
-        "vue",
+        --"vue",
        "cmake",
        "css",
        "html",