From 68a8c1bc3a806bf7584e3cade8fed3807e8dd541 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Sat, 1 Apr 2023 18:05:56 +0200 Subject: [PATCH] update vimrc and deleted powerline --- .vimrc | 13 +- powerline/colorschemes/default.json | 18 --- powerline/colorschemes/vim/default.json | 154 ------------------- powerline/config.json | 12 -- powerline/themes/shell/default.json | 47 ------ powerline/themes/shell/default_leftonly.json | 38 ----- powerline/themes/vim/default.json | 128 --------------- 7 files changed, 6 insertions(+), 404 deletions(-) delete mode 100644 powerline/colorschemes/default.json delete mode 100644 powerline/colorschemes/vim/default.json delete mode 100644 powerline/config.json delete mode 100644 powerline/themes/shell/default.json delete mode 100644 powerline/themes/shell/default_leftonly.json delete mode 100644 powerline/themes/vim/default.json diff --git a/.vimrc b/.vimrc index 2f750aa..0c5da6c 100644 --- a/.vimrc +++ b/.vimrc @@ -46,13 +46,13 @@ set smartcase " Text Rendering Options " " Always try to show a paragraph's last line. -set display+=lastline +"set display+=lastline " Use an encoding that supports unicode. set encoding=utf-8 " Avoid wrapping a line in the middle of a word. set linebreak " The number of screen lines to keep above and below the cursor. -set scrolloff=1 +set scrolloff=3 " The number of screen columns to keep to the left and right of the cursor. set sidescrolloff=5 " Enable syntax highlighting. @@ -66,7 +66,7 @@ set wrap " Always display the status bar. set laststatus=2 " Always show cursor position. -set ruler +"set ruler " Display command line's tab complete options as a menu. "set wildmenu " Maximum number of tab pages that can be opened from the command line. @@ -78,7 +78,7 @@ set cursorline " Show line numbers on the sidebar. set number " Show line number on the current line and relative numbers on all other lines. -"set relativenumber +set relativenumber " Disable beep on errors. set noerrorbells " Flash the screen instead of beeping on errors. @@ -86,7 +86,7 @@ set visualbell " Enable mouse for scrolling and resizing. set mouse=a " Set the window's title, reflecting the file currently being edited. -set title +"set title " Use colors that suit a dark background. "set background=dark @@ -110,7 +110,7 @@ set title " Directory to store backup files. set backupdir=~/.cache/vim " Display a confirmation dialog when closing an unsaved file. -set confirm +"set confirm " Directory to store swap files. set dir=~/.cache/vim " Delete comment characters when joining lines. @@ -131,4 +131,3 @@ set history=1000 "set spell " Ignore files matching these patterns when opening files based on a glob pattern. "set wildignore+=.pyc,.swp - diff --git a/powerline/colorschemes/default.json b/powerline/colorschemes/default.json deleted file mode 100644 index e688837..0000000 --- a/powerline/colorschemes/default.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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/powerline/colorschemes/vim/default.json b/powerline/colorschemes/vim/default.json deleted file mode 100644 index e02a160..0000000 --- a/powerline/colorschemes/vim/default.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "name": "Default color scheme", - "groups": { - "information:unimportant": { "fg": "gray8", "bg": "gray2", "attrs": [] }, - "information:additional": { "fg": "gray9", "bg": "gray4", "attrs": [] }, - "background": { "fg": "white", "bg": "gray2", "attrs": [] }, - "background:divider": { "fg": "gray6", "bg": "gray2", "attrs": [] }, - "mode": { "fg": "darkestgreen", "bg": "brightgreen", "attrs": ["bold"] }, - "visual_range": { "fg": "brightestorange", "bg": "darkorange", "attrs": ["bold"] }, - "modified_indicator": { "fg": "brightyellow", "bg": "gray4", "attrs": ["bold"] }, - "paste_indicator": { "fg": "white", "bg": "mediumorange", "attrs": ["bold"] }, - "readonly_indicator": { "fg": "brightestred", "bg": "gray4", "attrs": [] }, - "branch_dirty": { "fg": "brightyellow", "bg": "gray4", "attrs": [] }, - "branch:divider": { "fg": "gray7", "bg": "gray4", "attrs": [] }, - "file_name": { "fg": "white", "bg": "gray4", "attrs": ["bold"] }, - "window_title": { "fg": "white", "bg": "gray4", "attrs": [] }, - "file_name_no_file": { "fg": "gray9", "bg": "gray4", "attrs": ["bold"] }, - "file_vcs_status": { "fg": "brightestred", "bg": "gray4", "attrs": [] }, - "file_vcs_status_M": { "fg": "brightyellow", "bg": "gray4", "attrs": [] }, - "file_vcs_status_A": { "fg": "brightgreen", "bg": "gray4", "attrs": [] }, - "line_percent": { "fg": "gray9", "bg": "gray4", "attrs": [] }, - "line_percent_gradient": { "fg": "dark_green_gray", "bg": "gray4", "attrs": [] }, - "position": { "fg": "gray9", "bg": "gray4", "attrs": [] }, - "position_gradient": { "fg": "green_yellow_red", "bg": "gray4", "attrs": [] }, - "line_current": { "fg": "gray1", "bg": "gray10", "attrs": ["bold"] }, - "line_current_symbol": { "fg": "gray1", "bg": "gray10", "attrs": [] }, - "virtcol_current_gradient": { "fg": "dark_GREEN_Orange_red", "bg": "gray10", "attrs": [] }, - "col_current": { "fg": "gray6", "bg": "gray10", "attrs": [] }, - "modified_buffers": { "fg": "brightyellow", "bg": "gray2", "attrs": [] }, - "attached_clients": { "fg": "gray8", "bg": "gray2", "attrs": [] }, - "error": { "fg": "brightestred", "bg": "darkred", "attrs": ["bold"] }, - "warning": { "fg": "brightyellow", "bg": "darkorange", "attrs": ["bold"] }, - "current_tag": { "fg": "gray9", "bg": "gray2", "attrs": [] }, - - "tab_nc:modified_indicator": { "fg": "brightyellow", "bg": "gray2", "attrs": ["bold"] } - }, - "mode_translations": { - "nc": { - "colors": { - "brightyellow": "darkorange", - "brightestred": "darkred", - "gray0": "gray0", - "gray1": "gray0", - "gray2": "gray0", - "gray3": "gray1", - "gray4": "gray1", - "gray5": "gray1", - "gray6": "gray1", - "gray7": "gray4", - "gray8": "gray4", - "gray9": "gray4", - "gray10": "gray5", - "white": "gray6", - "dark_green_gray": "gray5" - } - }, - "i": { - "colors": { - "gray0": "darkestblue", - "gray1": "darkestblue", - "gray2": "darkestblue", - "gray3": "darkblue", - "gray4": "darkblue", - "gray5": "darkestcyan", - "gray6": "darkestcyan", - "gray7": "darkestcyan", - "gray8": "mediumcyan", - "gray9": "mediumcyan", - "gray10": "mediumcyan", - "green_yellow_red": "gray5", - "dark_green_gray": "light_green_gray" - }, - "groups": { - "mode": { "fg": "darkestcyan", "bg": "white", "attrs": ["bold"] }, - "background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attrs": [] }, - "branch:divider": { "fg": "darkcyan", "bg": "darkblue", "attrs": [] } - } - }, - "ic": { - "colors": { - "gray0": "darkestblue", - "gray1": "darkestblue", - "gray2": "darkestblue", - "gray3": "darkblue", - "gray4": "darkblue", - "gray5": "darkestcyan", - "gray6": "darkestcyan", - "gray7": "darkestcyan", - "gray8": "mediumcyan", - "gray9": "mediumcyan", - "gray10": "mediumcyan", - "green_yellow_red": "gray5", - "dark_green_gray": "light_green_gray" - }, - "groups": { - "mode": { "fg": "darkestcyan", "bg": "white", "attrs": ["bold"] }, - "background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attrs": [] }, - "branch:divider": { "fg": "darkcyan", "bg": "darkblue", "attrs": [] } - } - }, - "ix": { - "colors": { - "gray0": "darkestblue", - "gray1": "darkestblue", - "gray2": "darkestblue", - "gray3": "darkblue", - "gray4": "darkblue", - "gray5": "darkestcyan", - "gray6": "darkestcyan", - "gray7": "darkestcyan", - "gray8": "mediumcyan", - "gray9": "mediumcyan", - "gray10": "mediumcyan", - "green_yellow_red": "gray5", - "dark_green_gray": "light_green_gray" - }, - "groups": { - "mode": { "fg": "darkestcyan", "bg": "white", "attrs": ["bold"] }, - "background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attrs": [] }, - "branch:divider": { "fg": "darkcyan", "bg": "darkblue", "attrs": [] } - } - }, - "v": { - "groups": { - "mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] } - } - }, - "V": { - "groups": { - "mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] } - } - }, - "^V": { - "groups": { - "mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] } - } - }, - "R": { - "groups": { - "mode": { "fg": "white", "bg": "brightred", "attrs": ["bold"] } - } - }, - "Rc": { - "groups": { - "mode": { "fg": "white", "bg": "brightred", "attrs": ["bold"] } - } - }, - "Rx": { - "groups": { - "mode": { "fg": "white", "bg": "brightred", "attrs": ["bold"] } - } - } - } -} diff --git a/powerline/config.json b/powerline/config.json deleted file mode 100644 index 2de242a..0000000 --- a/powerline/config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ext": { - "shell": { - "colorscheme": "default", - "theme": "default" - }, - "vim": { - "colorscheme": "default", - "theme": "default" - } - } -} diff --git a/powerline/themes/shell/default.json b/powerline/themes/shell/default.json deleted file mode 100644 index c631cb7..0000000 --- a/powerline/themes/shell/default.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "segments": { - "left": [ - { - "function": "powerline.segments.shell.mode" - }, - { - "function": "powerline.segments.common.net.hostname", - "args": { - "only_if_ssh": false, - "exclude_domain": true - }, - "priority": 10 - }, - { - "function": "powerline.segments.common.env.user", - "priority": 30 - }, - { - "function": "powerline.segments.common.env.virtualenv", - "priority": 50 - }, - { - "function": "powerline.segments.shell.cwd", - "priority": 10 - }, - { - "function": "powerline.segments.shell.jobnum", - "priority": 20 - }, - { - "function": "powerline.segments.shell.last_status", - "priority": 10 - } - ], - "right": [ - { - "function": "powerline.segments.shell.last_pipe_status", - "priority": 10 - }, - { - "function": "powerline_gitstatus.gitstatus", - "priority": 40 - } - ] - } -} diff --git a/powerline/themes/shell/default_leftonly.json b/powerline/themes/shell/default_leftonly.json deleted file mode 100644 index 74efcea..0000000 --- a/powerline/themes/shell/default_leftonly.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "segments": { - "left": [ - { - "function": "powerline.segments.common.net.hostname", - "args": { - "only_if_ssh": false, - "exclude_domain": true - }, - "priority": 10 - }, - { - "function": "powerline.segments.common.env.user", - "priority": 30 - }, - { - "function": "powerline.segments.common.env.virtualenv", - "priority": 50 - }, - { - "function": "powerline.segments.common.vcs.branch", - "priority": 40 - }, - { - "function": "powerline.segments.shell.cwd", - "priority": 10 - }, - { - "function": "powerline.segments.shell.jobnum", - "priority": 20 - }, - { - "function": "powerline.segments.shell.last_status", - "priority": 10 - } - ] - } -} diff --git a/powerline/themes/vim/default.json b/powerline/themes/vim/default.json deleted file mode 100644 index 9b0c744..0000000 --- a/powerline/themes/vim/default.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "segments": { - "left": [ - { - "function": "mode", - "exclude_modes": ["nc"] - }, - { - "function": "visual_range", - "include_modes": ["v", "V", "^V", "s", "S", "^S"], - "priority": 10 - }, - { - "function": "paste_indicator", - "exclude_modes": ["nc"], - "priority": 10 - }, - { - "function": "powerline.segments.vim.plugin.capslock.capslock_indicator", - "include_modes": ["i", "R", "Rv"], - "priority": 10 - }, - { - "function": "branch", - "exclude_modes": ["nc"], - "priority": 30 - }, - { - "function": "readonly_indicator", - "draw_soft_divider": false, - "after": " " - }, - { - "function": "file_scheme", - "priority": 20 - }, - { - "function": "file_directory", - "priority": 40, - "draw_soft_divider": false - }, - { - "function": "file_name", - "draw_soft_divider": false - }, - { - "function": "file_vcs_status", - "before": " ", - "draw_soft_divider": false - }, - { - "function": "modified_indicator", - "before": " " - }, - { - "exclude_modes": ["i", "R", "Rv"], - "function": "trailing_whitespace", - "display": false, - "priority": 60 - }, - { - "exclude_modes": ["nc"], - "function": "powerline.segments.vim.plugin.syntastic.syntastic", - "priority": 50 - }, - { - "exclude_modes": ["nc"], - "function": "powerline.segments.vim.plugin.tagbar.current_tag", - "draw_soft_divider": false, - "priority": 50 - }, - { - "type": "string", - "highlight_groups": ["background"], - "draw_soft_divider": false, - "draw_hard_divider": false, - "width": "auto" - } - ], - "right": [ - { - "function": "file_format", - "draw_soft_divider": false, - "exclude_modes": ["nc"], - "priority": 60 - }, - { - "function": "file_encoding", - "exclude_modes": ["nc"], - "priority": 60 - }, - { - "function": "file_type", - "exclude_modes": ["nc"], - "priority": 60 - }, - { - "function": "line_percent", - "priority": 50, - "width": 4, - "align": "r" - }, - { - "function": "csv_col_current", - "priority": 30 - }, - { - "type": "string", - "name": "line_current_symbol", - "highlight_groups": ["line_current_symbol", "line_current"] - }, - { - "function": "line_current", - "draw_soft_divider": false, - "width": 3, - "align": "r" - }, - { - "function": "virtcol_current", - "draw_soft_divider": false, - "priority": 20, - "before": ":", - "width": 3, - "align": "l" - } - ] - } -}