Merge branch 'master' of https://git.gebner.org/gebner/nixos-config

2015-08-20 10:06:01 +02:00 · 2015-08-20 10:06:01 +02:00 · 6cdb91329d
commit 6cdb91329d
parent c687230256 9dab3442c5
2 changed files with 9 additions and 0 deletions
--- a/archachatina.nix
+++ b/archachatina.nix
@ -16,6 +16,14 @@
    beets
    mediainfo
    flac
+
+    libreoffice
+    recoll
+    minisat
+    prover9
+    uvccapture
+    veriT
+    nix-repl
  ];

 }
--- a/common.nix
+++ b/common.nix
@ -11,6 +11,7 @@

  nix.binaryCaches = [ https://hydra.nixos.org https://cache.nixos.org ];
  nix.trustedBinaryCaches = [ https://hydra.nixos.org https://cache.nixos.org ];
+  nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ];
  nix.extraOptions = "auto-optimise-store = true";

  networking.networkmanager.enable = true;