From f8df0090b6d82d5416865247fecd708a93c78834 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 10 Dec 2016 12:57:09 +0100
Subject: [PATCH] separate module eval and move example configuration

---
 default.nix                            | 25 +++++++++++++++
 config.nix => modules/examples/lnl.nix | 42 ++++++++------------------
 2 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 default.nix
 rename config.nix => modules/examples/lnl.nix (90%)

diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..6cffc27
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,25 @@
+{ pkgs ? import <nixpkgs> {}, config ? <darwin-config> }:
+
+let
+
+  eval = pkgs.lib.evalModules {
+    check = true;
+    args = { inherit pkgs; };
+    modules =
+      [ config
+        ./modules/system
+        ./modules/system/activation-scripts.nix
+        ./modules/system/defaults
+        ./modules/system/etc.nix
+        ./modules/system/launchd.nix
+        ./modules/environment
+        ./modules/launchd
+        ./modules/services/activate-system.nix
+        ./modules/services/nix-daemon.nix
+        ./modules/programs/tmux.nix
+        ./modules/programs/nix-darwin.nix
+      ];
+  };
+
+in
+  eval
diff --git a/config.nix b/modules/examples/lnl.nix
similarity index 90%
rename from config.nix
rename to modules/examples/lnl.nix
index 57d2764..8a3729f 100644
--- a/config.nix
+++ b/modules/examples/lnl.nix
@@ -2,24 +2,6 @@
 
 let
 
-  eval = pkgs.lib.evalModules
-    { check = true;
-      args = { pkgs = import <nixpkgs> {}; };
-      modules =
-        [ config
-          ./modules/system
-          ./modules/system/activation-scripts.nix
-          ./modules/system/defaults
-          ./modules/system/etc.nix
-          ./modules/system/launchd.nix
-          ./modules/environment
-          ./modules/launchd
-          ./modules/services/activate-system.nix
-          ./modules/services/nix-daemon.nix
-          ./modules/programs/tmux.nix
-        ];
-    };
-
   config =
     { config, lib, pkgs, ... }:
     {
@@ -179,14 +161,15 @@ let
       '';
     };
 
+  eval = import ../.. { inherit config; };
 
-in {
-  inherit eval;
+in
 
-  allowUnfree = true;
+{
+  inherit (eval) config;
+  inherit (eval.config.system) build;
 
   packageOverrides = self: {
-
     nixdarwin = eval.config.system.build;
 
     lnl.zsh = pkgs.runCommand pkgs.zsh.name
@@ -243,16 +226,17 @@ in {
 
         source $HOME/.vimrc.local
       '';
-      vimrcConfig.vam.knownPlugins = with pkgs.vimUtils; (pkgs.vimPlugins // {
-        vim-nix = buildVimPluginFrom2Nix {
-          name = "vim-nix-unstable";
-          src = ../vim-nix;
-        };
-      });
+      # vimrcConfig.vam.knownPlugins = with pkgs.vimUtils; (pkgs.vimPlugins // {
+      #   vim-nix = buildVimPluginFrom2Nix {
+      #     name = "vim-nix-unstable";
+      #     src = ../../../vim-nix;
+      #   };
+      # });
       vimrcConfig.vam.pluginDictionaries = [
         { names = [ "fzfWrapper" "youcompleteme" "fugitive" "surround" "vim-nix" "colors-solarized" ]; }
       ];
     };
-
   };
+
+  allowUnfree = true;
 }