Autoformatting of nix files

.vimrc.plugins-settings

@@ -3,6 +3,8 @@ let g:bufferline_echo = 0
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 
+au BufWrite * :Autoformat
+
 " plugins: rust
 let g:rustfmt_autosave = 1
 

.vimrc.settings

@@ -50,4 +50,3 @@ augroup END
 " vimdiff
 set diffopt+=iwhite
 set diffexpr=""
-

nixos/boxes/foureighty.nix

@@ -81,4 +81,4 @@
           ../gfx-intel.nix
           ../virtualbox.nix
           ];
-}
+          }

nixos/boxes/skinnyv.nix

@@ -27,4 +27,4 @@
       ../gfx-intel.nix
       ../virtualbox.nix
     ];
-}
+  }

nixos/boxes/thinky.nix

@@ -21,4 +21,4 @@
       ../common.nix
       ../gfx-intel.nix
     ];
-}
+  }

nixos/common.nix

@@ -4,7 +4,7 @@ let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
   etesync-dav = import ./packages/etesync-dav/default.nix;
 in
-{
+  {
     imports =
       [
         ./vscode.nix
@@ -106,5 +106,5 @@ in
       nix.gc.automatic = true;
       system.autoUpgrade.enable = true;
       system.stateVersion = "19.03";
-}
+    }
 

nixos/home.nix

@@ -3,7 +3,7 @@
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
 in
-{
+  {
     nixpkgs.config = {
       allowUnfree = true;
       packageOverrides = pkgs: {
@@ -28,43 +28,13 @@ in
     ];
     imports = [
       ./programs/zsh.nix
+      ./programs/vim.nix
       ./programs/alacritty.nix
     ];
 
     programs = {
       home-manager.enable = true;
 
-    vim = {
-      enable = true;
-      extraConfig = builtins.readFile ~/dev/dotfiles/.vimrc.nixos;
-      plugins = [
-        "vim-gitgutter"
-        "vim-toml"
-        "vim-autoformat"
-        "editorconfig-vim"
-        "tabular"
-        "vim-colors-solarized"
-        "fzf-vim"
-        "ctrlp-vim"
-        "vim-nix"
-        "vim-startify"
-        "ack-vim"
-        "vim-markdown"
-        "rust-vim"
-        "nerdtree"
-        "vim-dispatch"
-        "deoplete-nvim"
-        "deoplete-go"
-        "vim-fugitive"
-        "vim-sensible"
-        "vim-surround"
-        "vim-airline"
-        "vim-airline-themes"
-        "vim-dirdiff"
-        "nerdtree-git-plugin"
-      ];
-    };
-
       fzf.enable = true;
       tmux = {
         enable = true;
@@ -79,4 +49,4 @@ in
       go.enable = true;
       bat.enable = true;
     };
-}
+  }

nixos/programs/vim.nix

@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+{
+  programs.vim = {
+    enable = true;
+    extraConfig = builtins.readFile ~/dev/dotfiles/.vimrc.nixos;
+    plugins = [
+      "vim-gitgutter"
+      "vim-toml"
+      "vim-autoformat"
+      "editorconfig-vim"
+      "tabular"
+      "vim-colors-solarized"
+      "fzf-vim"
+      "ctrlp-vim"
+      "vim-nix"
+      "vim-startify"
+      "ack-vim"
+      "vim-markdown"
+      "rust-vim"
+      "nerdtree"
+      "vim-dispatch"
+      "deoplete-nvim"
+      "deoplete-go"
+      "vim-fugitive"
+      "vim-sensible"
+      "vim-surround"
+      "vim-airline"
+      "vim-airline-themes"
+      "vim-dirdiff"
+      "nerdtree-git-plugin"
+    ];
+  };
+}

nixos/syncthing.nix

@@ -2,7 +2,7 @@
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
 in
-{
+  {
     nixpkgs.config = {
       packageOverrides = pkgs: {
         unstable = import unstableTarball {
@@ -17,4 +17,4 @@ in
       openDefaultPorts = true;
       package = pkgs.unstable.syncthing;
     };
-}
+  }

nixos/virtualbox.nix

@@ -2,7 +2,7 @@
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
 in
-{
+  {
     nixpkgs.config = {
       packageOverrides = pkgs: {
         unstable = import unstableTarball {
@@ -15,4 +15,4 @@ in
       enableExtensionPack = true;
       enableHardening = false;
     };
-}
+  }

nixos/vscode.nix

@@ -3,7 +3,7 @@
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
 in
-{
+  {
     nixpkgs.config = {
       allowUnfree = true;
       packageOverrides = pkgs: {
@@ -153,4 +153,4 @@ in
           ];})
         ];
       };
-}
+    }