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

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2017-03-05 00:26:56 +01:00
commit abdfd8269f
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
krebs/5pkgs/git-hooks/default.nix
View File

@ -1,13 +1,10 @@
{ lib, pkgs, ... }: { pkgs, ... }:
with lib; with import <stockholm/lib>;
let
out = {
inherit irc-announce;
};
{
# TODO irc-announce should return a derivation # TODO irc-announce should return a derivation
# but it cannot because krebs.git.repos.*.hooks :: attrsOf str
irc-announce = { nick, channel, server, port ? 6667, verbose ? false, branches ? [] }: '' irc-announce = { nick, channel, server, port ? 6667, verbose ? false, branches ? [] }: ''
#! /bin/sh #! /bin/sh
set -euf set -euf
@ -37,7 +34,7 @@ let
port=${toString port} port=${toString port}
host=$nick host=$nick
cgit_endpoint=http://cgit.$host cgit_endpoint=http://cgit.$host.r
empty=0000000000000000000000000000000000000000 empty=0000000000000000000000000000000000000000
@ -99,7 +96,7 @@ let
done done
if test -n "''${message-}"; then if test -n "''${message-}"; then
exec ${irc-announce-script} \ exec ${pkgs.irc-announce}/bin/irc-announce \
"$server" \ "$server" \
"$port" \ "$port" \
"$nick" \ "$nick" \
@ -107,6 +104,4 @@ let
"$message" "$message"
fi fi
''; '';
}
irc-announce-script = "${pkgs.irc-announce}/bin/irc-announce";
in out

6
shared/2configs/default.nix
View File

@ -11,7 +11,7 @@ with import <stockholm/lib>;
nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix"; nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-04 ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-03
}; };
secrets.file = secrets.file =
if getEnv "dummy_secrets" == "true" if getEnv "dummy_secrets" == "true"
@ -30,10 +30,6 @@ with import <stockholm/lib>;
]; ];
nix.useSandbox = true; nix.useSandbox = true;
nixpkgs.config.packageOverrides = pkgs: {
nano = pkgs.vim;
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
rxvt_unicode.terminfo rxvt_unicode.terminfo

2
tv/2configs/default.nix
View File

@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm"; stockholm.file = "/home/tv/stockholm";
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
ref = "53a2baa"; # nixos-unstable (17.03-rc) ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03
}; };
} // optionalAttrs host.secure { } // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master"; secrets-master.file = "/home/tv/secrets/master";

2
tv/2configs/urlwatch.nix
View File

@ -31,7 +31,7 @@ with import <stockholm/lib>;
## other ## other
https://nixos.org/channels/nixos-16.09/git-revision https://nixos.org/channels/nixos-17.03/git-revision
https://nixos.org/channels/nixos-unstable/git-revision https://nixos.org/channels/nixos-unstable/git-revision
## 2014-10-17 ## 2014-10-17