diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
| commit | 0b0b0d65ee05583529df831985580e392713d29a (patch) | |
| tree | 7eb6799a996924d8e895c54633a47ea3d7a92a4c /miefda | |
| parent | 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff) | |
| parent | b7a92f63884af00eb0243ec9328be689a6c9b845 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'miefda')
| -rw-r--r-- | miefda/1systems/bobby.nix | 2 | ||||
| -rw-r--r-- | miefda/2configs/git.nix | 2 | ||||
| -rw-r--r-- | miefda/2configs/miefda.nix | 2 | ||||
| -rw-r--r-- | miefda/2configs/tinc-basic-retiolum.nix | 3 | ||||
| -rw-r--r-- | miefda/2configs/tlp.nix | 2 | ||||
| -rw-r--r-- | miefda/2configs/x220t.nix | 2 | ||||
| -rw-r--r-- | miefda/5pkgs/default.nix | 1 | ||||
| -rw-r--r-- | miefda/default.nix | 6 |
8 files changed, 12 insertions, 8 deletions
diff --git a/miefda/1systems/bobby.nix b/miefda/1systems/bobby.nix index d24595256..b85e686b5 100644 --- a/miefda/1systems/bobby.nix +++ b/miefda/1systems/bobby.nix @@ -7,7 +7,7 @@ { imports = [ # Include the results of the hardware scan. - + ../. ../2configs/miefda.nix ../2configs/tlp.nix ../2configs/x220t.nix diff --git a/miefda/2configs/git.nix b/miefda/2configs/git.nix index fec828f80..052cc4ab2 100644 --- a/miefda/2configs/git.nix +++ b/miefda/2configs/git.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; let diff --git a/miefda/2configs/miefda.nix b/miefda/2configs/miefda.nix index 545987a68..f17e8aa34 100644 --- a/miefda/2configs/miefda.nix +++ b/miefda/2configs/miefda.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { #networking.wicd.enable = true; diff --git a/miefda/2configs/tinc-basic-retiolum.nix b/miefda/2configs/tinc-basic-retiolum.nix index 153b41d78..f82fd6b03 100644 --- a/miefda/2configs/tinc-basic-retiolum.nix +++ b/miefda/2configs/tinc-basic-retiolum.nix @@ -1,10 +1,9 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { krebs.retiolum = { enable = true; - hosts = ../../krebs/Zhosts; connectTo = [ "gum" "pigstarter" diff --git a/miefda/2configs/tlp.nix b/miefda/2configs/tlp.nix index 0e1bb0d6b..32f4f2ee7 100644 --- a/miefda/2configs/tlp.nix +++ b/miefda/2configs/tlp.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { hardware.enableAllFirmware = true; nixpkgs.config.allowUnfree = true; diff --git a/miefda/2configs/x220t.nix b/miefda/2configs/x220t.nix index bea84f796..2d128e533 100644 --- a/miefda/2configs/x220t.nix +++ b/miefda/2configs/x220t.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { services.xserver = { diff --git a/miefda/5pkgs/default.nix b/miefda/5pkgs/default.nix deleted file mode 100644 index 2eb33a153..000000000 --- a/miefda/5pkgs/default.nix +++ /dev/null @@ -1 +0,0 @@ -_:{} diff --git a/miefda/default.nix b/miefda/default.nix new file mode 100644 index 000000000..7f275c2eb --- /dev/null +++ b/miefda/default.nix @@ -0,0 +1,6 @@ +_: +{ + imports = [ + ../krebs + ]; +} |