diff --git a/config.nix b/config.nix index 013c0be4dc3ff3a2995ee4960f97439d32bcf3be..3978417c411e65f0c880733198f34ef5b547fc11 100644 --- a/config.nix +++ b/config.nix @@ -4,5 +4,4 @@ }: { username = "jolheiser"; domain = "jolheiser.com"; - importDir = dir: map (name: dir + "/${name}") (builtins.attrNames (builtins.readDir dir)); } diff --git a/dragonwell/default.nix b/dragonwell/default.nix index a30adb507b117145ef5cc89c0d8c28756c8e9749..888c7038aa7023b9eb2aabf4d9522b832d409ddf 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -1,9 +1,9 @@ -{ jolheiser, ... }: +{ jolheiser, importDir, ... }: let key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa"; in { - imports = jolheiser.importDir ./services ++ [ ./hardware.nix ]; + imports = importDir ./services ++ [ ./hardware.nix ]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/flake.nix b/flake.nix index 6a1dc175e59ba0c6330a24f378a0885a905e11a1..a8d4eaa3f4c5f999ca011febe6a8928e0c34075d 100644 --- a/flake.nix +++ b/flake.nix @@ -41,13 +41,14 @@ 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; + inherit jolheiser inputs importDir; }; }; dragonwell.imports = [ diff --git a/gunpowder/default.nix b/gunpowder/default.nix index 0e16cbdee6773015eb0cd71ee7021e766c2bad96..19fa4cbb4b0e1e97dce81efb189f529882b9d245 100644 --- a/gunpowder/default.nix +++ b/gunpowder/default.nix @@ -1,9 +1,9 @@ -{ jolheiser, pkgs, ... }: +{ jolheiser, pkgs, importDir, ... }: let key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJh5aUDN/KN28+4tbayXRQliLyKFZaCZtUMEBNaJfHYj"; in { - imports = jolheiser.importDir ./services ++ [ ./hardware.nix ]; + imports = importDir ./services ++ [ ./hardware.nix ]; boot = { kernelPackages = pkgs.linuxPackages_latest; diff --git a/jasmine/default.nix b/jasmine/default.nix index 7ae2553dfe3019cad51567357808f54a20a6cdd4..fdae0fde6c5106d2e84ff3257deaebd34685bea7 100644 --- a/jasmine/default.nix +++ b/jasmine/default.nix @@ -1,9 +1,9 @@ -{ jolheiser, pkgs, ... }: +{ jolheiser, pkgs, importDir, ... }: let key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7cgpIUaEY3q12xBct9a0gIl7rdckBBPsWQea7Wtj7P"; in { - imports = jolheiser.importDir ./services ++ [ ./hardware.nix ]; + imports = importDir ./services ++ [ ./hardware.nix ]; boot.loader.grub = { enable = true; diff --git a/shincha/default.nix b/shincha/default.nix index c0b201afbcc2509a3fd47c7227fbe37efe6f852e..3cd4a23b071cee2d2ef9e614e25fd3d6967b4d53 100644 --- a/shincha/default.nix +++ b/shincha/default.nix @@ -1,9 +1,9 @@ -{ jolheiser, ... }: +{ jolheiser, importDir, ... }: let key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBxdG9mduIWiQ+egYKMvUKKCyShdeM8O6QsLs6g5aGt"; in { - imports = jolheiser.importDir ./services ++ [ ./hardware.nix ]; + imports = importDir ./services ++ [ ./hardware.nix ]; boot.loader.grub = { enable = true;