summaryrefslogtreecommitdiffstats
path: root/nin
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-12-27 17:09:35 +0100
committertv <tv@krebsco.de>2017-12-27 17:09:35 +0100
commit6ed214fc77b537dc74b92bbc37e2d2d68dfd9131 (patch)
tree97e0ca20812fa54edfa0bd60460800ff2f18626e /nin
parent04b711f516c978e84b334a82008d40dfaad1de1b (diff)
parent3a41a73f1fcc32736ace08783d9bfee8a77f3f80 (diff)
Merge remote-tracking branch 'prism/staging/test'
Diffstat (limited to 'nin')
-rw-r--r--nin/1systems/hiawatha/config.nix2
-rw-r--r--nin/2configs/default.nix1
-rw-r--r--nin/2configs/git.nix4
-rw-r--r--nin/source.nix2
4 files changed, 5 insertions, 4 deletions
diff --git a/nin/1systems/hiawatha/config.nix b/nin/1systems/hiawatha/config.nix
index fdae354ff..a09eed958 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;
@@ -87,6 +86,7 @@ with lib;
environment.systemPackages = with pkgs; [
firefox
git
+ lmms
networkmanagerapplet
python
steam
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 =
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" ];
diff --git a/nin/source.nix b/nin/source.nix
index 188ebafcc..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 = "c99239b";
+ ref = "afe9649";
};
}