summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tools
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-11-10 22:35:25 +0100
committerlassulus <lassulus@lassul.us>2017-11-10 22:35:25 +0100
commit725d98e428b22d73c3797490c6f5bc29f86104e8 (patch)
treed1c2343c0aa1d2efd758c8b3bdbfa446b5fd2038 /makefu/2configs/tools
parent4c083777ddf71f7cbd12a1b094aa50e18ab89d2d (diff)
parent05a8eced9c9cc3e9550c6c24e778d96b822a393a (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r--makefu/2configs/tools/core.nix29
-rw-r--r--makefu/2configs/tools/sec.nix2
2 files changed, 18 insertions, 13 deletions
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 8a15ae2e7..eced961be 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -5,38 +5,43 @@
#
# 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
+
# 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/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
];
}