From 92f7a4c2a2f79a29f3a20df301dda1b378ae25f8 Mon Sep 17 00:00:00 2001
From: Till <till@ktiu.net>
Date: Sat, 13 May 2023 12:21:59 +0200
Subject: [PATCH] everythign is easier than i think

---
 home/config.vim                     | 53 +++++++++++++++++++++++++++++
 home/default.nix                    |  2 +-
 home/nvim/autocommands.vim          | 17 +++++++++
 home/{nvim.nix => nvim/default.nix} | 36 ++++----------------
 4 files changed, 78 insertions(+), 30 deletions(-)
 create mode 100644 home/config.vim
 create mode 100644 home/nvim/autocommands.vim
 rename home/{nvim.nix => nvim/default.nix} (78%)

diff --git a/home/config.vim b/home/config.vim
new file mode 100644
index 0000000..9f8aafa
--- /dev/null
+++ b/home/config.vim
@@ -0,0 +1,53 @@
+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
+
+nnoremap <leader>ve :edit $MYVIMRC<return>
+nnoremap <leader>vs :source $MYVIMRC<return>
+
+nnoremap Y y$
+
+nnoremap gF :edit <cfile><return>
+nnoremap gx :! xdg-open <cfile><return>
+
+nnoremap <silent> <tab> :bnext<return>
+nnoremap <silent> Q :bdelete<return>
+nnoremap <c-h> <c-w>h
+nnoremap <c-j> <c-w>j
+nnoremap <c-k> <c-w>k
+nnoremap <c-l> <c-w>l
+nnoremap <c-q> :hide<return>
+
+nnoremap <leader>m :make<return>
+
+tnoremap <esc> <c-\><c-n>
+
+xnoremap il g_o^
+onoremap <silent> il :normal vil<return>
+xnoremap al $o0
+onoremap <silent> al :normal val<return>
+xnoremap i% GoggV
+onoremap <silent> i% :normal vi%<return>
diff --git a/home/default.nix b/home/default.nix
index d41010c..2d942ef 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -34,7 +34,7 @@
 
   imports = [
     ./R.nix
-    ./nvim.nix
+    ./nvim
   ];
 
   home.shellAliases = {
diff --git a/home/nvim/autocommands.vim b/home/nvim/autocommands.vim
new file mode 100644
index 0000000..09fee23
--- /dev/null
+++ b/home/nvim/autocommands.vim
@@ -0,0 +1,17 @@
+augroup markdown
+  autocmd!
+  autocmd BufNewFile,BufRead *.Rmd,*.rmd set ft=rmd
+  autocmd BufNewFile,BufRead *.md,*.markdown set ft=markdown
+  autocmd BufNewFile,BufRead *.md,*.markdown set syntax=rmd
+augroup end
+
+augroup netrw
+  autocmd!
+  autocmd FileType netrw setl bufhidden=wipe
+augroup end
+
+augroup repl
+  autocmd!
+  autocmd TermOpen * setlocal nonumber norelativenumber
+  autocmd TermOpen * nmap <buffer> Q :bdelete!<enter>
+augroup end
diff --git a/home/nvim.nix b/home/nvim/default.nix
similarity index 78%
rename from home/nvim.nix
rename to home/nvim/default.nix
index bf8a3a8..2a368fe 100644
--- a/home/nvim.nix
+++ b/home/nvim/default.nix
@@ -2,10 +2,11 @@
 
 {
   programs.neovim = {
+    extraConfig = import ./config.vim;
     enable = true;
     defaultEditor = true;
     plugins = with pkgs.vimPlugins; [
-      # todo: pandoc, completion, lsp
+      # todo: SNIPPETS pandoc, completion, lsp
       {
         plugin = fzf-vim;
         config = ''
@@ -96,33 +97,10 @@
       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
-    '';
   };
+  xdg.configFile."nvim/autocommmands.vim".source = ./autocommands.vim;
+  xdg.configFile."nvim/ftplugin/markdown.vim".source = ./ftplugin/markdown.vim;
+  xdg.configFile."nvim/ftplugin/r.vim".source = ./ftplugin/r.vim;
+  xdg.configFile."nvim/ftplugin/rmd.vim".source = ./ftplugin/rmd.vim;
+  xdg.configFile."nvim/syntax/rmd.vim".source = ./syntax/rmd.vim;
 }