From bb1bab2f2f942e7cf0d778060e28b5f65546b92c Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <depasquale+git@giugl.io>
Date: Thu, 13 Oct 2022 18:08:08 +0200
Subject: [PATCH] Added vimExtraPlugins

---
 flake.nix    |  9 +++++--
 lib/host.nix | 66 ++++++++++++++++++++++++++--------------------------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7fe3a67..49190b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,16 +6,21 @@
       url = "github:rycee/home-manager/release-22.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    vim-extra-plugins.url = "github:m15a/nixpkgs-vim-extra-plugins";
   };
 
-  outputs = inputs@{ self, nixpkgs, nixos-unstable, home-manager}:
+  outputs =
+    inputs@{ self, nixpkgs, nixos-unstable, home-manager, vim-extra-plugins }:
     let
       system = "x86_64-linux";
 
       pkgs = import nixpkgs {
         inherit system;
         config.allowUnfree = true;
-        overlays = [ (final: prev: { inherit unstable; }) ];
+        overlays = [
+          (final: prev: { inherit unstable; })
+          vim-extra-plugins.overlays.default
+        ];
       };
 
       unstable = import nixos-unstable {
diff --git a/lib/host.nix b/lib/host.nix
index 4513efb..1c92a54 100644
--- a/lib/host.nix
+++ b/lib/host.nix
@@ -1,44 +1,44 @@
 { pkgs, nixpkgs, nixos-unstable, unstable, home-manager, user, ... }:
 
 {
-  mkHost = { name, users, roles ? [], imports ? [] }: 
-  let
-    system = "x86_64-linux";
+  mkHost = { name, users, roles ? [ ], imports ? [ ] }:
+    let
+      system = "x86_64-linux";
 
-    mkRole = role : import (../roles + "/${role}.nix");
+      mkRole = role: import (../roles + "/${role}.nix");
 
-    users_mod= (map (u: user.mkUser {name = u.user; roles = u.roles; }) users);
-    roles_mod = (map (r: mkRole r) roles);
-    add_imports = imports;
-  in nixpkgs.lib.nixosSystem {
-    inherit system;
+      users_mod = (map (u:
+        user.mkUser {
+          name = u.user;
+          roles = u.roles;
+        }) users);
+      roles_mod = (map (r: mkRole r) roles);
+      add_imports = imports;
+    in nixpkgs.lib.nixosSystem {
+      inherit system;
 
-    modules = [ 
-      {
-        imports = users_mod ++ roles_mod ++ add_imports;
-        nixpkgs = {
-          pkgs = pkgs;
-        };
+      modules = [
+        {
+          imports = users_mod ++ roles_mod ++ add_imports;
+          nixpkgs = { inherit pkgs; };
 
-        nix.nixPath = [ 
-          "nixpkgs=${nixpkgs}" 
-          "unstable=${nixos-unstable}"
-        ];
-        nix.registry.nixpkgs.flake = nixpkgs;
-        nix.registry.unstable.flake = nixos-unstable;
+          nix.nixPath = [ "nixpkgs=${nixpkgs}" "unstable=${nixos-unstable}" ];
+          nix.registry.nixpkgs.flake = nixpkgs;
+          nix.registry.unstable.flake = nixos-unstable;
 
-        users.users.root = {
-          shell = pkgs.zsh;
-        };
+          users.users.root = { shell = pkgs.zsh; };
 
-        home-manager.users.root.imports = [ ../roles/home/common.nix ];
-        home-manager.extraSpecialArgs.unstable = unstable;
-      }
+          home-manager = {
+            users.root.imports = [ ../roles/home/common.nix ];
+            extraSpecialArgs.unstable = unstable;
+            useGlobalPkgs = true;
+          };
+        }
 
-      home-manager.nixosModules.home-manager
-      ../roles/common.nix
-      ../roles/acme.nix
-      ../hosts/${name}/default.nix
-    ];
-  };
+        home-manager.nixosModules.home-manager
+        ../roles/common.nix
+        ../roles/acme.nix
+        ../hosts/${name}/default.nix
+      ];
+    };
 }