tiyn
/
dotfiles
mirror of https://github.com/tiyn/dotfiles
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvim: adapted icons to fit with another

Browse Source
master
tiyn 1 year ago
parent ec1e911712
commit 2a2dc266b0
2 changed files with 444 additions and 400 deletions
Show Stats Download Patch File Download Diff File

800
.config/nvim/lua/loadplugins.lua
Unescape View File

@ -13,438 +13,448 @@ end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
return require("lazy").setup({ return require("lazy").setup({
-- display git status per line
{
'lewis6991/gitsigns.nvim',
config = function()
require('gitsigns').setup()
end
},
-- display git status per line -- show indentation lines
{ {
'lewis6991/gitsigns.nvim', 'lukas-reineke/indent-blankline.nvim',
config = function() config = function()
require('gitsigns').setup() require("indent_blankline").setup({
end show_current_context = true,
}, show_current_context_start = true
})
-- show indentation lines end,
{ },
'lukas-reineke/indent-blankline.nvim',
config = function()
require("indent_blankline").setup({
show_current_context = true,
show_current_context_start = true
})
end,
},
-- statusline -- statusline
{ {
'nvim-lualine/lualine.nvim', 'nvim-lualine/lualine.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons', }, dependencies = { 'nvim-tree/nvim-web-devicons', },
config = function() config = function()
require('lualine').setup({ require('lualine').setup({
options = { options = {
symbols = { symbols = {
error = Error_sign, error = Error_sign,
warn = Warn_sign, warn = Warn_sign,
hint = Hint_sign, hint = Hint_sign,
info = Info_sign info = Info_sign
},
theme = 'tccs',
component_separators = { left = '', right = '' },
section_separators = { left = '', right = '' }
}, },
theme = 'tccs', })
component_separators = { left = '', right = '' }, end
section_separators = { left = '', right = '' } },
},
})
end
},
-- show function signature while typing
{
'ray-x/lsp_signature.nvim',
config = function()
require "lsp_signature".setup({
bind = true,
handler_opts = {
border = "none"
},
hint_prefix = Hint_sign,
hint_scheme = "DiagnosticSignHint"
})
end
},
-- preview for markdown filetypes -- show function signature while typing
{ {
"iamcco/markdown-preview.nvim", 'ray-x/lsp_signature.nvim',
ft = { 'markdown' }, config = function()
build = "cd app && yarn install" require "lsp_signature".setup({
}, bind = true,
handler_opts = {
border = "none"
},
hint_prefix = Hint_sign,
hint_scheme = "DiagnosticSignHint"
})
end
},
-- latex asynchronous pdf rendering -- preview for markdown filetypes
{ {
'donRaphaco/neotex', "iamcco/markdown-preview.nvim",
ft = { 'tex' }, ft = { 'markdown' },
config = function() build = "cd app && yarn install"
vim.g.neotex_enabled = 2 },
end
},
-- nim language support -- latex asynchronous pdf rendering
{ {
'zah/nim.vim', 'donRaphaco/neotex',
ft = { 'nim' } ft = { 'tex' },
}, config = function()
vim.g.neotex_enabled = 2
end
},
-- automatic closing of brackets -- nim language support
{ {
'windwp/nvim-autopairs', 'zah/nim.vim',
config = function() ft = { 'nim' }
require("nvim-autopairs").setup() },
end
},
-- lang server installations -- automatic closing of brackets
{ {
'williamboman/mason.nvim', 'windwp/nvim-autopairs',
dependencies = { config = function()
{ require("nvim-autopairs").setup()
'jose-elias-alvarez/null-ls.nvim', end
config = function()
require("null-ls").setup({
sources = {
require("null-ls-embedded").nls_source.with({
filetypes = { "markdown" }
}),
require("null-ls").builtins.formatting.black,
require("null-ls").builtins.formatting.mdformat
}
})
end
},
{
'jay-babu/mason-null-ls.nvim',
config = function()
-- jay-babu/mason-null-ls.nvim
require("mason-null-ls").setup({
automatic_installation = true,
ensure_installed = { "black", "mdformat" }
})
end
},
'LostNeophyte/null-ls-embedded'
}, },
config = function()
require("mason").setup({
ui = {
icons = Install_icons
}
})
end
},
-- lang server management -- lang server installations
{ {
'williamboman/mason-lspconfig.nvim', 'williamboman/mason.nvim',
dependencies = { dependencies = {
'neovim/nvim-lspconfig', {
{ 'jose-elias-alvarez/null-ls.nvim',
'hrsh7th/cmp-nvim-lsp', config = function()
config = function() require("null-ls").setup({
Capabilities = require("cmp_nvim_lsp").default_capabilities() sources = {
Capabilities.textDocument.foldingRange = { require("null-ls-embedded").nls_source.with({
dynamicRegistration = false, filetypes = { "markdown" }
lineFoldingOnly = true }),
} require("null-ls").builtins.formatting.black,
end require("null-ls").builtins.formatting.mdformat
}, }
-- navigation menu })
{
'SmiteshP/nvim-navbuddy',
config = function()
local navbuddy = require("nvim-navbuddy")
Attach_func = function(client, bufnr)
navbuddy.attach(client, bufnr)
end end
end, },
dependencies = { {
'SmiteshP/nvim-navic', 'jay-babu/mason-null-ls.nvim',
'MunifTanjim/nui.nvim' config = function()
} -- jay-babu/mason-null-ls.nvim
require("mason-null-ls").setup({
automatic_installation = true,
ensure_installed = { "black", "mdformat" }
})
end
},
'LostNeophyte/null-ls-embedded'
}, },
config = function()
require("mason").setup({
ui = {
icons = Install_signs
}
})
end
}, },
config = function()
require("mason-lspconfig").setup({ -- lang server management
automatic_setup = true, {
ensure_installed = { 'williamboman/mason-lspconfig.nvim',
"bashls", dependencies = {
"jdtls", 'neovim/nvim-lspconfig',
"lua_ls", {
"marksman", 'hrsh7th/cmp-nvim-lsp',
"nimls", config = function()
"pyright", Capabilities = require("cmp_nvim_lsp").default_capabilities()
"texlab" Capabilities.textDocument.foldingRange = {
} dynamicRegistration = false,
}) lineFoldingOnly = true
require("mason-lspconfig").setup_handlers({
function(server_name)
require('lspconfig')[server_name].setup({
on_attach = Attach_func,
capabilities = Capabilities,
flags = {
debounce_text_changes = 150
} }
}) end
end, },
["lua_ls"] = function() -- navigation menu
require 'lspconfig'.lua_ls.setup({ {
settings = { 'SmiteshP/nvim-navbuddy',
Lua = { config = function()
diagnostics = { local navbuddy = require("nvim-navbuddy")
globals = { 'vim' } Attach_func = function(client, bufnr)
navbuddy.attach(client, bufnr)
end
end,
dependencies = {
'SmiteshP/nvim-navic',
'MunifTanjim/nui.nvim'
}
},
},
config = function()
require("mason-lspconfig").setup({
automatic_setup = true,
ensure_installed = {
"bashls",
"jdtls",
"lua_ls",
"marksman",
"nimls",
"pyright",
"texlab"
}
})
require("mason-lspconfig").setup_handlers({
function(server_name)
require('lspconfig')[server_name].setup({
on_attach = Attach_func,
capabilities = Capabilities,
flags = {
debounce_text_changes = 150
}
})
end,
["lua_ls"] = function()
require 'lspconfig'.lua_ls.setup({
settings = {
Lua = {
diagnostics = {
globals = { 'vim' }
}
} }
} }
} })
}) end
end })
}) end
end },
},
-- autocompletion and its sources and snippets -- autocompletion and its sources and snippets
{ {
'hrsh7th/nvim-cmp', 'hrsh7th/nvim-cmp',
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', 'nvim-lua/plenary.nvim',
'onsails/lspkind-nvim', 'onsails/lspkind-nvim',
-- cmp sources -- cmp sources
'hrsh7th/cmp-buffer', 'hrsh7th/cmp-buffer',
'hrsh7th/cmp-path', 'hrsh7th/cmp-path',
'lukas-reineke/cmp-under-comparator', 'lukas-reineke/cmp-under-comparator',
-- luasnip -- luasnip
{ {
'l3mon4d3/luasnip', 'l3mon4d3/luasnip',
config = function() config = function()
require("luasnip.loaders.from_snipmate").lazy_load() require("luasnip.loaders.from_snipmate").lazy_load()
end, end,
dependencies = { 'saadparwaiz1/cmp_luasnip' } dependencies = { 'saadparwaiz1/cmp_luasnip' }
},
}, },
}, config = function()
config = function() local cmp = require("cmp")
local cmp = require("cmp") cmp.setup {
cmp.setup { sorting = {
sorting = { comparators = {
comparators = { cmp.config.compare.offset,
cmp.config.compare.offset, cmp.config.compare.exact,
cmp.config.compare.exact, cmp.config.compare.score,
cmp.config.compare.score, require "cmp-under-comparator".under,
require "cmp-under-comparator".under, cmp.config.compare.kind,
cmp.config.compare.kind, cmp.config.compare.sort_text,
cmp.config.compare.sort_text, cmp.config.compare.length,
cmp.config.compare.length, cmp.config.compare.order
cmp.config.compare.order },
}, },
}, snippet = {
snippet = { expand = function(args)
expand = function(args) require("luasnip").lsp_expand(args.body)
require("luasnip").lsp_expand(args.body)
end
},
mapping = {
['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif require("luasnip").jumpable(-1) then
require("luasnip").jump(-1)
else
fallback()
end end
end, { "i", "s" }), },
['<Tab>'] = cmp.mapping(function(fallback) mapping = {
if cmp.visible() then ['<S-Tab>'] = cmp.mapping(function(fallback)
cmp.select_next_item() if cmp.visible() then
elseif require("luasnip").expand_or_jumpable() then cmp.select_prev_item()
require("luasnip").expand_or_jump() elseif require("luasnip").jumpable(-1) then
else require("luasnip").jump(-1)
fallback() else
end fallback()
end, { "i", "s" }), end
['<C-e>'] = cmp.mapping.close(), end, { "i", "s" }),
['<CR>'] = cmp.mapping.confirm { ['<Tab>'] = cmp.mapping(function(fallback)
behavior = cmp.ConfirmBehavior.Replace, if cmp.visible() then
select = true cmp.select_next_item()
elseif require("luasnip").expand_or_jumpable() then
require("luasnip").expand_or_jump()
else
fallback()
end
end, { "i", "s" }),
['<C-e>'] = cmp.mapping.close(),
['<CR>'] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace,
select = true
}
},
sources = {
{ name = 'nvim_lsp' },
{ name = 'path' },
{ name = 'buffer' },
{ name = 'luasnip' }
},
formatting = {
format = require("lspkind").cmp_format({
mode = "symbol_text",
preset = "codicons",
maxwidth = 50,
menu = Menu_signs,
symbol_map = Lsp_signs
})
} }
},
sources = {
{ name = 'nvim_lsp' },
{ name = 'path' },
{ name = 'buffer' },
{ name = 'luasnip' }
},
formatting = {
format = require("lspkind").cmp_format({
mode = "symbol_text",
preset = "codicons",
maxwidth = 50,
menu = Menu_signs,
symbol_map = Symbol_map
})
} }
} end
end },
},
-- fix for cursorhold function
'antoinemadec/fixcursorhold.nvim',
-- showing color of hex values, etc -- fix for cursorhold function
{ 'antoinemadec/fixcursorhold.nvim',
'norcalli/nvim-colorizer.lua',
config = function()
require('colorizer').setup({
'*',
'!markdown'
})
end
},
-- fileexplorer on the side -- showing color of hex values, etc
{ {
"nvim-tree/nvim-tree.lua", 'norcalli/nvim-colorizer.lua',
dependencies = { config = function()
"nvim-tree/nvim-web-devicons", require('colorizer').setup({
'*',
'!markdown'
})
end
}, },
config = function()
require("nvim-tree").setup({
sort_by = "case_sensitive",
view = {
width = 30,
},
renderer = {
group_empty = true,
},
filters = {
dotfiles = true,
}
})
end
},
-- better language highlighting by improved parsing -- fileexplorer on the side
{ {
'nvim-treesitter/nvim-treesitter', "nvim-tree/nvim-tree.lua",
dependencies = { dependencies = {
-- automatically close html-tags "nvim-tree/nvim-web-devicons",
'windwp/nvim-ts-autotag', },
config = function()
require("nvim-tree").setup({
sort_by = "case_sensitive",
view = {
width = 30,
},
filters = {
dotfiles = true,
},
renderer = {
group_empty = true,
icons = {
glyphs = {
git = Git_signs
},
},
}
})
end
}, },
config = function()
require("nvim-treesitter.configs").setup({
ensure_installed = {
"bash",
"c",
"cpp",
"css",
"html",
"java",
"markdown",
"latex",
"python",
},
autotag = { enable = true }
})
end
},
-- folding improvements -- better language highlighting by improved parsing
{ {
'kevinhwang91/nvim-ufo', 'nvim-treesitter/nvim-treesitter',
dependencies = { 'kevinhwang91/promise-async' }, dependencies = {
config = function() -- automatically close html-tags
require('ufo').setup() 'windwp/nvim-ts-autotag',
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' }, },
{ config = function()
pattern = { '*' }, require("nvim-treesitter.configs").setup({
command = 'lua require("ufo").closeAllFolds()' ensure_installed = {
}) "bash",
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' }, "c",
{ "cpp",
pattern = { '*' }, "css",
command = 'lua require("ufo").openAllFolds()' "html",
"java",
"markdown",
"latex",
"python",
},
autotag = { enable = true }
}) })
end end
}, },
-- fuzzy finder -- folding improvements
{ {
'nvim-telescope/telescope.nvim', 'kevinhwang91/nvim-ufo',
version = '0.1.2', dependencies = { 'kevinhwang91/promise-async' },
dependencies = { 'nvim-lua/plenary.nvim' }, config = function()
config = function() require('ufo').setup()
require("telescope").setup() vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
end {
}, pattern = { '*' },
command = 'lua require("ufo").closeAllFolds()'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { '*' },
command = 'lua require("ufo").openAllFolds()'
})
end
},
-- clean up white spaces and empty lines before writing -- fuzzy finder
{ {
"mcauley-penney/tidy.nvim", 'nvim-telescope/telescope.nvim',
event = "VeryLazy", version = '0.1.2',
config = function() dependencies = { 'nvim-lua/plenary.nvim' },
require("tidy").setup({ config = function()
filetype_exclude = {} require("telescope").setup()
}) end
end },
},
-- todo symbols and highlighting -- clean up white spaces and empty lines before writing
{ {
'folke/todo-comments.nvim', "mcauley-penney/tidy.nvim",
dependencies = { 'nvim-lua/plenary.nvim' }, event = "VeryLazy",
config = function() config = function()
require 'todo-comments'.setup { require("tidy").setup({
keywords = { filetype_exclude = {}
ERRO = { icon = Error_sign, color = "error" }, })
WARN = { icon = Warn_sign, color = "warning" }, end
HACK = { icon = Hack_sign, color = "warning" }, },
HINT = { icon = Hint_sign, color = "hint" },
TODO = { icon = Todo_sign, color = "info" }, -- todo symbols and highlighting
INFO = { icon = Info_sign, color = "hint", alt = { "NOTE" } }, {
PERF = { icon = Perfect_sign, color = "default" }, 'folke/todo-comments.nvim',
TEST = { icon = Test_sign, color = "test" } dependencies = { 'nvim-lua/plenary.nvim' },
config = function()
require 'todo-comments'.setup {
keywords = {
ERRO = { icon = Error_sign, color = "error" },
WARN = { icon = Warn_sign, color = "warning" },
HACK = { icon = Hack_sign, color = "warning" },
HINT = { icon = Hint_sign, color = "hint" },
TODO = { icon = Todo_sign, color = "info" },
INFO = { icon = Info_sign, color = "hint", alt = { "NOTE" } },
PERF = { icon = Perfect_sign, color = "default" },
TEST = { icon = Test_sign, color = "test" }
}
} }
} end
end },
},
-- git wrapper -- git wrapper
{ {
'tpope/vim-fugitive', 'tpope/vim-fugitive',
event = "VeryLazy" event = "VeryLazy"
}, },
-- markdown language support -- markdown language support
{ {
'preservim/vim-markdown', 'preservim/vim-markdown',
ft = { 'markdown' }, ft = { 'markdown' },
config = function() config = function()
vim.g.vim_markdown_folding_style_pythonic = 1 vim.g.vim_markdown_folding_style_pythonic = 1
end end
}, },
-- bulk renamer -- bulk renamer
{ {
'qpkorr/vim-renamer', 'qpkorr/vim-renamer',
event = "VeryLazy" event = "VeryLazy"
}, },
-- additional quote/parantheses funtions -- additional quote/parantheses funtions
{ {
"kylechui/nvim-surround", "kylechui/nvim-surround",
event = "VeryLazy", event = "VeryLazy",
config = function() config = function()
require("nvim-surround").setup() require("nvim-surround").setup()
end end
}, },
-- colorscheme -- colorscheme
{
'tiyn/vim-tccs',
config = function()
vim.cmd('colorscheme tccs')
end
},
},
{ {
'tiyn/vim-tccs', ui = {
config = function() icons = Lazy_signs
vim.cmd('colorscheme tccs') }
end
} }
}) )

