m 5 esptool: ninit

9 files changed, 126 insertions, 66 deletions

diff --git a/2configs/base-gui.nix b/2configs/base-gui.nix
index 95ebabc44..43b37cd8c 100644
--- a/2configs/base-gui.nix
+++ b/2configs/base-gui.nix
@@ -82,7 +82,7 @@ in
 
       URxvt.perl-ext:      default,url-select
       URxvt.keysym.M-u:    perl:url-select:select_next
-      URxvt.url-select.launcher:   chromium
+      URxvt.url-select.launcher:   firefox -new-tab
       URxvt.url-select.underline: true
       URxvt.searchable-scrollback: CM-s
     '';
diff --git a/2configs/laptop-utils.nix b/2configs/laptop-utils.nix
deleted file mode 100644
index ec6d4adec..000000000
--- a/2configs/laptop-utils.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ 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
-{
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
-  krebs.per-user.makefu.packages = with pkgs; [
-    # core
-    at_spi2_core
-    acpi
-    bc
-    exif
-    file
-    ntfs3g
-    pv
-    proot
-    sshpass
-    unzip
-    unrar
-    usbutils
-    zip
-
-    # dev
-    python35Packages.virtualenv
-
-
-    # gui
-    chromium
-    clipit
-    feh
-    firefox
-    keepassx
-    pcmanfm
-    skype
-    mirage
-    tightvnc
-    gnome3.dconf
-    vlc
-    virtmanager
-    wireshark
-    xdotool
-
-    # sectools
-    aria2
-    pythonPackages.binwalk-full
-    dnsmasq
-    iodine
-    mtr
-    nmap
-
-
-    # stuff
-    cac-api
-    cac-panel
-    krebspaste
-    ledger
-    pass
-  ];
-}
diff --git a/2configs/tools/all.nix b/2configs/tools/all.nix
new file mode 100644
index 000000000..09344d99d
--- /dev/null
+++ b/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/2configs/tools/core-gui.nix b/2configs/tools/core-gui.nix
new file mode 100644
index 000000000..518a60eac
--- /dev/null
+++ b/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/2configs/tools/core.nix b/2configs/tools/core.nix
new file mode 100644
index 000000000..56d60812e
--- /dev/null
+++ b/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/2configs/tools/dev.nix b/2configs/tools/dev.nix
new file mode 100644
index 000000000..8acc25fcc
--- /dev/null
+++ b/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/2configs/tools/extra-gui.nix b/2configs/tools/extra-gui.nix
new file mode 100644
index 000000000..6b8a5af66
--- /dev/null
+++ b/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/2configs/tools/media.nix b/2configs/tools/media.nix
new file mode 100644
index 000000000..67159a176
--- /dev/null
+++ b/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/2configs/tools/sec.nix b/2configs/tools/sec.nix
new file mode 100644
index 000000000..3a2a84556
--- /dev/null
+++ b/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
+  ];
+}