Merge remote-tracking branch 'onondaga/master'
This commit is contained in:
commit
68274e48c9
@ -15,7 +15,6 @@ with lib;
|
|||||||
<stockholm/nin/2configs/git.nix>
|
<stockholm/nin/2configs/git.nix>
|
||||||
<stockholm/nin/2configs/retiolum.nix>
|
<stockholm/nin/2configs/retiolum.nix>
|
||||||
<stockholm/nin/2configs/termite.nix>
|
<stockholm/nin/2configs/termite.nix>
|
||||||
<stockholm/nin/2configs/skype.nix>
|
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.hiawatha;
|
krebs.build.host = config.krebs.hosts.hiawatha;
|
||||||
@ -87,6 +86,7 @@ with lib;
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
firefox
|
firefox
|
||||||
git
|
git
|
||||||
|
lmms
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
python
|
python
|
||||||
steam
|
steam
|
||||||
|
@ -4,6 +4,7 @@ with import <stockholm/lib>;
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../2configs/vim.nix
|
../2configs/vim.nix
|
||||||
|
<stockholm/krebs/2configs/binary-cache/nixos.nix>
|
||||||
<stockholm/krebs/2configs/binary-cache/prism.nix>
|
<stockholm/krebs/2configs/binary-cache/prism.nix>
|
||||||
{
|
{
|
||||||
users.extraUsers =
|
users.extraUsers =
|
||||||
|
@ -40,8 +40,8 @@ let
|
|||||||
post-receive = pkgs.git-hooks.irc-announce {
|
post-receive = pkgs.git-hooks.irc-announce {
|
||||||
# TODO make nick = config.krebs.build.host.name the default
|
# TODO make nick = config.krebs.build.host.name the default
|
||||||
nick = config.krebs.build.host.name;
|
nick = config.krebs.build.host.name;
|
||||||
channel = "#retiolum";
|
channel = "#xxx";
|
||||||
server = "ni.r";
|
server = "irc.r";
|
||||||
verbose = config.krebs.build.host.name == "onondaga";
|
verbose = config.krebs.build.host.name == "onondaga";
|
||||||
# TODO define branches in some kind of option per repo
|
# TODO define branches in some kind of option per repo
|
||||||
branches = [ "master" ];
|
branches = [ "master" ];
|
||||||
|
@ -14,6 +14,6 @@ in
|
|||||||
stockholm.file = toString <stockholm>;
|
stockholm.file = toString <stockholm>;
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/nixos/nixpkgs;
|
url = https://github.com/nixos/nixpkgs;
|
||||||
ref = "c99239b";
|
ref = "afe9649";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user