summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--makefu/2configs/tools/core-gui.nix1
-rw-r--r--makefu/2configs/tools/core.nix31
-rw-r--r--makefu/2configs/tools/dev.nix10
-rw-r--r--makefu/2configs/tools/extra-gui.nix7
-rw-r--r--makefu/2configs/tools/media.nix1
-rw-r--r--makefu/2configs/tools/sec.nix3
6 files changed, 36 insertions, 17 deletions
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 0538647ae..f409b68a2 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -20,5 +20,6 @@
xdotool
xorg.xbacklight
scrot
+ wireshark
];
}
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 6ae2951eb..8a15ae2e7 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -12,11 +12,11 @@
rsync
exif
file
+ # fs
ntfs3g
+ dosfstools
pv
- proot
sshpass
- populate
usbutils
p7zip
hdparm
@@ -27,21 +27,30 @@
sysstat
which
weechat
- curl
- wget
wol
tmux
+ iftop
+ mkpasswd
+ # storage
smartmontools
cifs-utils
- iftop
- taskwarrior
- mplayer
+ # net
+ wget
+ curl
- cac-api
- cac-panel
+ # stockholm
+ git
+ gnumake
+ jq
+ parallel
+ proot
+ populate
+
+ rxvt_unicode.terminfo
krebspaste
- krebszones
- ledger
+
+ # TODO:
+ taskwarrior
pass
];
}
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 8acc25fcc..8e4e3270d 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -2,9 +2,15 @@
{
krebs.per-user.makefu.packages = with pkgs;[
- nodemcu-uploader
- esptool
python35Packages.virtualenv
+ # embedded
flashrom
+ mosquitto
+ libcoap
+ nodemcu-uploader
+ esptool
+ cac-api
+ cac-panel
+ krebszones
];
}
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 596734dd5..56cdccd1f 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -2,12 +2,13 @@
{
krebs.per-user.makefu.packages = with pkgs;[
- inkscape
gimp
+ inkscape
libreoffice
+ saleae-logic
skype
- virtmanager
synergy
- saleae-logic
+ tdesktop
+ virtmanager
];
}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 4fc3413e8..4de2b545e 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -8,5 +8,6 @@
calibre
vlc
mumble
+ mplayer
];
}
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index e53d9ee8e..5fb9a5fc8 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -11,6 +11,7 @@
nmap
msf
thc-hydra
- wireshark
+ borgbackup
+ ledger
];
}