From 04cb280a4e66105f1b318dcc38e153062d3329a9 Mon Sep 17 00:00:00 2001 From: Siina Mashek Date: Fri, 16 Apr 2021 12:18:44 +0300 Subject: [PATCH] re-adding powerline --- bashrc | 8 +++ config/alacritty/alacritty.yml | 6 +-- config/powerline/colorschemes/default.json | 18 +++++++ config/powerline/config.json | 54 +++++++++++++++++++++ config/powerline/themes/shell/__main__.json | 18 +++++++ config/powerline/themes/shell/default.json | 34 +++++++++++++ 6 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 config/powerline/colorschemes/default.json create mode 100644 config/powerline/config.json create mode 100644 config/powerline/themes/shell/__main__.json create mode 100644 config/powerline/themes/shell/default.json diff --git a/bashrc b/bashrc index 06bb961..a0aea5b 100644 --- a/bashrc +++ b/bashrc @@ -10,5 +10,13 @@ export PS1="\[$(tput setaf 2)\]\u@\h\[$(tput setaf 4)\] \w\[$(tput sgr0)\] \\$ " export TERM=xterm-color # Fixes ssh since I use alacritty and it sets the TERM to its name export VIMINIT="source $HOME/.config/vim/vimrc" +# Setting up the city's powerlines +if [ -f $HOME/.local/lib/python3.9/site-packages/powerline/bindings/bash/powerline.sh ]; then + powerline-daemon -q + POWERLINE_BASH_CONTINUATION=1 + POWERLINE_BASH_SELECT=1 + . $HOME/.local/lib/python3.9/site-packages/powerline/bindings/bash/powerline.sh +fi + alias ls="ls -h --color=auto" alias myip="curl https://ifconfig.co" diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml index e629e56..93ca83d 100644 --- a/config/alacritty/alacritty.yml +++ b/config/alacritty/alacritty.yml @@ -11,13 +11,13 @@ 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 diff --git a/config/powerline/colorschemes/default.json b/config/powerline/colorschemes/default.json new file mode 100644 index 0000000..e688837 --- /dev/null +++ b/config/powerline/colorschemes/default.json @@ -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": [] } + } +} diff --git a/config/powerline/config.json b/config/powerline/config.json new file mode 100644 index 0000000..7ed9145 --- /dev/null +++ b/config/powerline/config.json @@ -0,0 +1,54 @@ +{ + "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 + } + } +} + diff --git a/config/powerline/themes/shell/__main__.json b/config/powerline/themes/shell/__main__.json new file mode 100644 index 0000000..c4e7316 --- /dev/null +++ b/config/powerline/themes/shell/__main__.json @@ -0,0 +1,18 @@ +{ + "gitstatus": { + "args": { + "formats": { + "branch": "\ue0a0 {}", + "tag": " ★ {}", + "behind": " ↓ {}", + "ahead": " ↑ {}", + "staged": " ● {}", + "unmerged": " ✖ {}", + "changed": " ✚ {}", + "untracked": " … {}", + "stashed": " ⚑ {}" + }, + "detached_head_style": "ref" + } + } +} diff --git a/config/powerline/themes/shell/default.json b/config/powerline/themes/shell/default.json new file mode 100644 index 0000000..1244af7 --- /dev/null +++ b/config/powerline/themes/shell/default.json @@ -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 + } + ] + } +}