From 8bacb23ad46c7c4feb8ba097ce2c221579065c2e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:45:50 +0100
Subject: m 5 esptool: ninit

---
 makefu/2configs/tools/all.nix       | 10 +++++++++
 makefu/2configs/tools/core-gui.nix  | 25 ++++++++++++++++++++++
 makefu/2configs/tools/core.nix      | 41 +++++++++++++++++++++++++++++++++++++
 makefu/2configs/tools/dev.nix       | 10 +++++++++
 makefu/2configs/tools/extra-gui.nix | 12 +++++++++++
 makefu/2configs/tools/media.nix     | 12 +++++++++++
 makefu/2configs/tools/sec.nix       | 15 ++++++++++++++
 7 files changed, 125 insertions(+)
 create mode 100644 makefu/2configs/tools/all.nix
 create mode 100644 makefu/2configs/tools/core-gui.nix
 create mode 100644 makefu/2configs/tools/core.nix
 create mode 100644 makefu/2configs/tools/dev.nix
 create mode 100644 makefu/2configs/tools/extra-gui.nix
 create mode 100644 makefu/2configs/tools/media.nix
 create mode 100644 makefu/2configs/tools/sec.nix

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
new file mode 100644
index 000000000..09344d99d
--- /dev/null
+++ b/makefu/2configs/tools/all.nix
@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./core.nix
+    ./core-gui.nix
+    ./extra-gui.nix
+    ./dev.nix
+    ./sec.nix
+    ./media.nix
+  ];
+}
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
new file mode 100644
index 000000000..518a60eac
--- /dev/null
+++ b/makefu/2configs/tools/core-gui.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.firefox = {
+    enableAdobeFlash = true;
+  };
+
+  krebs.per-user.makefu.packages = with pkgs; [
+    chromium
+    clipit
+    feh
+    firefox
+    keepassx
+    pcmanfm
+    skype
+    mirage
+    tightvnc
+    gnome3.dconf
+    vlc
+    wireshark
+    xdotool
+    scrot
+    
+  ];
+}
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
new file mode 100644
index 000000000..56d60812e
--- /dev/null
+++ b/makefu/2configs/tools/core.nix
@@ -0,0 +1,41 @@
+{ 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
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    at_spi2_core
+    acpi
+    bc
+    exif
+    file
+    ntfs3g
+    pv
+    proot
+    sshpass
+    usbutils
+    p7zip
+    hdparm
+    inetutils
+    ncftp
+    mutt
+    tcpdump
+    sysstat
+    which
+    weechat
+    curl
+    wget
+    wol
+    tmux
+    smartmontools
+    iftop
+
+    cac-api
+    cac-panel
+    krebspaste
+    ledger
+    pass
+  ];
+}
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
new file mode 100644
index 000000000..8acc25fcc
--- /dev/null
+++ b/makefu/2configs/tools/dev.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs;[
+    nodemcu-uploader
+    esptool
+    python35Packages.virtualenv
+    flashrom
+  ];
+}
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
new file mode 100644
index 000000000..6b8a5af66
--- /dev/null
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs;[
+    inkscape
+    gimp
+    skype
+    virtmanager
+    synergy
+    
+  ];
+}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
new file mode 100644
index 000000000..67159a176
--- /dev/null
+++ b/makefu/2configs/tools/media.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.firefox = {
+    enableAdobeFlash = true;
+  };
+
+  krebs.per-user.makefu.packages = with pkgs; [
+    kodi
+    streamripper
+  ];
+}
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
new file mode 100644
index 000000000..3a2a84556
--- /dev/null
+++ b/makefu/2configs/tools/sec.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    aria2
+    mitmproxy
+    pythonPackages.binwalk-full
+    dnsmasq
+    iodine
+    mtr
+    nmap
+    msf
+    thc-hydra
+  ];
+}
-- 
cgit v1.2.3


From af83dea03c002e0dc1c907c429b378ba97da0ba3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:47:27 +0100
Subject: k 2 tools/sec: do not deploy mitmproxy (broken)

---
 makefu/2configs/tools/sec.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index 3a2a84556..5ab699f35 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -3,7 +3,7 @@
 {
   krebs.per-user.makefu.packages = with pkgs; [
     aria2
-    mitmproxy
+    # mitmproxy
     pythonPackages.binwalk-full
     dnsmasq
     iodine
-- 
cgit v1.2.3


From 87cd7cd9afc1f28927f3b605f1fe97047eeaf18c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 16:23:12 +0100
Subject: m 2 tools: update

---
 makefu/2configs/tools/all.nix       | 5 +++--
 makefu/2configs/tools/core-gui.nix  | 1 -
 makefu/2configs/tools/core.nix      | 5 +++++
 makefu/2configs/tools/extra-gui.nix | 2 +-
 makefu/2configs/tools/games.nix     | 7 +++++++
 makefu/2configs/tools/media.nix     | 8 ++++----
 6 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 makefu/2configs/tools/games.nix

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 09344d99d..e64e216e0 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -2,9 +2,10 @@
   imports = [
     ./core.nix
     ./core-gui.nix
-    ./extra-gui.nix
     ./dev.nix
-    ./sec.nix
+    ./extra-gui.nix
+    ./games.nix
     ./media.nix
+    ./sec.nix
   ];
 }
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 518a60eac..654e83baa 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -16,7 +16,6 @@
     mirage
     tightvnc
     gnome3.dconf
-    vlc
     wireshark
     xdotool
     scrot
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 56d60812e..86d72c662 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -9,12 +9,14 @@
     at_spi2_core
     acpi
     bc
+    rsync
     exif
     file
     ntfs3g
     pv
     proot
     sshpass
+    populate
     usbutils
     p7zip
     hdparm
@@ -30,7 +32,10 @@
     wol
     tmux
     smartmontools
+    cifs-utils
     iftop
+    taskwarrior
+    mplayer
 
     cac-api
     cac-panel
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 6b8a5af66..9cfacf408 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -7,6 +7,6 @@
     skype
     virtmanager
     synergy
-    
+    saleae-logic
   ];
 }
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
new file mode 100644
index 000000000..34c686451
--- /dev/null
+++ b/makefu/2configs/tools/games.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    steam
+  ];
+}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 67159a176..4fc3413e8 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
   krebs.per-user.makefu.packages = with pkgs; [
     kodi
     streamripper
+    youtube-dl
+    calibre
+    vlc
+    mumble
   ];
 }
-- 
cgit v1.2.3


From cb48e9371a337d23e1f3f09b5d024ee60451d9d2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 22:03:20 +0100
Subject: m 2 tools: xbacklight

---
 makefu/2configs/tools/core-gui.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 654e83baa..6d62e92c0 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -18,7 +18,7 @@
     gnome3.dconf
     wireshark
     xdotool
+    xorg.xbacklight
     scrot
-    
   ];
 }
-- 
cgit v1.2.3