From fa78b6615444e6db21045f93c2b3ae763e23aff9 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Tue, 7 Nov 2017 19:07:59 +0100
Subject: [PATCH 1/6] n nixpkgs: c99239b -> cfafd6f
---
nin/source.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nin/source.nix b/nin/source.nix
index 188ebafcc..bbf88d804 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -14,6 +14,6 @@ in
stockholm.file = toString <stockholm>;
nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "c99239b";
+ ref = "cfafd6f";
};
}
From 7ed6fd18bb99884889a76ad9f597193861f44dc9 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 9 Nov 2017 09:45:48 +0100
Subject: [PATCH 2/6] n 2 default: add nixos binary cache
---
nin/2configs/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index 0d2253c27..d7b89c80c 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -4,6 +4,7 @@ with import <stockholm/lib>;
{
imports = [
../2configs/vim.nix
+ <stockholm/krebs/2configs/binary-cache/nixos.nix>
<stockholm/krebs/2configs/binary-cache/prism.nix>
{
users.extraUsers =
From 87015d32c913432b6505b7dad7b58b77408a0b32 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 14 Dec 2017 21:24:02 +0100
Subject: [PATCH 3/6] n nixpkgs: cfafd6f -> afe9649
---
nin/source.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nin/source.nix b/nin/source.nix
index bbf88d804..ccf5e6acc 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -14,6 +14,6 @@ in
stockholm.file = toString <stockholm>;
nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "cfafd6f";
+ ref = "afe9649";
};
}
From 7d1d831b9763725496d441aee0d78de5f3fe010a Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 14 Dec 2017 21:56:31 +0100
Subject: [PATCH 4/6] nin 1 h config: delete skype
---
nin/1systems/hiawatha/config.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/nin/1systems/hiawatha/config.nix b/nin/1systems/hiawatha/config.nix
index fdae354ff..57ec00a79 100644
--- a/nin/1systems/hiawatha/config.nix
+++ b/nin/1systems/hiawatha/config.nix
@@ -15,7 +15,6 @@ with lib;
<stockholm/nin/2configs/git.nix>
<stockholm/nin/2configs/retiolum.nix>
<stockholm/nin/2configs/termite.nix>
- <stockholm/nin/2configs/skype.nix>
];
krebs.build.host = config.krebs.hosts.hiawatha;
From 87ee0692a099561f23633d4f92dc3e64f82c4f03 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 14 Dec 2017 21:58:19 +0100
Subject: [PATCH 5/6] nin 2 git: change irc announce channel
---
nin/2configs/git.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix
index 6bdc857d8..2a8604689 100644
--- a/nin/2configs/git.nix
+++ b/nin/2configs/git.nix
@@ -40,8 +40,8 @@ let
post-receive = pkgs.git-hooks.irc-announce {
# TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name;
- channel = "#retiolum";
- server = "ni.r";
+ channel = "#xxx";
+ server = "irc.r";
verbose = config.krebs.build.host.name == "onondaga";
# TODO define branches in some kind of option per repo
branches = [ "master" ];
From 155bd9e0fbf4a6d6b75afeb307275edaad92faea Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Thu, 14 Dec 2017 22:34:28 +0100
Subject: [PATCH 6/6] nin 1 h config: add lmms
---
nin/1systems/hiawatha/config.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nin/1systems/hiawatha/config.nix b/nin/1systems/hiawatha/config.nix
index 57ec00a79..a09eed958 100644
--- a/nin/1systems/hiawatha/config.nix
+++ b/nin/1systems/hiawatha/config.nix
@@ -86,6 +86,7 @@ with lib;
environment.systemPackages = with pkgs; [
firefox
git
+ lmms
networkmanagerapplet
python
steam