diff --git a/files/.vimrc b/files/.vimrc index 5d67157..c16dfa1 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -20,14 +20,6 @@ Plug 'jiangmiao/auto-pairs' " pair completion Plug 'airblade/vim-gitgutter' " show git changes -Plug 'itchyny/lightline.vim' " bar -Plug 'ryanoasis/vim-devicons' " icons in bar - -if executable("fzf") " fzf support and bindings - Plug 'junegunn/fzf' - Plug 'junegunn/fzf.vim' -endif - call plug#end() " ============================== Colors @@ -63,25 +55,6 @@ set scrolloff=5 " min lines above or below the cursor set laststatus=2 set showtabline=0 -function! GitStatus() - let [a,m,r] = GitGutterGetHunkSummary() - return printf('+%d ~%d -%d', a, m, r) -endfunction - -function! FileNameWithIcon() abort - return winwidth(0) > 70 ? WebDevIconsGetFileTypeSymbol() . ' ' . expand('%:T') : '' -endfunction - -let g:lightline = { 'colorscheme': 'gruvbox' } - -let g:lightline.component_function = { 'gitstatus': 'GitStatus' } -let g:lightline.component = { 'filename_with_icon': '%{FileNameWithIcon()}' } - -let g:lightline.active = { - \ 'left': [['mode', 'readonly'], ['filename_with_icon', 'modified']], - \ 'right': [['lineinfo'], ['percent'], ['gitstatus', 'fileformat', 'fileencoding', 'filetype']] - \ } - " ============================== Indents and Whitespaces set list set listchars=tab:──\ ,extends:›,precedes:‹,nbsp:·,trail:· @@ -113,11 +86,3 @@ cmap Wq wq cmap Q q cmap W w cmap q1 q! - -" fzf -if has ("nvim") - nmap ff :Files - nmap ft :enew:Files -else - nmap ft :enew -end diff --git a/files/.zshrc b/files/.zshrc index 28e5919..08822a5 100644 --- a/files/.zshrc +++ b/files/.zshrc @@ -43,15 +43,15 @@ esac export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} " zstyle ':vcs_info:git:*' formats '|%b ' +export EDITOR="vim" +export VISIAL=${EDITOR} + # ============================== Aliases alias emacsnw="TERM=alacritty-direct emacsclient -nw -a 'vim'" alias fontscache="fc-cache -f -v" alias ofen="cc" -alias mon2cam="deno run --unstable -A -r -q https://raw.githubusercontent.com/ShayBox/Mon2Cam/master/src/mod.ts" - -if command -v nvim &> /dev/null; then - alias vim="nvim" -fi +alias uni="cd ~/data/nextcloud/uni" +alias duni="cd ~/dev/uni/" if command -v rg &> /dev/null; then alias grep="rg" @@ -79,10 +79,6 @@ if [ -f ~/.zshrc_local ]; then source ~/.zshrc_local fi -# ============================== Exports -export EDITOR="vim" -export VISUAL="vim" - # ============================== Completion unsetopt menu_complete # do not autoselect the first completion entry unsetopt flowcontrol