Adding powerline and colour emoji support

This commit is contained in:
Siina Mashek 2020-12-29 08:27:05 +02:00
parent 5977dd953d
commit 83ee5c2974
8 changed files with 177 additions and 33 deletions

8
bashrc
View File

@ -3,6 +3,12 @@ if [[ $- != *i* ]] ; then
return
fi
# Setting up the city's powerlines
powerline-daemon -q
POWERLINE_BASH_CONTINUATION=1
POWERLINE_BASH_SELECT=1
. /usr/lib/python3.8/site-packages/powerline/bindings/bash/powerline.sh
# The city's finest exports!
export GIT_EDITOR="vim"
export PATH="$PATH:$HOME/.local/bin"
@ -11,4 +17,4 @@ export TERM=xterm-color # Fixes ssh since I use alacritty and it sets the TERM
export VIMINIT="source $HOME/.config/vim/vimrc"
alias ls="ls --color=auto"
alias weather='curl wttr.in/?format="%l:+%C,+%t+(feels+like+%f)\n"'

View File

@ -11,14 +11,17 @@ colors:
font:
size: 12.0
normal:
family: "Cascadia Code"
family: "Cascadia Code PL"
style: Regular
bold:
family: "Cascadia Code"
family: "Cascadia Code PL"
style: Bold
italic:
family: "Cascadia Code"
family: "Cascadia Code PL"
style: Italic
glyph_offset:
x: 0
y: -1
window:
dimensions:

View File

@ -1,31 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<fontconfig>
<match>
<test name="family"><string>sans-serif</string></test>
<edit name="family" mode="append" binding="strong">
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" binding="strong" mode="append">
<string>Noto Serif</string>
<string>Noto Color Emoji</string>
</edit>
</match>
<!-- Add emoji generic family -->
<alias binding="strong">
<family>emoji</family>
<default><family>Noto Color Emoji</family></default>
<default>
<family>Noto Color Emoji</family>
</default>
</alias>
<!-- Aliases for the other emoji fonts -->
<alias binding="strong">
<family>Apple Color Emoji</family>
<prefer><family>Noto Color Emoji</family></prefer>
<prefer>
<family>Noto Color Emoji</family>
</prefer>
</alias>
<alias binding="strong">
<family>Segoe UI Emoji</family>
<prefer><family>Noto Color Emoji</family></prefer>
<prefer>
<family>Noto Color Emoji</family>
</prefer>
</alias>
<alias binding="strong">
<family>Emoji One</family>
<prefer><family>Noto Color Emoji</family></prefer>
<prefer>
<family>Noto Color Emoji</family>
</prefer>
</alias>
<dir>~/.fonts</dir>
</fontconfig>

View File

@ -0,0 +1,18 @@
{
"groups": {
"gitstatus": { "fg": "gray8", "bg": "gray2", "attrs": [] },
"gitstatus_branch": { "fg": "gray8", "bg": "gray2", "attrs": [] },
"gitstatus_branch_clean": { "fg": "green", "bg": "gray2", "attrs": [] },
"gitstatus_branch_dirty": { "fg": "gray8", "bg": "gray2", "attrs": [] },
"gitstatus_branch_detached": { "fg": "mediumpurple", "bg": "gray2", "attrs": [] },
"gitstatus_tag": { "fg": "darkcyan", "bg": "gray2", "attrs": [] },
"gitstatus_behind": { "fg": "gray10", "bg": "gray2", "attrs": [] },
"gitstatus_ahead": { "fg": "gray10", "bg": "gray2", "attrs": [] },
"gitstatus_staged": { "fg": "green", "bg": "gray2", "attrs": [] },
"gitstatus_unmerged": { "fg": "brightred", "bg": "gray2", "attrs": [] },
"gitstatus_changed": { "fg": "mediumorange", "bg": "gray2", "attrs": [] },
"gitstatus_untracked": { "fg": "brightestorange", "bg": "gray2", "attrs": [] },
"gitstatus_stashed": { "fg": "darkblue", "bg": "gray2", "attrs": [] },
"gitstatus:divider": { "fg": "gray8", "bg": "gray2", "attrs": [] }
}
}

View File

@ -0,0 +1,53 @@
{
"common": {
"term_truecolor": false
},
"ext": {
"ipython": {
"colorscheme": "default",
"theme": "in",
"local_themes": {
"rewrite": "rewrite",
"out": "out",
"in2": "in2"
}
},
"pdb": {
"colorscheme": "default",
"theme": "default"
},
"shell": {
"colorscheme": "default",
"theme": "default",
"local_themes": {
"continuation": "continuation",
"select": "select"
}
},
"tmux": {
"colorscheme": "default",
"theme": "default"
},
"vim": {
"colorscheme": "default",
"theme": "default",
"local_themes": {
"__tabline__": "tabline",
"cmdwin": "cmdwin",
"help": "help",
"quickfix": "quickfix",
"powerline.matchers.vim.plugin.nerdtree.nerdtree": "plugin_nerdtree",
"powerline.matchers.vim.plugin.commandt.commandt": "plugin_commandt",
"powerline.matchers.vim.plugin.gundo.gundo": "plugin_gundo",
"powerline.matchers.vim.plugin.gundo.gundo_preview": "plugin_gundo-preview"
}
},
"wm": {
"colorscheme": "default",
"theme": "default",
"update_interval": 2
}
}
}

View File

@ -0,0 +1,18 @@
{
"gitstatus": {
"args": {
"formats": {
"branch": "\ue0a0 {}",
"tag": " ★ {}",
"behind": " ↓ {}",
"ahead": " ↑ {}",
"staged": " ● {}",
"unmerged": " ✖ {}",
"changed": " ✚ {}",
"untracked": " … {}",
"stashed": " ⚑ {}"
},
"detached_head_style": "ref"
}
}
}

View File

@ -0,0 +1,34 @@
{
"segments": {
"left": [
{
"function": "powerline.segments.common.net.hostname",
"priority": 10
},
{
"function": "powerline.segments.common.env.user",
"priority": 30
},
{
"function": "powerline.segments.common.env.virtualenv",
"priority": 50
},
{
"function": "powerline_gitstatus.gitstatus",
"priority": 40
},
{
"function": "powerline.segments.shell.cwd",
"priority": 10
},
{
"function": "powerline.segments.shell.jobnum",
"priority": 20
},
{
"function": "powerline.segments.shell.last_pipe_status",
"priority": 10
}
]
}
}

View File

@ -1,2 +1,5 @@
set viminfo+=n~/.config/vim/viminfo
set tabstop=2
set rtp+=/usr/lib/python3.8/site-packages/powerline/bindings/vim/
set laststatus=2
set t_Co=256