From 86f84049619b1b22482797d69b0894a5ceffdafc Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 2 Apr 2018 19:29:11 +0200 Subject: [PATCH] Tweake vim configs --- home-common/configs/vimrc | 68 ++++++++++++++++++++++++++ home-common/configs/zshrc | 29 +++++++++++ home-common/default.nix | 80 ++----------------------------- home-common/graphical/default.nix | 2 +- 4 files changed, 101 insertions(+), 78 deletions(-) create mode 100644 home-common/configs/vimrc create mode 100644 home-common/configs/zshrc diff --git a/home-common/configs/vimrc b/home-common/configs/vimrc new file mode 100644 index 00000000..ae29720d --- /dev/null +++ b/home-common/configs/vimrc @@ -0,0 +1,68 @@ +set spell spelllang=de,en +set background=dark +set autoindent +set nosmartindent +set listchars=tab:»\ ,trail:.,extends:# +set list +set ts=3 +set number +set scrolloff=5 +set sidescrolloff=5 +set laststatus=2 +set incsearch +set mouse= +set dir=~/.vimhist/ +set backupdir=~/.vimhist/bak +set showcmd +nnoremap :nohlsearch +vnoremap < >gv u +nnoremap +nnoremap +nnoremap +nnoremap +nnoremap gT +nnoremap gt + +set colorcolumn=81,121 +hi ColorColumn ctermbg=black + +set winaltkeys=no +set noai +set si +set sw=3 +set pt= +set ignorecase +set wildmenu +set hlsearch +noremap gk +noremap gj +noremap g +noremap g +if !exists('g:deoplete#omni#input_patterns') + let g:deoplete#omni#input_patterns = {} +endif +set statusline+=%#warningmsg# +set statusline+=%{syntasticstatuslineflag()} +set statusline+=%* +let g:syntastic_always_populate_loc_list = 1 +let g:syntastic_auto_loc_list = 1 +let g:syntastic_check_on_open = 1 +let g:syntastic_check_on_wq = 0 +let g:syntastic_aggregate_errors = 1 +let g:syntastic_enable_highlighting = 0 +let g:syntastic_loc_list_height = 3 +let g:rustfmt_autosave = 1 +"let g:ycm_rust_src_path = '/usr/src/rust/src' +"let g:ftplugin_rust_source_path = '/usr/src/rust/src' +let g:syntastic_rust_checkers = [ 'cargo'] +let g:rust_recommend_style = 1 +let g:rust_fold =1 +let g:syntastic_rust_rustc_exe = 'cargo check' +let g:syntastic_rust_rustc_fname = "" +let g:syntastic_rust_rustc_args = '--' + +let g:deoplete#enable_at_startup = 1 +let g:deoplete#auto_complete_start_length = 1 + +let g:deoplete#sources#rust#racer_binary='racer' diff --git a/home-common/configs/zshrc b/home-common/configs/zshrc new file mode 100644 index 00000000..3ce4aec2 --- /dev/null +++ b/home-common/configs/zshrc @@ -0,0 +1,29 @@ +if [[ -z "$TMUX" ]] { + session=$(tmux ls | grep -v attached | head -1 | cut -f1 -d:) + if [[ -n $session ]] { + exec tmux attach -t $session; + } else { + exec tmux; + } +} +precmd() { + local s=$? c=( $(fc -l -d -1 ) ) + if [[ $launched && "''${c[2]}" != "0:00" ]] { + eventc command $([[ ''${s} == 0 ]] && echo success || echo failure) -d command="\"''${c[3,-1]}\"" -d time="\"''${c[2]}\"" -d host="\"$host\"" + } else { + export launched=true; + } +} + +alias c=cdr +alias s='sudo systemctl' +alias u='systemctl --user' +alias m=man +alias t="tmux attach" +alias tn="tmux new-session" +alias w="develop-here" +alias ls=exa + +export BROWSER=qutebrowser +export EDITOR=nvim +export MANPAGER="most -s" diff --git a/home-common/default.nix b/home-common/default.nix index 92eabb58..0dd8b692 100644 --- a/home-common/default.nix +++ b/home-common/default.nix @@ -73,37 +73,7 @@ save = 100000; size = 100000; }; - initExtra = '' - if [[ -z "$TMUX" ]] { - session=$(tmux ls | grep -v attached | head -1 | cut -f1 -d:) - if [[ -n $session ]] { - exec tmux attach -t $session; - } else { - exec tmux; - } - } - precmd() { - local s=$? c=( $(fc -l -D -1 ) ) - if [[ $launched && "''${c[2]}" != "0:00" ]] { - eventc command $([[ ''${s} == 0 ]] && echo success || echo failure) -d command="\"''${c[3,-1]}\"" -d time="\"''${c[2]}\"" -d host="\"$HOST\"" - } else { - export launched=true; - } - } - - alias c=cdr - alias s='sudo systemctl' - alias u='systemctl --user' - alias m=man - alias t="tmux attach" - alias tn="tmux new-session" - alias w="develop-here" - alias ls=exa - - export BROWSER=qutebrowser - export EDITOR=nvim - export MANPAGER="most -s" - ''; + initExtra = builtins.readFile ./configs/zshrc; }; }; @@ -137,52 +107,7 @@ (pkgs.neovim.override { vimAlias = true; configure = { - customRC = '' - set spell spelllang=de,en - set background=dark - set autoindent - set nosmartindent - set listchars=tab:»\ ,trail:.,extends:# - set list - set ts=3 - set number - set scrolloff=5 - set sidescrolloff=5 - set laststatus=2 - set incsearch - set mouse= - set dir=~/.vimhist/ - set backupdir=~/.vimhist/bak - set showcmd - nnoremap :nohlsearch - vnoremap < >gv - nnoremap :nohlsearch - vnoremap < >gv u - nnoremap - nnoremap - nnoremap - nnoremap - nnoremap gT - nnoremap gt - - set colorcolumn=81,121 - hi ColorColumn ctermbg=black - - set winaltkeys=no - set noai - set si - set sw=3 - set pt= - set ignorecase - set wildmenu - set hlsearch - noremap gk - noremap gj - noremap g - noremap g - ''; + customRC = builtins.readFile ./configs/vimrc; packages.myVimPackage = with pkgs.vimPlugins; { start = [ deoplete-nvim @@ -200,6 +125,7 @@ vim-racer vim-pandoc nerdcommenter + vim-signify ]; }; }; diff --git a/home-common/graphical/default.nix b/home-common/graphical/default.nix index ef62f138..70ec1db7 100644 --- a/home-common/graphical/default.nix +++ b/home-common/graphical/default.nix @@ -19,7 +19,7 @@ in { "leisure" "config" ]; - terminal = "xterm"; + terminal = "urxvt"; colors = { "foreground" = "#dddbff"; "background" = "#05004a";