From 4011410ebdffd4b7b6522f0a252b35046fb1561a Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 22 Feb 2016 14:27:25 +0100 Subject: ma 2 cgit: cac -> cac-api --- makefu/2configs/git/cgit-retiolum.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix index 15700e10d..0b69dbcaf 100644 --- a/makefu/2configs/git/cgit-retiolum.nix +++ b/makefu/2configs/git/cgit-retiolum.nix @@ -15,7 +15,7 @@ let tinc_graphs = { desc = "Tinc Advanced Graph Generation"; }; - cac = { }; + cac-api = { }; init-stockholm = { desc = "Init stuff for stockholm"; }; -- cgit v1.2.3 From 9a847d100b332d33c4b7ed03da9a1cb43b49fc3d Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 22 Feb 2016 14:27:38 +0100 Subject: ma 2 brain: add pass --- makefu/2configs/git/brain-retiolum.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu/2configs') diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix index 58fd250e5..80e4c87cf 100644 --- a/makefu/2configs/git/brain-retiolum.nix +++ b/makefu/2configs/git/brain-retiolum.nix @@ -14,6 +14,7 @@ let priv-repos = mapAttrs make-priv-repo { autosync = { }; + pass = { }; }; # TODO move users to separate module -- cgit v1.2.3 From 3a0fa295ab4bdded531b08f16139f94d50058cc2 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 22 Feb 2016 14:28:05 +0100 Subject: ma 2 laptop-utils: init --- makefu/2configs/laptop-utils.nix | 62 ++++++++++++++++++++++++++++++++++++++++ makefu/2configs/mail-client.nix | 2 +- makefu/2configs/main-laptop.nix | 12 +------- 3 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 makefu/2configs/laptop-utils.nix (limited to 'makefu/2configs') diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix new file mode 100644 index 000000000..b5ba2ec3b --- /dev/null +++ b/makefu/2configs/laptop-utils.nix @@ -0,0 +1,62 @@ +{ pkgs, ... }: + +# tools i use when actually working with the host. +# package version will now be maintained by nix-rebuild +# +# essentially `nix-env -q` of the main user +# TODO: split gui and non-gui +{ + environment.systemPackages = with pkgs; [ + # core + at_spi2_core + acpi + bc + exif + file + ntfs3g + pv + proot + sshpass + unzip + unrar + usbutils + zip + + # dev + python35Packages.virtualenv + + + # gui + clipit + feh + keepassx + pcmanfm + skype + tightvnc + gnome3.dconf + vlc + virtmanager + wireshark + xdotool + + # browser + firefox + chromium + + # sectools + aria2 + binwalk + dnsmasq + iodine + mtr + nmap + + + # stuff + cac-cli + cac-panel + krebspaste + ledger + password-store + ]; +} diff --git a/makefu/2configs/mail-client.nix b/makefu/2configs/mail-client.nix index 913cbf25b..036924071 100644 --- a/makefu/2configs/mail-client.nix +++ b/makefu/2configs/mail-client.nix @@ -3,6 +3,7 @@ with config.krebs.lib; { environment.systemPackages = with pkgs; [ + abook msmtp mutt-kz notmuch @@ -10,5 +11,4 @@ with config.krebs.lib; imapfilter gnupg ]; - } diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix index 452cdfb23..3cc91b630 100644 --- a/makefu/2configs/main-laptop.nix +++ b/makefu/2configs/main-laptop.nix @@ -11,21 +11,11 @@ with config.krebs.lib; ./base-gui.nix ./fetchWallpaper.nix ./zsh-user.nix + ./laptop-utils.nix ]; users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ]; - environment.systemPackages = with pkgs;[ - vlc - firefox - chromium - keepassx - ntfs3g - at_spi2_core - gnome3.dconf - virtmanager - krebspaste - ]; services.redshift = { enable = true; -- cgit v1.2.3 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 b5ba2ec3b..8a1c0e184 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 036924071..793daa6f8 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 3043a1af3..7166c0cc9 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 db8a1bfed..2e69d167c 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 38fc4a243..125b3dfff 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 8a1c0e184..815ff7489 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 7166c0cc9..313ccbec7 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