From bb2ced8b81a01adda1b3f454102152283c84dace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Tue, 8 Mar 2022 09:56:54 +0000
Subject: [PATCH] cleanup vim config around formatting

---
 .vimrc                              |  3 ++-
 .vimrc.filetypes                    |  2 ++
 .vimrc.nixos                        |  3 ---
 .vimrc.plugins-settings             |  1 +
 nixos/home-manager/programs/vim.nix | 12 +++++-------
 5 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 .vimrc.filetypes
 delete mode 100755 .vimrc.nixos

diff --git a/.vimrc b/.vimrc
index 52e24b4e..366ae4fe 100755
--- a/.vimrc
+++ b/.vimrc
@@ -1,4 +1,5 @@
-source ~/dev/dotfiles/.vimrc.plugins
 source ~/dev/dotfiles/.vimrc.plugins-settings
+source ~/dev/dotfiles/.vimrc.filetypes
 source ~/dev/dotfiles/.vimrc.settings
 source ~/dev/dotfiles/.vimrc.keymap
+
diff --git a/.vimrc.filetypes b/.vimrc.filetypes
new file mode 100644
index 00000000..b8216012
--- /dev/null
+++ b/.vimrc.filetypes
@@ -0,0 +1,2 @@
+autocmd FileType yaml let b:autoformat_autoindent=0
+let g:run_all_formatters_yaml = 0
diff --git a/.vimrc.nixos b/.vimrc.nixos
deleted file mode 100755
index 47feaefc..00000000
--- a/.vimrc.nixos
+++ /dev/null
@@ -1,3 +0,0 @@
-source ~/dev/dotfiles/.vimrc.plugins-settings
-source ~/dev/dotfiles/.vimrc.settings
-source ~/dev/dotfiles/.vimrc.keymap
diff --git a/.vimrc.plugins-settings b/.vimrc.plugins-settings
index a403efd2..6d316dbf 100644
--- a/.vimrc.plugins-settings
+++ b/.vimrc.plugins-settings
@@ -4,6 +4,7 @@ let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 
 au BufWrite * :Autoformat
+" let g:autoformat_verbosemode=1
 
 " searching
 let $FZF_DEFAULT_COMMAND = 'rga --files --no-messages "" .'
diff --git a/nixos/home-manager/programs/vim.nix b/nixos/home-manager/programs/vim.nix
index 1aa3facc..a1199ffe 100644
--- a/nixos/home-manager/programs/vim.nix
+++ b/nixos/home-manager/programs/vim.nix
@@ -1,9 +1,6 @@
-{ config, pkgs, ... }:
-{
-  home.file.".vimrc".source = ../../../.vimrc.nixos;
-  home.packages = with pkgs; [
-    ripgrep
-  ];
+{ config, pkgs, inputs, ... }: {
+  home.file.".vimrc".source = ../../../.vimrc;
+  home.packages = with pkgs; [ ripgrep ];
   programs.neovim = {
     enable = true;
     viAlias = true;
@@ -18,6 +15,7 @@
       coc-highlight
       coc-nvim
       coc-rust-analyzer
+      coc-yaml
       ctrlp-vim
       editorconfig-vim
       fzf-vim
@@ -42,7 +40,7 @@
     ];
     extraConfig = ''
       if filereadable($HOME . "/.vimrc")
-      source $HOME/.vimrc
+        source $HOME/.vimrc
       endif
     '';
   };