summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-03-02 20:51:37 +0100
committerlassulus <lass@aidsballs.de>2016-03-02 20:51:37 +0100
commitef8ed48b1c576238e8fd6cbaef0d0208d8cc1b68 (patch)
tree15d9dc2aadbba7d0c7c6338d6441af7849cc248b /makefu/2configs
parent024de57e7b1918a617685b65a0c5c45ee4592e47 (diff)
parentdb72d5911f1556d3b1cfbe8f1a2d8f6765728952 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/default.nix9
-rw-r--r--makefu/2configs/deployment/mycube.connector.one.nix2
-rw-r--r--makefu/2configs/iodined.nix4
-rw-r--r--makefu/2configs/laptop-utils.nix17
-rw-r--r--makefu/2configs/mail-client.nix6
5 files changed, 18 insertions, 20 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 3043a1af3..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/master/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";
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;
};
};
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}";
};
}
diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix
index b5ba2ec3b..815ff7489 100644
--- a/makefu/2configs/laptop-utils.nix
+++ b/makefu/2configs/laptop-utils.nix
@@ -6,7 +6,11 @@
# essentially `nix-env -q` of the main user
# TODO: split gui and non-gui
{
- environment.systemPackages = with pkgs; [
+ nixpkgs.config.firefox = {
+ enableAdobeFlash = true;
+ };
+
+ krebs.per-user.makefu.packages = with pkgs; [
# core
at_spi2_core
acpi
@@ -27,11 +31,14 @@
# gui
+ chromium
clipit
feh
+ firefox
keepassx
pcmanfm
skype
+ mirage
tightvnc
gnome3.dconf
vlc
@@ -39,10 +46,6 @@
wireshark
xdotool
- # browser
- firefox
- chromium
-
# sectools
aria2
binwalk
@@ -53,10 +56,10 @@
# stuff
- cac-cli
+ cac-api
cac-panel
krebspaste
ledger
- password-store
+ pass
];
}
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
];
}