von/vdotfiles
1
0
Fork 0
Code Activity

nvim: plugins and themes; zsh: some colors and symbols

Browse source
This commit is contained in:
Von Random 2024-04-23 15:37:03 +03:00
parent 9b15fbfec6
commit 65bfbe8d4c
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cli/.config/nvim/lua/plugins.lua
View file

@ -8,8 +8,8 @@ vim.opt.rtp:prepend(lazypath)
--[[ plugins list ]] --[[ plugins list ]]
require('lazy').setup { require('lazy').setup {
{'kdheepak/lazygit.nvim', dependencies = {'nvim-lua/plenary.nvim'}}, {'kdheepak/lazygit.nvim', dependencies = {'nvim-lua/plenary.nvim'}},
{'lifepillar/vim-gruvbox8', branch = 'neovim'}, {'ellisonleao/gruvbox.nvim', priority = 1000, config = true},
{'lifepillar/vim-solarized8', branch = 'neovim'}, {'nvim-orgmode/orgmode', event = 'VeryLazy', ft = {'org'}},
{'nvim-telescope/telescope.nvim', dependencies = {'nvim-lua/plenary.nvim'}}, {'nvim-telescope/telescope.nvim', dependencies = {'nvim-lua/plenary.nvim'}},
{'nvim-treesitter/nvim-treesitter', cmd = 'TSUpdate'}, {'nvim-treesitter/nvim-treesitter', cmd = 'TSUpdate'},
{'w0rp/ale', cmd = 'ALEEnable', ft = {'bash', 'go', 'lua', 'python', 'sh', 'zsh'}}, {'w0rp/ale', cmd = 'ALEEnable', ft = {'bash', 'go', 'lua', 'python', 'sh', 'zsh'}},
@ -22,6 +22,13 @@ require('lazy').setup {
--[[ plugin configs and maps ]] --[[ plugin configs and maps ]]
require('gitsigns').setup() require('gitsigns').setup()
require('gruvbox').setup {
terminal_colors = false
}
require('orgmode').setup {
org_agenda_files = '~/orgfiles/**/*',
org_default_notes_file = '~/orgfiles/refile.org'
}
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
highlight = { highlight = {
enable = true enable = true
@ -30,7 +37,6 @@ require('nvim-treesitter.configs').setup {
require('lualine').setup { require('lualine').setup {
options = { options = {
icons_enabled = false, icons_enabled = false,
theme = 'gruvbox',
component_separators = { left = "\u{2022}", right = "\u{2022}"}, component_separators = { left = "\u{2022}", right = "\u{2022}"},
section_separators = { left = nil, right = nil}, section_separators = { left = nil, right = nil},
} }
@ -45,10 +51,7 @@ map('n', '<Leader>T', '<cmd>colorscheme solarized8|set bg=light<CR>')
map('n', '<Leader>t', '<cmd>colorscheme gruvbox8|set bg=dark<CR>') map('n', '<Leader>t', '<cmd>colorscheme gruvbox8|set bg=dark<CR>')
--[[ theme ]] --[[ theme ]]
vim.g.solarized_extra_hi_groups = 1
vim.g.gruvbox_plugin_hi_groups = 1
vim.g.gruvbox_filetype_hi_groups = 1
vim.o.termguicolors = true vim.o.termguicolors = true
vim.o.bg = 'dark' vim.o.bg = 'dark'
vim.cmd [[colorscheme gruvbox8]] vim.cmd [[colorscheme gruvbox]]

11
cli/.config/zsh/prompt.zsh
View file

@ -14,7 +14,7 @@ typeset -A prompt_symbols=(
git_staged $'\u2713' git_staged $'\u2713'
git_untracked '!' git_untracked '!'
git_unmerged '*' git_unmerged '*'
bang $'\u266a' bang $'\u276f'
) )
typeset -A prompt_colors=( typeset -A prompt_colors=(
@ -22,12 +22,13 @@ typeset -A prompt_colors=(
root '1' root '1'
ssh '15' ssh '15'
cwd '4' cwd '4'
git_branch '241' git_branch ''
git_unstaged '3' git_unstaged '3'
git_staged '6' git_staged '6'
git_untracked '1' git_untracked '1'
git_unmerged '5' git_unmerged '5'
bang '10' brackets '8'
bang '8'
) )
precmd.is_git_repo() { precmd.is_git_repo() {
@ -97,7 +98,7 @@ precmd.prompt.git() {
precmd.prompt() { precmd.prompt() {
typeset -g prompt_string= prev_color= typeset -g prompt_string= prev_color=
precmd.prompt.add '[' precmd.prompt.add '[' $prompt_colors[brackets]
(( UID )) \ (( UID )) \
|| precmd.prompt.add '#' $prompt_colors[root] || precmd.prompt.add '#' $prompt_colors[root]
[[ -n $SSH_CONNECTION ]]\ [[ -n $SSH_CONNECTION ]]\
@ -110,7 +111,7 @@ precmd.prompt() {
[[ $1 == git ]]\ [[ $1 == git ]]\
&& precmd.prompt.git && precmd.prompt.git
precmd.prompt.add $']\n' precmd.prompt.add $']\n' $prompt_colors[brackets]
prompt_string+="%F{$prompt_colors[bang]}$prompt_symbols[bang]%f " prompt_string+="%F{$prompt_colors[bang]}$prompt_symbols[bang]%f "
} }