about summary refs log tree commit diff
path: root/machines/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-06-22 01:10:57 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-06-22 01:22:49 +0200
commit3cc287e2683537722bdc15694b92c5985f9a1c4f (patch)
tree42fabc46c315bb80aab6a2b5530122a52270778d /machines/default.nix
parent3e94e96826f522c31e054bae1b5fd1af2cbfb309 (diff)
Move devhell's machines into machines/
In his configuration he had machine_common.nix which was imported from
the other machine_*.nix files. However in order to start modularizing
I've converted machine_common.nix into a proper NixOS module which now
resides in modules/user/devhell/profiles/base.nix and can be simply
activated via:

  vuizvui.user.devhell.profiles.base.enable = true;

Apart from that I've removed the following configuration definitiens
from machine_common.nix:

  nix.binaryCaches = [
    "https://headcounter.org/hydra/"
    "https://cache.nixos.org/"
  ];
  nix.requireSignedBinaryCaches = true;
  nix.binaryCachePublicKeys = [
    "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
    "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
  ];
  nix.nixPath = lib.mkOptionDefault [
    "nixpkgs=/home/dev/git/remote/other_github/nixpkgs"
  ];

The reason for removing them is because we already handle that via the
vuizvui core modules (modules/core/common.nix).

I've tested this by evaluating the machines by temporarily setting
"allowUnfree = true" (which is part of another module I didn't migrate
yet) and it succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
Diffstat (limited to 'machines/default.nix')
-rw-r--r--machines/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/machines/default.nix b/machines/default.nix
index a976bbc4..151576f8 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -12,6 +12,11 @@ with import ../lib;
       tyree   = callMachine ./aszlig/managed/tyree.nix {};
     };
   };
+  devhell = {
+    eris       = callMachine devhell/eris.nix {};
+    skunkworks = callMachine devhell/skunkworks.nix {};
+    titan      = callMachine devhell/titan.nix {};
+  };
   labnet = {
     labtops = callNetwork ./labnet/labtops.nix {};
   };