From 3a0fa295ab4bdded531b08f16139f94d50058cc2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 22 Feb 2016 14:28:05 +0100
Subject: [PATCH] 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

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;