From 7545a0105c5b17c36d0a0120477c2c766ce16c47 Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Sat, 11 Jun 2022 10:31:21 +0200 Subject: [PATCH] update editor confs --- files/emacs/init.org | 17 ++++++------ files/vim/.vimrc | 61 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 40 deletions(-) diff --git a/files/emacs/init.org b/files/emacs/init.org index e72dc9a..4b05d66 100644 --- a/files/emacs/init.org +++ b/files/emacs/init.org @@ -130,7 +130,7 @@ Make ESC quit prompts. #+end_src *** Soft wrap -#+begin_src emacs-lisp +#+begin_src emacs-lisp :tangle no (global-visual-line-mode t) #+end_src @@ -318,7 +318,7 @@ Show me color codes as colors! (c-mode . (lambda() (rainbow-mode -1)))) #+end_src -*** Whitespaces and indentation +*** Whitespaces Show me trailing white-spaces. #+begin_src emacs-lisp (global-whitespace-mode t) @@ -549,6 +549,12 @@ Use some magic heuristics for indentation. (markdown-mode . dtrt-indent-mode)) #+end_src +#+begin_src emacs-lisp +(setq ; c-default-style "bsd" + c-basic-offset 4) +(setq-default indent-tabs-mode nil) +#+end_src + *** Auto pairs Auto matching pairs is nice. #+begin_src emacs-lisp @@ -603,13 +609,6 @@ Sometimes, a big red TODO is more intimidating than one with normal text color. ("UNUSED" . hl-todo-UNUSED)))) #+end_src -*** Code style -#+begin_src emacs-lisp -(setq ; c-default-style "bsd" - c-basic-offset 4) -(setq-default indent-tabs-mode nil) -#+end_src - ** Code suggestions *** company diff --git a/files/vim/.vimrc b/files/vim/.vimrc index ca24a08..bde849a 100644 --- a/files/vim/.vimrc +++ b/files/vim/.vimrc @@ -14,8 +14,9 @@ endif call plug#begin() Plug 'altercation/vim-colors-solarized' " color scheme -Plug 'tpope/vim-sleuth' " heuristic file indendation -Plug 'jiangmiao/auto-pairs' " pair completion +Plug 'tpope/vim-sleuth' " heuristic file indendation +Plug 'jiangmiao/auto-pairs' " pair completion +Plug 'ctrlpvim/ctrlp.vim' " file finder call plug#end() " ============================== Colors @@ -26,43 +27,44 @@ hi Normal guibg=NONE ctermbg=NONE " ============================== General filetype indent plugin on -set number " show line number -set relativenumber " show relative line number -set cursorline " highlight current line -set ruler " show line and row at bottom right +set number " show line number +set relativenumber " show relative line number +set cursorline " highlight current line +set ruler " show line and row at bottom right +set colorcolumn=80 -set showmatch " highlights paranthesis -set hidden " allow moving to a new buffer without saving -set mat=5 " idk -set colorcolumn=1337 -set noswapfile " can be problematic on some systems -set confirm " can't quit without saving -set noshowmode " don't show mode in status -set noshowcmd " don't show command in status +set showmatch " highlights paranthesis +set hidden " allow moving to a new buffer without saving +set noswapfile " don't create a swap file +set confirm " can't quit without saving +set noshowmode " don't show mode in status +set noshowcmd " don't show command in status set encoding=utf-8 -set mouse=a " a=on, c=off +set mouse=a " a=on, c=off set undolevels=1337 -set backspace=indent,eol,start " openbsd doesnt let me delete stuff -set wildmenu " autocomplete :e -set scrolloff=5 " min lines above or below the cursor +set backspace=indent,eol,start " always delete with backspace" +set wildmenu " autocomplete :e +set scrolloff=5 " minimum lines above or below the cursor " ============================== Statusline -set laststatus=1 " i dont need a statusline -set showtabline=1 " tabline +set laststatus=1 " dont show statusline +set showtabline=1 " dont show tabline " ============================== Indents and Whitespaces set list -set listchars=tab:──\ ,extends:›,precedes:‹,nbsp:·,trail:· -set fillchars+=vert:\ "don't draw verticle split +set listchars=tab:──\ ,extends:›,precedes:‹,nbsp:·,trail:· " show chars for whitespaces +set fillchars+=vert:\ " don't draw verticle split +" show trailing whitespaces in red highlight ExtraWhitespace ctermbg=red guibg=red match ExtraWhitespace /\s\+\%#\@ unless capitol letters -set hlsearch " highlight all results +set smartcase " -> unless capitol letters +set hlsearch " highlight all results +set mat=5 " ============================== Cursor Thiccness let &t_SI = "\[6 q" @@ -70,12 +72,9 @@ let &t_SR = "\[4 q" let &t_EI = "\[2 q" " ============================== netrw -let g:netrw_winsize = 25 " width +let g:netrw_winsize = 25 " width let g:netrw_liststyle = 3 " Tree-like structure -let g:netrw_banner = 0 " Remove useless banner at the top of netrw +let g:netrw_banner = 0 " Remove useless banner at the top of netrw " ============================== Macros and Mappings -cmap Wq wq -cmap Q q -cmap W w -cmap q1 q! +map e :CtrlP " file find