1
 2
 3
 4
 5
 6
 7
 8
 9
10

diff --git a/config.nix b/config.nix
index 3978417c411e65f0c880733198f34ef5b547fc11..013c0be4dc3ff3a2995ee4960f97439d32bcf3be 100644
--- a/config.nix
+++ b/config.nix
@@ -4,4 +4,5 @@ }:
 {
   username = "jolheiser";
   domain = "jolheiser.com";
+  importDir = dir: map (name: dir + "/${name}") (builtins.attrNames (builtins.readDir dir));
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16

diff --git a/dragonwell/default.nix b/dragonwell/default.nix
index 888c7038aa7023b9eb2aabf4d9522b832d409ddf..a30adb507b117145ef5cc89c0d8c28756c8e9749 100644
--- a/dragonwell/default.nix
+++ b/dragonwell/default.nix
@@ -1,9 +1,9 @@
-{ jolheiser, importDir, ... }:
+{ jolheiser, ... }:
 let
   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa";
 in
 {
-  imports = importDir ./services ++ [ ./hardware.nix ];
+  imports = jolheiser.importDir ./services ++ [ ./hardware.nix ];
 
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20

diff --git a/flake.nix b/flake.nix
index a8d4eaa3f4c5f999ca011febe6a8928e0c34075d..6a1dc175e59ba0c6330a24f378a0885a905e11a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,14 +41,13 @@     let
       system = "x86_64-linux";
       pkgs = import inputs.nixpkgs { inherit system; };
       jolheiser = import ./config.nix { inherit pkgs; };
-      importDir = dir: map (name: dir + "/${name}") (builtins.attrNames (builtins.readDir dir));
     in
     {
       colmena = {
         meta = {
           nixpkgs = import nixpkgs { inherit system; };
           specialArgs = {
-            inherit jolheiser inputs importDir;
+            inherit jolheiser inputs;
           };
         };
         dragonwell.imports = [

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16

diff --git a/gunpowder/default.nix b/gunpowder/default.nix
index 19fa4cbb4b0e1e97dce81efb189f529882b9d245..0e16cbdee6773015eb0cd71ee7021e766c2bad96 100644
--- a/gunpowder/default.nix
+++ b/gunpowder/default.nix
@@ -1,9 +1,9 @@
-{ jolheiser, pkgs, importDir, ... }:
+{ jolheiser, pkgs, ... }:
 let
   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJh5aUDN/KN28+4tbayXRQliLyKFZaCZtUMEBNaJfHYj";
 in
 {
-  imports = importDir ./services ++ [ ./hardware.nix ];
+  imports = jolheiser.importDir ./services ++ [ ./hardware.nix ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16

diff --git a/jasmine/default.nix b/jasmine/default.nix
index fdae0fde6c5106d2e84ff3257deaebd34685bea7..7ae2553dfe3019cad51567357808f54a20a6cdd4 100644
--- a/jasmine/default.nix
+++ b/jasmine/default.nix
@@ -1,9 +1,9 @@
-{ jolheiser, pkgs, importDir, ... }:
+{ jolheiser, pkgs, ... }:
 let
   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7cgpIUaEY3q12xBct9a0gIl7rdckBBPsWQea7Wtj7P";
 in
 {
-  imports = importDir ./services ++ [ ./hardware.nix ];
+  imports = jolheiser.importDir ./services ++ [ ./hardware.nix ];
 
   boot.loader.grub = {
     enable = true;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16

diff --git a/shincha/default.nix b/shincha/default.nix
index 3cd4a23b071cee2d2ef9e614e25fd3d6967b4d53..c0b201afbcc2509a3fd47c7227fbe37efe6f852e 100644
--- a/shincha/default.nix
+++ b/shincha/default.nix
@@ -1,9 +1,9 @@
-{ jolheiser, importDir, ... }:
+{ jolheiser, ... }:
 let
   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBxdG9mduIWiQ+egYKMvUKKCyShdeM8O6QsLs6g5aGt";
 in
 {
-  imports = importDir ./services ++ [ ./hardware.nix ];
+  imports = jolheiser.importDir ./services ++ [ ./hardware.nix ];
 
   boot.loader.grub = {
     enable = true;