Skip to content

Commit

Permalink
fix: some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Edmond Avetisyan authored and Edmond Avetisyan committed May 22, 2023
1 parent facf217 commit 70ba6ef
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 39 deletions.
8 changes: 8 additions & 0 deletions nvim/after/plugin/treesitter.rc.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,23 @@ ts.setup {
"fish",
"php",
"json",
"markdown",
"markdown_inline",
"yaml",
"swift",
"css",
"html",
"lua",
"typescript",
},
autotag = {
enable = true,
},
context_commentstring = {
enable = true,
enable_autocmd = false,
}

}

local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
Expand Down
2 changes: 1 addition & 1 deletion nvim/plugin/lspconfig.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ nvim_lsp.sourcekit.setup {
capabilities = capabilities,
}

nvim_lsp.sumneko_lua.setup {
nvim_lsp.lua_ls.setup {
capabilities = capabilities,
on_attach = function(client, bufnr)
on_attach(client, bufnr)
Expand Down
16 changes: 7 additions & 9 deletions nvim/plugin/lspsaga.rc.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,22 @@ saga.setup({
colors = {
normal_bg = '#002b36'
}
},
symbol_in_winbar = {
enable = false
}
})

local diagnostic = require("lspsaga.diagnostic")
local opts = { noremap = true, silent = true }
vim.keymap.set('n', '<C-j>', diagnostic.goto_next, opts)
vim.keymap.set('n', 'gl', diagnostic.show_diagnostics, opts)
vim.keymap.set('n', '<C-j>', '<Cmd>Lspsaga diagnostic_jump_next<CR>', opts)
vim.keymap.set('n', 'gl', '<Cmd>Lspsaga show_line_diagnostics<CR>', opts)
vim.keymap.set('n', 'K', '<Cmd>Lspsaga hover_doc<CR>', opts)
vim.keymap.set('n', 'gd', '<Cmd>Lspsaga lsp_finder<CR>', opts)
-- vim.keymap.set('i', '<C-k>', '<Cmd>Lspsaga signature_help<CR>', opts)
vim.keymap.set('i', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
vim.keymap.set('n', 'gp', '<Cmd>Lspsaga peek_definition<CR>', opts)
vim.keymap.set('n', 'gr', '<Cmd>Lspsaga rename<CR>', opts)

-- code action
local codeaction = require("lspsaga.codeaction")
vim.keymap.set("n", "<leader>ca", function() codeaction:code_action() end, { silent = true })
vim.keymap.set("v", "<leader>ca", function()
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<C-U>", true, false, true))
codeaction:range_code_action()
end, { silent = true })
-- code actions
vim.keymap.set({ "n", "v" }, "<leader>ca", "<cmd>Lspsaga code_action<CR>")
58 changes: 29 additions & 29 deletions nvim/plugin/packer_compiled.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ local function save_profiles(threshold)
end

time([[Luarocks path setup]], true)
local package_path_str = "/home/zick/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/zick/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/zick/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/zick/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
local install_cpath_pattern = "/home/zick/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
local package_path_str = "/Users/edmondavetisyan/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/edmondavetisyan/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/edmondavetisyan/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/edmondavetisyan/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
local install_cpath_pattern = "/Users/edmondavetisyan/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
if not string.find(package.path, package_path_str, 1, true) then
package.path = package.path .. ';' .. package_path_str
end
Expand All @@ -76,137 +76,137 @@ time([[Defining packer_plugins]], true)
_G.packer_plugins = {
LuaSnip = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/LuaSnip",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/LuaSnip",
url = "https://github.com/L3MON4D3/LuaSnip"
},
["cmp-buffer"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/cmp-buffer",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/cmp-buffer",
url = "https://github.com/hrsh7th/cmp-buffer"
},
["cmp-nvim-lsp"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
url = "https://github.com/hrsh7th/cmp-nvim-lsp"
},
["git.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/git.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/git.nvim",
url = "https://github.com/dinhhuy258/git.nvim"
},
["gitsigns.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
url = "https://github.com/lewis6991/gitsigns.nvim"
},
["lspkind-nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
url = "https://github.com/onsails/lspkind-nvim"
},
["lspsaga.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
url = "https://github.com/glepnir/lspsaga.nvim"
},
["lualine.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/lualine.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/lualine.nvim",
url = "https://github.com/nvim-lualine/lualine.nvim"
},
["markdown-preview.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim",
url = "https://github.com/iamcco/markdown-preview.nvim"
},
["mason-lspconfig.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
url = "https://github.com/williamboman/mason-lspconfig.nvim"
},
["mason.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/mason.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/mason.nvim",
url = "https://github.com/williamboman/mason.nvim"
},
["null-ls.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
url = "https://github.com/jose-elias-alvarez/null-ls.nvim"
},
["nvim-autopairs"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
url = "https://github.com/windwp/nvim-autopairs"
},
["nvim-bufferline.lua"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-bufferline.lua",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-bufferline.lua",
url = "https://github.com/akinsho/nvim-bufferline.lua"
},
["nvim-cmp"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-cmp",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-cmp",
url = "https://github.com/hrsh7th/nvim-cmp"
},
["nvim-colorizer.lua"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
url = "https://github.com/norcalli/nvim-colorizer.lua"
},
["nvim-lspconfig"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
url = "https://github.com/neovim/nvim-lspconfig"
},
["nvim-treesitter"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
url = "https://github.com/nvim-treesitter/nvim-treesitter"
},
["nvim-ts-autotag"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag",
url = "https://github.com/windwp/nvim-ts-autotag"
},
["nvim-web-devicons"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
url = "https://github.com/kyazdani42/nvim-web-devicons"
},
["onedark.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/onedark.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/onedark.nvim",
url = "https://github.com/navarasu/onedark.nvim"
},
["packer.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/packer.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/packer.nvim",
url = "https://github.com/wbthomason/packer.nvim"
},
["plenary.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/plenary.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/plenary.nvim",
url = "https://github.com/nvim-lua/plenary.nvim"
},
["telescope-file-browser.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/telescope-file-browser.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/telescope-file-browser.nvim",
url = "https://github.com/nvim-telescope/telescope-file-browser.nvim"
},
["telescope.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/telescope.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/telescope.nvim",
url = "https://github.com/nvim-telescope/telescope.nvim"
},
["vim-wakatime"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/vim-wakatime",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/vim-wakatime",
url = "https://github.com/wakatime/vim-wakatime"
},
["zen-mode.nvim"] = {
loaded = true,
path = "/home/zick/.local/share/nvim/site/pack/packer/start/zen-mode.nvim",
path = "/Users/edmondavetisyan/.local/share/nvim/site/pack/packer/start/zen-mode.nvim",
url = "https://github.com/folke/zen-mode.nvim"
}
}
Expand Down

0 comments on commit 70ba6ef

Please sign in to comment.