From b6e6a99585c9b53e1f96529eaa1449f8eb30dae2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 2 Dec 2016 09:23:09 +0100 Subject: [PATCH 01/18] k 5 urlwatch: remove obsolete postFixup --- krebs/5pkgs/urlwatch/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/urlwatch/default.nix index 7a4df5c7c..7ffbd8870 100644 --- a/krebs/5pkgs/urlwatch/default.nix +++ b/krebs/5pkgs/urlwatch/default.nix @@ -15,10 +15,6 @@ python3Packages.buildPythonPackage rec { requests2 ]; - postFixup = '' - wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH" - ''; - meta = { description = "A tool for monitoring webpages for updates"; homepage = https://thp.io/2008/urlwatch/; From 41c7c82343b77700372ee601961d214609d3c124 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 15:38:26 +0100 Subject: [PATCH 02/18] l 2 nixpkgs: e360c72 -> 6a9f087 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 48472f7a1..9b26f5be8 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "e360c7205f84be180d80b97f3980fb809a951486"; + ref = "6a9f087e37e392b9c3819196af33c529c12c4e48"; }; } From 8ba35538c093a228e2836e4c4d29757dfeb8853c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:40:11 +0100 Subject: [PATCH 03/18] l 1 mors: use libvirtd instead of virtualbox --- lass/1systems/mors.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 99705cbf1..9f2cec9a1 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -13,7 +13,6 @@ with import ; ../2configs/browsers.nix ../2configs/games.nix ../2configs/pass.nix - ../2configs/virtualbox.nix ../2configs/elster.nix ../2configs/steam.nix ../2configs/wine.nix @@ -79,6 +78,9 @@ with import ; { services.redis.enable = true; } + { + virtualisation.libvirtd.enable = true; + } ]; krebs.build.host = config.krebs.hosts.mors; From 3b80a5518c8f5b30de8f08d69c3dc01c2ad52d3d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:40:26 +0100 Subject: [PATCH 04/18] l 2 baseX: use pulse.nix --- lass/2configs/baseX.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index cdb6d34ab..b2a5ba089 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -7,11 +7,8 @@ in { ./xserver ./mpv.nix ./power-action.nix + ./pulse.nix ]; - hardware.pulseaudio = { - enable = true; - systemWide = true; - }; users.extraUsers.mainUser.extraGroups = [ "audio" "video" ]; From d10e33e49c72ef627c514b9e7d8bc2300fa8ec25 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:40:53 +0100 Subject: [PATCH 05/18] l 2 baseX: add terminals to pkgs --- lass/2configs/baseX.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index b2a5ba089..e98f382e3 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -50,6 +50,9 @@ in { yt-next youtube-tools + + rxvt_unicode + termite #window manager stuff #haskellPackages.xmobar #haskellPackages.yeganesh From 0c84c2bd4d2f3ef50601f136fd4c537ae7a97416 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:41:09 +0100 Subject: [PATCH 06/18] l 2 privoxy-retiolum: open for dns0 --- lass/2configs/privoxy-retiolum.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/privoxy-retiolum.nix b/lass/2configs/privoxy-retiolum.nix index 9059bbac8..352a6d3d8 100644 --- a/lass/2configs/privoxy-retiolum.nix +++ b/lass/2configs/privoxy-retiolum.nix @@ -14,6 +14,7 @@ in { tables = { filter.INPUT.rules = [ { predicate = "-i retiolum -p tcp --dport 8118"; target = "ACCEPT"; } + { predicate = "-i dns0 -p tcp --dport 8118"; target = "ACCEPT"; } ]; }; }; From 531a6ab9a230433d2bb5442a5c2993ef68710779 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 6 Dec 2016 23:29:22 +0100 Subject: [PATCH 07/18] m 5 acdcli: init --- makefu/5pkgs/acdcli/default.nix | 20 ++++++++++++++++++++ makefu/5pkgs/default.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 makefu/5pkgs/acdcli/default.nix diff --git a/makefu/5pkgs/acdcli/default.nix b/makefu/5pkgs/acdcli/default.nix new file mode 100644 index 000000000..1621375e3 --- /dev/null +++ b/makefu/5pkgs/acdcli/default.nix @@ -0,0 +1,20 @@ +{ lib, pkgs, python3Packages, fetchurl, ... }: + +with python3Packages; buildPythonPackage rec { + name = "acdcli-${version}"; + version = "0.3.2"; + propagatedBuildInputs = [ + dateutil colorama fusepy appdirs requests2 requests_toolbelt six + ]; + src = fetchurl { + url = "mirror://pypi/a/acdcli/${name}.tar.gz"; + sha256 = "1ak9xxpyb7n6iyalf2082jpimklakm0fgm7vsv7qcm8wy6vlq2cw"; + }; + doCheck = false; # ImportError: Failed to import test module: tests + postFixup = '' + mv $out/bin/.acd_cli.py-wrapped $out/bin/acd_cli.py + ''; + meta = { + description = "communicate with amazon drive"; + }; +} diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 8994b3856..b62f1efa2 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -5,6 +5,7 @@ let in { nixpkgs.config.packageOverrides = rec { + acdcli = callPackage ./acdcli {}; alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; From ddf04562b2a155f1599988d089c0ca6ed2def3a4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 7 Dec 2016 10:14:27 +0100 Subject: [PATCH 08/18] l 2 games: add vdoom{1,2} to pkgs --- lass/2configs/games.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix index 82b7eb2c9..245f3ca1e 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -2,12 +2,16 @@ let mainUser = config.users.extraUsers.mainUser; + vdoom = pkgs.writeDash "vdoom" '' + ${pkgs.zandronum}/bin/zandronum \ + -fov 120 \ + "$@" + ''; doom = pkgs.writeDash "doom" '' DOOM_DIR=''${DOOM_DIR:-~/doom/} - ${pkgs.zandronum}/bin/zandronum \ + ${vdoom} \ -file $DOOM_DIR/lib/brutalv20.pk3 \ -file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \ - -fov 120 \ "$@" ''; doom1 = pkgs.writeDashBin "doom1" '' @@ -18,12 +22,22 @@ let DOOM_DIR=''${DOOM_DIR:-~/doom/} ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@" ''; + vdoom1 = pkgs.writeDashBin "vdoom1" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${vdoom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@" + ''; + vdoom2 = pkgs.writeDashBin "vdoom2" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${vdoom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@" + ''; in { environment.systemPackages = with pkgs; [ dwarf_fortress doom1 doom2 + vdoom1 + vdoom2 ]; users.extraUsers = { From 73e9528b4b94a2ae18c00ceebd324a6e24d0193e Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 7 Dec 2016 19:27:00 +0100 Subject: [PATCH 09/18] m 5 tw-upload-plugin: update --- makefu/5pkgs/tw-upload-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefu/5pkgs/tw-upload-plugin/default.nix b/makefu/5pkgs/tw-upload-plugin/default.nix index a68dc09dc..8bc675847 100644 --- a/makefu/5pkgs/tw-upload-plugin/default.nix +++ b/makefu/5pkgs/tw-upload-plugin/default.nix @@ -3,6 +3,6 @@ pkgs.fetchFromGitHub { owner = "makefu"; repo = "tw-upload-plugin"; - rev = "a00aac"; - sha256 = "0kazqs24kzjxqzr33kg1jbfx8xyvmrnrdxh6g27kgkgbl1d2qknh"; + rev = "621e5fbe"; + sha256 = "1wjy76s5mr6z772w6sr0dwqxaxn45c7ys4a5y2v55hxclr096dqg"; } From 19c648e0f380fd8efc94428151a09469187b5019 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 7 Dec 2016 21:38:55 +0100 Subject: [PATCH 10/18] l 2 games: use zandronum-bin instead of zandronum --- lass/2configs/games.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix index 245f3ca1e..e7c7de938 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -3,7 +3,7 @@ let mainUser = config.users.extraUsers.mainUser; vdoom = pkgs.writeDash "vdoom" '' - ${pkgs.zandronum}/bin/zandronum \ + ${pkgs.zandronum-bin}/bin/zandronum \ -fov 120 \ "$@" ''; From 277d5e18dad6cb00e1bd55410542f508399f10bb Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 7 Dec 2016 21:40:12 +0100 Subject: [PATCH 11/18] l 2 nixpkgs: 6a9f087 -> 76f346d --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 9b26f5be8..fd331e90d 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "6a9f087e37e392b9c3819196af33c529c12c4e48"; + ref = "76f346d61d537f5bbe4f365f9f659df7024602b4"; }; } From a64a9668aa0639e78a6c677c17718731d8f2418c Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 8 Dec 2016 21:45:36 +0100 Subject: [PATCH 12/18] l 2 exim-smarthost: add irgendwas@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 3bf78d9f4..d120dfcad 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -31,6 +31,7 @@ with import ; { from = "nebenan@lassul.us"; to = lass.mail; } { from = "feed@lassul.us"; to = lass.mail; } { from = "art@lassul.us"; to = lass.mail; } + { from = "irgendwas@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } From b1092b16a6be15f8121619e6d2eaf8d732b873ff Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 Dec 2016 15:33:41 +0100 Subject: [PATCH 13/18] m 2 default: bump revision --- makefu/2configs/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index db69be2fa..9a2adbc3e 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -22,8 +22,7 @@ with import ; user = config.krebs.users.makefu; source = let inherit (config.krebs.build) host user; - # ref = "b8ede35"; # stable @ 2016-10-19 - ref = "31c72ce"; # stable @ 2016-10-21 (dirtycow) + ref = "f52eaf4"; # stable @ 2016-12-12 in { nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then { From 36494605244b5c731299ad5854e6cde3d21fe3e7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 12 Dec 2016 19:05:00 +0100 Subject: [PATCH 14/18] l 2 websites domsen: add domsen to download group --- lass/2configs/websites/domsen.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 2a6df06ff..76e13412b 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -151,7 +151,7 @@ in { description = "maintenance acc for domsen"; home = "/home/domsen"; useDefaultShell = true; - extraGroups = [ "nginx" ]; + extraGroups = [ "nginx" "download" ]; createHome = true; }; From a4e9999dfe392ec4e447e8cd91b1a8f3a5d72a03 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 12 Dec 2016 21:42:43 +0100 Subject: [PATCH 15/18] l 1 mors: import ircd --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 9f2cec9a1..cd32571cf 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -25,6 +25,7 @@ with import ; ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/repo-sync.nix + ../2configs/ircd.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ From f2f62193907e400dd59046f5fb47858f685aa465 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 12 Dec 2016 21:48:10 +0100 Subject: [PATCH 16/18] l 2: remove teamviewer --- lass/1systems/mors.nix | 1 - lass/2configs/teamviewer.nix | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 lass/2configs/teamviewer.nix diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index cd32571cf..594f342db 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -18,7 +18,6 @@ with import ; ../2configs/wine.nix ../2configs/git.nix ../2configs/skype.nix - ../2configs/teamviewer.nix ../2configs/libvirt.nix ../2configs/fetchWallpaper.nix #../2configs/c-base.nix diff --git a/lass/2configs/teamviewer.nix b/lass/2configs/teamviewer.nix deleted file mode 100644 index 87b6fbac3..000000000 --- a/lass/2configs/teamviewer.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, pkgs, ... }: - -with import ; -{ - services.teamviewer.enable = true; -} From fd7fd72362ba50c8968a1b25f048d5a35c9ea71e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 14 Dec 2016 18:47:53 +0100 Subject: [PATCH 17/18] l 2 nixpkgs: 76f346d -> 953889b --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index fd331e90d..91733d30b 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "76f346d61d537f5bbe4f365f9f659df7024602b4"; + ref = "953889b693dda8507df3677ff808420c3fdd7409"; }; } From 41517457742ac9425987d9763bc9c38102129fef Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 Dec 2016 13:47:20 +0100 Subject: [PATCH 18/18] l 2 nixpkgs: 953889b -> 2a97e14 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 91733d30b..e2bdd5755 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "953889b693dda8507df3677ff808420c3fdd7409"; + ref = "2a97e149e50e1c701a957c6bd060cc74b7e9a905"; }; }