Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
6d96297a9d
@ -77,9 +77,7 @@ with import <stockholm/lib>;
|
|||||||
extraZones = {
|
extraZones = {
|
||||||
# TODO generate krebsco.de zone from nets and don't use extraZones at all
|
# TODO generate krebsco.de zone from nets and don't use extraZones at all
|
||||||
"krebsco.de" = ''
|
"krebsco.de" = ''
|
||||||
krebsco.de. 60 IN MX 5 mx23
|
|
||||||
cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
|
cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
|
||||||
mx23 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
nets = {
|
nets = {
|
||||||
@ -212,6 +210,7 @@ with import <stockholm/lib>;
|
|||||||
ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
|
ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
|
||||||
cgit 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
|
cgit 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
|
||||||
cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
|
cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
|
||||||
|
krebsco.de. 60 IN MX 5 ni
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
nets = {
|
nets = {
|
||||||
|
@ -9,7 +9,7 @@ with import <stockholm/lib>;
|
|||||||
../.
|
../.
|
||||||
../2configs/hw/x220.nix
|
../2configs/hw/x220.nix
|
||||||
../2configs/exim-retiolum.nix
|
../2configs/exim-retiolum.nix
|
||||||
../2configs/git.nix
|
../2configs/gitrepos.nix
|
||||||
../2configs/im.nix
|
../2configs/im.nix
|
||||||
../2configs/mail-client.nix
|
../2configs/mail-client.nix
|
||||||
../2configs/nginx/public_html.nix
|
../2configs/nginx/public_html.nix
|
||||||
|
@ -9,7 +9,7 @@ with import <stockholm/lib>;
|
|||||||
../.
|
../.
|
||||||
../2configs/hw/w110er.nix
|
../2configs/hw/w110er.nix
|
||||||
../2configs/exim-retiolum.nix
|
../2configs/exim-retiolum.nix
|
||||||
../2configs/git.nix
|
../2configs/gitrepos.nix
|
||||||
../2configs/im.nix
|
../2configs/im.nix
|
||||||
../2configs/mail-client.nix
|
../2configs/mail-client.nix
|
||||||
../2configs/man.nix
|
../2configs/man.nix
|
||||||
|
@ -9,7 +9,8 @@ with import <stockholm/lib>;
|
|||||||
../.
|
../.
|
||||||
../2configs/hw/x220.nix
|
../2configs/hw/x220.nix
|
||||||
../2configs/exim-retiolum.nix
|
../2configs/exim-retiolum.nix
|
||||||
../2configs/git.nix
|
../2configs/gitconfig.nix
|
||||||
|
../2configs/gitrepos.nix
|
||||||
../2configs/mail-client.nix
|
../2configs/mail-client.nix
|
||||||
../2configs/man.nix
|
../2configs/man.nix
|
||||||
../2configs/nginx/public_html.nix
|
../2configs/nginx/public_html.nix
|
||||||
@ -46,6 +47,18 @@ with import <stockholm/lib>;
|
|||||||
texlive.combined.scheme-full
|
texlive.combined.scheme-full
|
||||||
tmux
|
tmux
|
||||||
|
|
||||||
|
(pkgs.writeDashBin "krebszones" ''
|
||||||
|
set -efu
|
||||||
|
export OVH_ZONE_CONFIG=$HOME/.secrets/krebs/ovh-zone.conf
|
||||||
|
case $* in
|
||||||
|
import)
|
||||||
|
set -- import /etc/zones/krebsco.de krebsco.de
|
||||||
|
echo "+ krebszones $*" >&2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
exec ${pkgs.krebszones}/bin/ovh-zone "$@"
|
||||||
|
'')
|
||||||
|
|
||||||
#ack
|
#ack
|
||||||
#apache-httpd
|
#apache-httpd
|
||||||
#ascii
|
#ascii
|
||||||
|
@ -15,7 +15,7 @@ with import <stockholm/lib>;
|
|||||||
../.
|
../.
|
||||||
../2configs/hw/x220.nix
|
../2configs/hw/x220.nix
|
||||||
../2configs/exim-retiolum.nix
|
../2configs/exim-retiolum.nix
|
||||||
../2configs/git.nix
|
../2configs/gitrepos.nix
|
||||||
../2configs/mail-client.nix
|
../2configs/mail-client.nix
|
||||||
../2configs/man.nix
|
../2configs/man.nix
|
||||||
../2configs/nginx/public_html.nix
|
../2configs/nginx/public_html.nix
|
||||||
|
19
tv/2configs/gitconfig.nix
Normal file
19
tv/2configs/gitconfig.nix
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
|
{
|
||||||
|
environment.etc.gitconfig.text = ''
|
||||||
|
[alias]
|
||||||
|
patch = !${pkgs.git}/bin/git --no-pager diff --no-color
|
||||||
|
[diff-so-fancy]
|
||||||
|
markEmptyLines = false
|
||||||
|
stripLeadingSymbols = false
|
||||||
|
[pager]
|
||||||
|
diff = ${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy \
|
||||||
|
| ${pkgs.less}/bin/less -FRX
|
||||||
|
[user]
|
||||||
|
email = tv@krebsco.de
|
||||||
|
name = tv
|
||||||
|
'';
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user