From 7d5937b734f8a6e8379e494f91049aeee63c3300 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 3 Jan 2019 23:56:59 +0100 Subject: ma gum: enable home-manager --- makefu/1systems/gum/config.nix | 2 ++ makefu/1systems/gum/source.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 6024260d..918fd843 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -22,6 +22,8 @@ in { }; } + + # diff --git a/makefu/1systems/gum/source.nix b/makefu/1systems/gum/source.nix index 1e36c6e8..43586ede 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; } -- cgit v1.2.3 From d27dd90bb9d8231668aa4f1b89113231303722fe Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 3 Jan 2019 23:57:24 +0100 Subject: ma gum: set the default gateway on the correct interface --- makefu/1systems/gum/hardware-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix index e9670a5a..542b79fe 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 = [ ]; -- cgit v1.2.3 From eb55a8dc0c7091f2a5b0fd78f4245f12d81afcf7 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Jan 2019 00:37:13 +0100 Subject: ma pkgs.rclone: add auto-completion --- makefu/5pkgs/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 6e86f426..59db86a8 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -24,6 +24,15 @@ in { 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";}; -- cgit v1.2.3 From 9ed07a2dcf24a22965ccf26ab8915c2b02cb17af Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Jan 2019 00:37:58 +0100 Subject: ma home-manager: escape ${EDITOR} --- makefu/2configs/home-manager/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix index dff6d933..59658e66 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)" -- cgit v1.2.3 From 91190ad66b3ca8ac6446ec8ef38e69ef51606dc7 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Jan 2019 14:26:30 +0100 Subject: ma nixpkgs: 9728b2e -> eebd1a9 --- makefu/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefu/nixpkgs.json b/makefu/nixpkgs.json index ae35f9e7..c22aa9f3 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": "eebd1a9263716a04689a37b6537e50801d376b5e", + "date": "2019-01-03T20:01:07+01:00", + "sha256": "0s1fylhjqp2h4j044iwbwndgnips3nrynh2ip5ijh96kavizf2gb", "fetchSubmodules": false } -- cgit v1.2.3 From 7cb25ff9553f7506a99a571537b37dc86dea2efb Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Jan 2019 14:28:38 +0100 Subject: ma gum.r: disable iso building --- makefu/1systems/gum/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 918fd843..e274b4bf 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -125,7 +125,7 @@ in { # # - + # -- cgit v1.2.3 From 82ecfd8086baf4ceb2efc50ff24c52fc61f1b837 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Jan 2019 16:31:47 +0100 Subject: ma pkgs.quodlibet: disable tests for now --- makefu/5pkgs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 59db86a8..8ae41427 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -21,6 +21,7 @@ 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 ]; }); -- cgit v1.2.3 From 772f763afc56edbc34088f48351d7f2ebea82c0b Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Jan 2019 19:11:25 +0100 Subject: ma nixpkgs: eebd1a9263 -> 1258730 ... i am stupid --- makefu/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefu/nixpkgs.json b/makefu/nixpkgs.json index c22aa9f3..d62fd65c 100644 --- a/makefu/nixpkgs.json +++ b/makefu/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/makefu/nixpkgs", - "rev": "eebd1a9263716a04689a37b6537e50801d376b5e", - "date": "2019-01-03T20:01:07+01:00", - "sha256": "0s1fylhjqp2h4j044iwbwndgnips3nrynh2ip5ijh96kavizf2gb", + "rev": "125873064a6eabd2896833d00aede7778a453fdf", + "date": "2019-01-11T14:24:21+01:00", + "sha256": "1ki50426m9simqvxdzckfgycibz5rdhwl6hzi31i72dqiafl8j6s", "fetchSubmodules": false } -- cgit v1.2.3 From dd22da5e6b4232677a08c24609e9d6517ee2d1b7 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Jan 2019 22:50:40 +0100 Subject: external: new ip for eve --- krebs/3modules/external/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index a7ec0e15..df18b4dd 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 = { -- cgit v1.2.3