summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tools
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-11-28 19:06:54 +0100
committertv <tv@krebsco.de>2017-11-28 19:06:54 +0100
commit05bc20b893ff6d441d7e8e10802134d2192e724a (patch)
tree1c34434d71eb2e3e3ced9ade09ee4b5879cc63cd /makefu/2configs/tools
parent5163d8eba27976ccccf7703b52eb1b8f4c0295af (diff)
parent10a96c644898d9498e9f75fa543ebb395ffbca20 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r--makefu/2configs/tools/core.nix30
-rw-r--r--makefu/2configs/tools/dev.nix3
-rw-r--r--makefu/2configs/tools/games.nix1
-rw-r--r--makefu/2configs/tools/sec.nix2
4 files changed, 22 insertions, 14 deletions
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 8a15ae2e7..7e9a459c3 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -5,38 +5,44 @@
#
# essentially `nix-env -q` of the main user
{
- krebs.per-user.makefu.packages = with pkgs; [
+ environment.systemPackages = with pkgs; [
at_spi2_core
acpi
bc
rsync
exif
file
+ lsof
+ which
+ binutils
+
# fs
- ntfs3g
+ cifs-utils
dosfstools
+ ntfs3g
+ smartmontools
+
+ # io
pv
sshpass
usbutils
p7zip
hdparm
+
+ # net
+ wget
+ curl
inetutils
ncftp
- mutt
tcpdump
sysstat
- which
- weechat
wol
- tmux
iftop
+
mkpasswd
- # storage
- smartmontools
- cifs-utils
- # net
- wget
- curl
+ mutt
+ weechat
+ tmux
# stockholm
git
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index d3d50c433..46872279a 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -2,7 +2,8 @@
{
users.users.makefu.packages = with pkgs;[
- python35Packages.virtualenv
+ python3Packages.virtualenv
+ python3Packages.pyserial
# embedded
gi
flashrom
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 8e815da5e..8da615963 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -6,5 +6,6 @@
];
users.users.makefu.packages = with pkgs; [
games-user-env
+ wine
];
}
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index 817cd9ead..3dc02937d 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -13,6 +13,6 @@
thc-hydra
borgbackup
ledger
- u3_tool
+ u3-tool
];
}