Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'onondaga/master'

Browse Source
This commit is contained in:
lassulus 2017-12-15 01:16:51 +01:00
commit 68274e48c9
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nin/1systems/hiawatha/config.nix
View File

@ -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

1
nin/2configs/default.nix
View File

@ -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 =

4
nin/2configs/git.nix
View File

@ -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" ];

2
nin/source.nix
View File

@ -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";
}; };
} }