summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-01-21 16:24:29 +0100
committerlassulus <lassulus@lassul.us>2019-01-21 16:24:29 +0100
commitbc61d4df9068fa3d63690891b3aaa8a982ceb633 (patch)
treed9eddd3bf208bcc7649f9e5ad10b3da9ace7ae2d
parent942d0f0f14e6c5b312128f1b111ad31f1a1f1d1f (diff)
parentdd22da5e6b4232677a08c24609e9d6517ee2d1b7 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--krebs/3modules/external/default.nix4
-rw-r--r--makefu/1systems/gum/config.nix4
-rw-r--r--makefu/1systems/gum/hardware-config.nix2
-rw-r--r--makefu/1systems/gum/source.nix1
-rw-r--r--makefu/2configs/home-manager/zsh.nix2
-rw-r--r--makefu/5pkgs/default.nix10
-rw-r--r--makefu/nixpkgs.json6
7 files changed, 21 insertions, 8 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index a7ec0e158..df18b4dd3 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -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 = {
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 6024260dc..e274b4bf8 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -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>
diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix
index e9670a5a4..542b79fe7 100644
--- a/makefu/1systems/gum/hardware-config.nix
+++ b/makefu/1systems/gum/hardware-config.nix
@@ -34,7 +34,7 @@ in {
prefixLength = external-netmask6;
}];
};
- defaultGateway6 = external-gw6;
+ defaultGateway6 = { address = external-gw6; interface = ext-if; };
defaultGateway = external-gw;
};
boot.kernelParams = [ ];
diff --git a/makefu/1systems/gum/source.nix b/makefu/1systems/gum/source.nix
index 1e36c6e87..43586ede4 100644
--- a/makefu/1systems/gum/source.nix
+++ b/makefu/1systems/gum/source.nix
@@ -2,4 +2,5 @@
name="gum";
torrent = true;
clever_kexec = true;
+ home-manager = true;
}
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index dff6d9337..59658e667 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -56,7 +56,7 @@
];
}
EOF
- ${EDITOR:-vim} default.nix
+ ''${EDITOR:-vim} default.nix
fi
}
eval "$(direnv hook zsh)"
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 6e86f4264..8ae41427c 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -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";};
diff --git a/makefu/nixpkgs.json b/makefu/nixpkgs.json
index ae35f9e76..d62fd65ca 100644
--- a/makefu/nixpkgs.json
+++ b/makefu/nixpkgs.json
@@ -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
}