Merge remote-tracking branch 'gum/master'

8 files changed, 90 insertions, 15 deletions

diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 6cff35e9d..ca0bfd2b5 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -40,7 +40,6 @@ in {
   networking.firewall.allowedTCPPorts = [ 80 655 8080 ];
 
   # services.openssh.allowSFTP = false;
-  krebs.build.source.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
 
   # copy config from <secrets/sabnzbd.ini> to /var/lib/sabnzbd/
   services.sabnzbd.enable = true;
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
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";
     };
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;
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 33e280f0e..8caab433e 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -9,7 +9,8 @@ in
     alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
     awesomecfg = callPackage ./awesomecfg {};
-    tw-upload-plugin = callPackage ./tw-upload-plugin {};
+    nodemcu-uploader = callPackage ./nodemcu-uploader {};
     mycube-flask = callPackage ./mycube-flask {};
+    tw-upload-plugin = callPackage ./tw-upload-plugin {};
   };
 }
diff --git a/makefu/5pkgs/nodemcu-uploader/default.nix b/makefu/5pkgs/nodemcu-uploader/default.nix
new file mode 100644
index 000000000..64476be6e
--- /dev/null
+++ b/makefu/5pkgs/nodemcu-uploader/default.nix
@@ -0,0 +1,22 @@
+{ lib, pkgs, pythonPackages, fetchurl, ... }:
+
+with pythonPackages; buildPythonPackage rec {
+  name = "nodemcu-uploader-${version}";
+  version = "0.2.2";
+  disabled = isPy3k || isPyPy;
+  propagatedBuildInputs = [
+    pyserial
+  ];
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/n/nodemcu-uploader/nodemcu-uploader-${version}.tar.gz";
+    sha256 = "090giz84y9y3idgifp0yh80qqyv2czv6h3y55wyrlgf7qfbwbrvn";
+  };
+  # ImportError: No module named tests
+  # not sure what to do here
+  doCheck = false;
+  meta = {
+    homepage = https://github.com/kmpm/nodemcu-uploader;
+    description = "tool for uploading files to NodeMCU filesystem";
+    license = lib.licenses.mit;
+  };
+}