steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix/home-manger/neovim: theming and yaml config

Browse source
This commit is contained in:
steveej 2018-12-17 13:14:22 +01:00
parent 194c2aaf9c
commit 8803f835b8
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nix/home-manager/programs/neovim.nix
View file

@ -54,6 +54,17 @@ in {
buildInputs = [ zip vim ]; buildInputs = [ zip vim ];
}; };
vim-yaml = vimUtils.buildVimPlugin {
name = "vim-yaml";
src = fetchFromGitHub {
owner = "stephpy";
repo = "vim-yaml";
rev = "e97e063b16eba4e593d620676a0a15fa98613979";
sha256 = "0vqahbrnr43lxanpziyrmzaqqb3cmyny8ry1xvmy2xyd1larzfrk";
};
};
vim-markdown-toc = vimUtils.buildVimPlugin { vim-markdown-toc = vimUtils.buildVimPlugin {
name = "vim-markdown-toc"; name = "vim-markdown-toc";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -88,6 +99,7 @@ in {
default = [ default = [
"delimitMate" "delimitMate"
"vim-airline" "vim-airline"
"vim-airline-themes"
"ctrlp" "ctrlp"
"vim-css-color" "vim-css-color"
"rainbow_parentheses" "rainbow_parentheses"
@ -123,6 +135,7 @@ in {
# YAML # YAML
"yaml-folds" "yaml-folds"
"vim-yaml"
# Perl # Perl
# "vim-perl" # "vim-perl"

8
nix/home-manager/programs/neovim/vimrc
View file

@ -53,14 +53,18 @@ let g:ctrlp_custom_ignore = {
"let g:ctrlp_match_func = { 'match': 'pymatcher#PyMatch' } "let g:ctrlp_match_func = { 'match': 'pymatcher#PyMatch' }
"let g:pydiction_location = '~/.vim/bundle/pydiction/complete-dict' "let g:pydiction_location = '~/.vim/bundle/pydiction/complete-dict'
" allways show status line " always show status line
set ls=2 set ls=2
" let g:airline#extensions#tabline#formatter = 'default'
" let g:airline#extensions#tabline#enabled=1
let g:airline_theme='papercolor'
set tabstop=4 set tabstop=4
set shiftwidth=4 set shiftwidth=4
set softtabstop=4 set softtabstop=4
set expandtab set expandtab
"set textwidth=80 "set textwidth=80
set backspace=indent,eol,start set backspace=indent,eol,start
set wildignore+=*/site/*,*.so,*.swp,*.zip set wildignore+=*/site/*,*.so,*.swp,*.zip
@ -124,7 +128,7 @@ augroup END
" YAML {{{ " YAML {{{
augroup ft_yaml augroup ft_yaml
au! au!
setlocal autoindent sw=2 et tabstop=2 shiftwidth=2 softtabstop=2 setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab
augroup END augroup END
" }}} " }}}

3
nix/os/devices/default.nix
View file

@ -23,12 +23,13 @@ let
else else
"" ""
} }
nixos-rebuild -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs} nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
if test -L result; then if test -L result; then
rm result rm result
fi fi
''; '';
in { in {
recipes = { recipes = {
inherit rebuild; inherit rebuild;