From c653be7cf2296911cf85d22606b2ce83a6cbf9ef Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 13 May 2023 11:31:13 +0200 Subject: [PATCH] folders? --- flake.nix | 2 +- home-manager.nix => home/default.nix | 61 ++++++++++++++-------------- 2 files changed, 31 insertions(+), 32 deletions(-) rename home-manager.nix => home/default.nix (98%) diff --git a/flake.nix b/flake.nix index 7387f66..4c85636 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = { inherit inputs; }; modules = [ - ./home-manager.nix + ./home ]; }; }; diff --git a/home-manager.nix b/home/default.nix similarity index 98% rename from home-manager.nix rename to home/default.nix index bc1d7af..75017b0 100644 --- a/home-manager.nix +++ b/home/default.nix @@ -48,39 +48,13 @@ programs.neovim = { enable = true; defaultEditor = true; - extraConfig = '' - let mapleader=" " - let maplocalleader="\\" - - set colorcolumn=+1 - set expandtab - set ignorecase - set iskeyword+=ä,Ä,ö,Ö,ü,Ü,ß - set linebreak - set list listchars=tab:»\ ,trail:·,nbsp:~ - set number - set relativenumber - set scrolloff=7 - set shell=/bin/sh - set shiftwidth=2 - set shortmess=FfmnxoTIc - set signcolumn=no - set smartcase - set softtabstop=2 - set spelllang=en_us,de_20 - set splitbelow - set splitright - set tabstop=2 - set updatetime=300 - - let g:netrw_liststyle = 3 - let g:netrw_fastbrowse = 0 - ''; plugins = with pkgs.vimPlugins; [ # todo: pandoc, completion, lsp { plugin = fzf-vim; config = '' + let maplocalleader="\\" + let mapleader=" " nnoremap :Buffers imap (fzf-complete-path) nnoremap o :Files @@ -146,7 +120,6 @@ vim-fish vim-nix vim-repeat - { plugin = vim-slime; config = '' @@ -162,13 +135,39 @@ " autocmd TermOpen * let g:slime_default_config = {"jobid": &channel} ''; } - vim-snippets vim-speeddating vim-surround - vim-surround vim-unimpaired ]; + extraConfig = '' + let mapleader=" " + let maplocalleader="\\" + + set colorcolumn=+1 + set expandtab + set ignorecase + set iskeyword+=ä,Ä,ö,Ö,ü,Ü,ß + set linebreak + set list listchars=tab:»\ ,trail:·,nbsp:~ + set number + set relativenumber + set scrolloff=7 + set shell=/bin/sh + set shiftwidth=2 + set shortmess=FfmnxoTIc + set signcolumn=no + set smartcase + set softtabstop=2 + set spelllang=en_us,de_20 + set splitbelow + set splitright + set tabstop=2 + set updatetime=300 + + let g:netrw_liststyle = 3 + let g:netrw_fastbrowse = 0 + ''; }; home.shellAliases = {