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

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2019-01-21 16:24:29 +01:00
commit bc61d4df90
7 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/3modules/external/default.nix vendored
View File

@ -84,8 +84,8 @@ in {
nets = rec {
internet = {
# eve.thalheim.io
ip4.addr = "188.68.39.17";
ip6.addr = "2a03:4000:13:31e::1";
ip4.addr = "95.216.112.61";
ip6.addr = "2a01:4f9:2b:1605::1";
aliases = [ "eve.i" ];
};
retiolum = {

4
makefu/1systems/gum/config.nix
View File

@ -22,6 +22,8 @@ in {
};
}
<stockholm/makefu/2configs/support-nixos.nix>
<stockholm/makefu/2configs/home-manager>
<stockholm/makefu/2configs/home-manager/cli.nix>
# <stockholm/makefu/2configs/stats/client.nix>
<stockholm/makefu/2configs/stats/netdata-server.nix>
@ -123,7 +125,7 @@ in {
#<stockholm/makefu/2configs/nginx/update.connector.one.nix>
<stockholm/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix>
# <stockholm/makefu/2configs/nginx/gold.krebsco.de.nix>
<stockholm/makefu/2configs/nginx/iso.euer.nix>
# <stockholm/makefu/2configs/nginx/iso.euer.nix>
<stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix>
<stockholm/makefu/2configs/deployment/graphs.nix>

2
makefu/1systems/gum/hardware-config.nix
View File

@ -34,7 +34,7 @@ in {
prefixLength = external-netmask6;
}];
};
defaultGateway6 = external-gw6;
defaultGateway6 = { address = external-gw6; interface = ext-if; };
defaultGateway = external-gw;
};
boot.kernelParams = [ ];

1
makefu/1systems/gum/source.nix
View File

@ -2,4 +2,5 @@
name="gum";
torrent = true;
clever_kexec = true;
home-manager = true;
}

2
makefu/2configs/home-manager/zsh.nix
View File

@ -56,7 +56,7 @@
];
}
EOF
${EDITOR:-vim} default.nix
''${EDITOR:-vim} default.nix
fi
}
eval "$(direnv hook zsh)"

10
makefu/5pkgs/default.nix
View File

@ -21,9 +21,19 @@ with super.lib; with builtins; let
in {
quodlibet = super.pkgs.stdenv.lib.overrideDerivation super.quodlibet (old: {
doCheck = false; # 1 error because of warnings (possibly upstream)
patches = [ ./custom/quodlibet/single-digit-discnumber.patch
./custom/quodlibet/remove-override-warning.patch ];
});
rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: {
postInstall = old.postInstall + ''
$bin/bin/rclone genautocomplete zsh _rclone
install -D -m644 _rclone $bin/share/zsh/vendor-completions/_rclone
$bin/bin/rclone genautocomplete bash _rclone
install -D -m644 _rclone $bin/etc/bash_completion.d/rclone
'';
});
alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};

6
makefu/nixpkgs.json
View File

@ -1,7 +1,7 @@
{
"url": "https://github.com/makefu/nixpkgs",
"rev": "9728b2e83406c76efc734ebb1923f23b8e687819",
"date": "2018-11-19T20:36:35+01:00",
"sha256": "0nk75ldppjr6x04hgghgg9vanr1cw4k5xhg699d38g2rpxviz5bp",
"rev": "125873064a6eabd2896833d00aede7778a453fdf",
"date": "2019-01-11T14:24:21+01:00",
"sha256": "1ki50426m9simqvxdzckfgycibz5rdhwl6hzi31i72dqiafl8j6s",
"fetchSubmodules": false
}