From ce0b1e987a4bd99ed204e9ce06a7c882060dcbcf Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Feb 2016 23:38:50 +0100 Subject: ma 2 laptop-utils: init --- makefu/2configs/laptop-utils.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix index b5ba2ec3..8a1c0e18 100644 --- a/makefu/2configs/laptop-utils.nix +++ b/makefu/2configs/laptop-utils.nix @@ -6,7 +6,7 @@ # essentially `nix-env -q` of the main user # TODO: split gui and non-gui { - environment.systemPackages = with pkgs; [ + krebs.per-user.makefu.packages = with pkgs; [ # core at_spi2_core acpi @@ -27,11 +27,14 @@ # gui + chromium clipit feh + firefox keepassx pcmanfm skype + mirage tightvnc gnome3.dconf vlc @@ -39,10 +42,6 @@ wireshark xdotool - # browser - firefox - chromium - # sectools aria2 binwalk @@ -53,10 +52,10 @@ # stuff - cac-cli + cac-api cac-panel krebspaste ledger - password-store + pass ]; } -- cgit v1.2.3 From 113d6006bbfcb58b0d4263a56c62a34d41c89f8e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Feb 2016 23:39:52 +0100 Subject: ma 2 mail-client: += gnupg,w3m,openssl --- makefu/2configs/mail-client.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/mail-client.nix b/makefu/2configs/mail-client.nix index 03692407..793daa6f 100644 --- a/makefu/2configs/mail-client.nix +++ b/makefu/2configs/mail-client.nix @@ -4,11 +4,13 @@ with config.krebs.lib; { environment.systemPackages = with pkgs; [ abook + gnupg + imapfilter msmtp mutt-kz notmuch offlineimap - imapfilter - gnupg + openssl + w3m ]; } -- cgit v1.2.3 From da20505f5d187f2bbe649543125f1097c6d87d85 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 27 Feb 2016 12:26:06 +0100 Subject: ma 2 default: fix path to glibc patch --- makefu/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 3043a1af..7166c0cc 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -6,7 +6,7 @@ with config.krebs.lib; system.replaceRuntimeDependencies = with pkgs.lib; [{original = pkgs.glibc; replacement = pkgs.stdenv.lib.overrideDerivation pkgs.glibc (oldAttr: { patches = oldAttr.patches ++ - [(pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/glibc/cve-2015-7547.patch"; + [(pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/fc48bf5a2ceb908b73dc035374e2ec5a31086aa2/pkgs/development/libraries/glibc/cve-2015-7547.patch"; sha256 = "0awpc4rp2x27rjpj83ps0rclmn73hsgfv2xxk18k82w4hdxqpp5r";})]; });} ]; -- cgit v1.2.3 From 6dd129a4641b6f720c4c93f16bf6c94f77e7327e Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 28 Feb 2016 01:52:40 +0100 Subject: ma 2 iodined: now requires listen addres --- makefu/2configs/iodined.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/iodined.nix b/makefu/2configs/iodined.nix index db8a1bfe..2e69d167 100644 --- a/makefu/2configs/iodined.nix +++ b/makefu/2configs/iodined.nix @@ -1,4 +1,4 @@ -{ services,builtins,environment,pkgs, ... }: +{ pkgs, config, ... }: let # TODO: make this a parameter @@ -10,7 +10,7 @@ in { enable = true; domain = domain; ip = "172.16.10.1/24"; - extraConfig = "-P ${pw}"; + extraConfig = "-P ${pw} -l ${pkgs.lib.head config.krebs.build.host.nets.internet.addrs4}"; }; } -- cgit v1.2.3 From 9b1996625451f46c605f4b77ad760ba401319232 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 28 Feb 2016 01:53:41 +0100 Subject: ma 2 mycube: not necessary to include implicit deps with nixpkgs@2016-02-14 --- makefu/2configs/deployment/mycube.connector.one.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/deployment/mycube.connector.one.nix b/makefu/2configs/deployment/mycube.connector.one.nix index 38fc4a24..125b3dff 100644 --- a/makefu/2configs/deployment/mycube.connector.one.nix +++ b/makefu/2configs/deployment/mycube.connector.one.nix @@ -16,7 +16,7 @@ in { vassals = { mycube-flask = { type = "normal"; - python2Packages = self: with self; [ pkgs.mycube-flask flask redis werkzeug jinja2 markupsafe itsdangerous ]; + pythonPackages = self: with self; [ pkgs.mycube-flask ]; socket = wsgi-sock; }; }; -- cgit v1.2.3 From 321b831755f8d8572e30e9b735617a90525b311a Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 28 Feb 2016 02:25:53 +0100 Subject: ma 2 laptop-utils: FF with flash --- makefu/2configs/laptop-utils.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'makefu/2configs') diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix index 8a1c0e18..815ff748 100644 --- a/makefu/2configs/laptop-utils.nix +++ b/makefu/2configs/laptop-utils.nix @@ -6,6 +6,10 @@ # essentially `nix-env -q` of the main user # TODO: split gui and non-gui { + nixpkgs.config.firefox = { + enableAdobeFlash = true; + }; + krebs.per-user.makefu.packages = with pkgs; [ # core at_spi2_core -- cgit v1.2.3 From 64a1dc64a3a7daf57e1ebc677e35c4dc89d9c36b Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 28 Feb 2016 02:26:20 +0100 Subject: ma 2 default: back to unstable, remove runtime-patch --- makefu/2configs/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 7166c0cc..313ccbec 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -4,13 +4,6 @@ with config.krebs.lib; { system.stateVersion = "15.09"; - system.replaceRuntimeDependencies = with pkgs.lib; - [{original = pkgs.glibc; replacement = pkgs.stdenv.lib.overrideDerivation pkgs.glibc (oldAttr: { patches = oldAttr.patches ++ - [(pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/fc48bf5a2ceb908b73dc035374e2ec5a31086aa2/pkgs/development/libraries/glibc/cve-2015-7547.patch"; - sha256 = "0awpc4rp2x27rjpj83ps0rclmn73hsgfv2xxk18k82w4hdxqpp5r";})]; - });} - ]; - imports = [ { users.extraUsers = @@ -29,7 +22,7 @@ with config.krebs.lib; source = mapAttrs (_: mkDefault) { nixpkgs = { url = https://github.com/nixos/nixpkgs; - rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # unstable @ 2015-01-27, tested on wry + rev = "40c586b7ce2c559374df435f46d673baf711c543"; # unstable @ 2016-02-27, tested on wry }; secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/"; stockholm = "/home/makefu/stockholm"; -- cgit v1.2.3