From 5db85240edfbac9c8db2218749add18d5430618a Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 26 Jan 2017 21:23:34 +0100
Subject: n 2: remove MANPAGER

---
 nin/2configs/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nin/2configs/default.nix')

diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index e181a604..260dbc5b 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -82,7 +82,6 @@ with import <stockholm/lib>;
   # multiple-definition-problem when defining environment.variables.EDITOR
   environment.extraInit = ''
     EDITOR=vim
-    MANPAGER=most
   '';
 
   nixpkgs.config.allowUnfree = true;
-- 
cgit v1.2.3


From 1b57bcf233e66710a33380f2de0874be79a96f9e Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 26 Jan 2017 21:25:18 +0100
Subject: n 2: add git status alias

---
 nin/2configs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nin/2configs/default.nix')

diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index 260dbc5b..0ff0f8ae 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -86,6 +86,10 @@ with import <stockholm/lib>;
 
   nixpkgs.config.allowUnfree = true;
 
+  environment.shellAliases = {
+    gs = "git status";
+  };
+
   environment.systemPackages = with pkgs; [
   #stockholm
     git
-- 
cgit v1.2.3


From ccdb47ed6c5ab88276214aacc869573dae9b867c Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 26 Jan 2017 22:11:45 +0100
Subject: n 2: add dummy secrects

---
 nin/2configs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'nin/2configs/default.nix')

diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index 0ff0f8ae..ed205a79 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -58,7 +58,10 @@ with import <stockholm/lib>;
       user = config.krebs.users.nin;
       source = let inherit (config.krebs.build) host; in {
         nixos-config.symlink = "stockholm/nin/1systems/${host.name}.nix";
-        secrets.file = "/home/nin/secrets/${host.name}";
+        secrets.file =
+        if getEnv "dummy_secrets" == "true"
+          then toString <stockholm/nin/6tests/dummysecrets>
+          else "/home/nin/secrets/${host.name}";
         stockholm.file = getEnv "PWD";
       };
     };
-- 
cgit v1.2.3


From 9e201365e262b8c13c03fa42da32c3b57c57c9ba Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 26 Jan 2017 22:20:31 +0100
Subject: n 2: add prism as binary-cache

---
 nin/2configs/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'nin/2configs/default.nix')

diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index ed205a79..fa05a560 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -46,6 +46,12 @@ with import <stockholm/lib>;
         SSL_CERT_FILE = ca-bundle;
       };
     })
+    {
+      nix = {
+        binaryCaches = ["http://cache.prism.r"];
+        binaryCachePublicKeys = ["cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="];
+      };
+    }
   ];
 
   networking.hostName = config.krebs.build.host.name;
-- 
cgit v1.2.3


From 999e1391c25f4ca8b35fe70675df91aab4c6a2a7 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 26 Jan 2017 22:45:42 +0100
Subject: n: move termite to default pkgs

---
 nin/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nin/2configs/default.nix')

diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index fa05a560..a1ed76d9 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -107,6 +107,7 @@ with import <stockholm/lib>;
     proot
     populate
     p7zip
+    termite
     unzip
     unrar
     hashPassword
-- 
cgit v1.2.3