summaryrefslogtreecommitdiffstats
path: root/nin/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-14 00:41:53 +0200
committerlassulus <lassulus@lassul.us>2017-07-14 00:41:53 +0200
commit6915b2ed54cc59884f551d95789d7a45ce13127a (patch)
tree7fbf8a258e33dd4d62641e199347f8e2e48c35f5 /nin/2configs
parent8d128c769aec24d8989db8220d680ea6f4735193 (diff)
parent01fc0e14ef3b6a8af8bb60f84ebb6b5474bab410 (diff)
Merge remote-tracking branch 'onondaga/master'
Diffstat (limited to 'nin/2configs')
-rw-r--r--nin/2configs/default.nix9
-rw-r--r--nin/2configs/nixpkgs.nix8
2 files changed, 0 insertions, 17 deletions
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index cb02521ce..212fd368e 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -3,7 +3,6 @@
with import <stockholm/lib>;
{
imports = [
- ../2configs/nixpkgs.nix
../2configs/vim.nix
{
users.extraUsers =
@@ -62,14 +61,6 @@ with import <stockholm/lib>;
search-domain = "r";
build = {
user = config.krebs.users.nin;
- source = let inherit (config.krebs.build) host; in {
- nixos-config.symlink = "stockholm/nin/1systems/${host.name}.nix";
- secrets.file =
- if getEnv "dummy_secrets" == "true"
- then toString <stockholm/nin/6tests/dummysecrets>
- else "/home/nin/secrets/${host.name}";
- stockholm.file = getEnv "PWD";
- };
};
};
diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix
deleted file mode 100644
index c46331b0d..000000000
--- a/nin/2configs/nixpkgs.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-
-{
- krebs.build.source.nixpkgs.git = {
- url = https://github.com/nixos/nixpkgs;
- ref = "01c3847";
- };
-}