44
.config/nvim/lua/style.lua
Unescape View File

@ -1,4 +1,4 @@
-- set diagnostic signs -- set signs for various uses
Error_sign = "" Error_sign = ""
Warn_sign = "" Warn_sign = ""
Info_sign = "" Info_sign = ""
@ -15,7 +15,7 @@ Menu_signs = {
luasnip = "", luasnip = "",
} }
Symbol_map = { Lsp_signs = {
Text = "", Text = "",
Method = "", Method = "",
Function = "φ", Function = "φ",
@ -43,12 +43,46 @@ Symbol_map = {
TypeParameter = "" TypeParameter = ""
} }
Install_icons = { Install_signs = {
package_installed = "✓", package_installed = "",
package_pending = "➜", package_pending = "",
package_uninstalled = "✗" package_uninstalled = "✗"
} }
Git_signs = {
unstaged = "",
staged = "",
unmerged = "",
renamed = "",
deleted = "",
untracked = "",
ignored = "",
}
Lazy_signs = {
cmd = "",
config = "",
event = "",
ft = "",
init = "",
import = "",
keys = "",
lazy = "󰒲 ",
loaded = "",
not_loaded = "",
plugin = "",
runtime = "",
source = "",
start = "",
task = "",
list = {
"●",
"➜",
"",
"",
}
}
vim.fn.sign_define( vim.fn.sign_define(
"DiagnosticSignError", "DiagnosticSignError",
{ texthl = "DiagnosticSignError", text = Error_sign, numhl = "DiagnosticSignError" } { texthl = "DiagnosticSignError", text = Error_sign, numhl = "DiagnosticSignError" }

Write Preview
Loading…
Cancel
Save