diff options
| author | nin <nineinchnade@gmail.com> | 2017-10-17 19:54:15 +0200 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-10-17 19:54:15 +0200 |
| commit | 9afe5210f2a44cacac4f3527b6c8b561d9e4296b (patch) | |
| tree | a83c412966783b123cd3152fe34a6f7cddcb55d6 /tv/2configs | |
| parent | f4bf9110727f2c7113c80aaa88427b81605016ae (diff) | |
| parent | 4667bb8e4111abde822ae57993a29929c5cc9aad (diff) | |
Merge remote-tracking branch 'temp/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/br.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 6 | ||||
| -rw-r--r-- | tv/2configs/gitrepos.nix | 4 | ||||
| -rw-r--r-- | tv/2configs/urlwatch.nix | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/tv/2configs/br.nix b/tv/2configs/br.nix index c7eb20e90..d660ebc35 100644 --- a/tv/2configs/br.nix +++ b/tv/2configs/br.nix @@ -45,5 +45,4 @@ with import <stockholm/lib>; ]; }; - systemd.services.cups.serviceConfig.PrivateTmp = true; } diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 9ad0253a3..f418b9ff0 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -80,6 +80,12 @@ with import <stockholm/lib>; dmesg = "dmesg -L --reltime"; view = "vim -R"; + deploy = pkgs.writeDash "deploy" '' + set -eu + cd ~/stockholm + export SYSTEM="$1" + exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"' + ''; reload = "systemctl reload"; restart = "systemctl restart"; start = "systemctl start"; diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index b6480f356..2c4b4868e 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -100,10 +100,10 @@ let { ); irc-announce = args: pkgs.git-hooks.irc-announce (recursiveUpdate { - channel = "#retiolum"; + channel = "#xxx"; # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; - server = "ni.r"; + server = "irc.r"; verbose = true; } args); diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 5779240ba..515f8996f 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -31,7 +31,7 @@ with import <stockholm/lib>; ## other - https://nixos.org/channels/nixos-17.03/git-revision + https://nixos.org/channels/nixos-17.09/git-revision https://nixos.org/channels/nixos-unstable/git-revision ## 2014-10-17 |