summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-05-02 14:14:55 +0200
committerlassulus <lass@lassul.us>2017-05-02 14:14:55 +0200
commitdd4439bfc840e61f2b3f1004e74226854d5a378a (patch)
tree136983c641ca3288c126c52acea1d3398534c163 /makefu/2configs
parent7e1516cc0de48c169a27a07f43930b940d6a9004 (diff)
parent22188f14d3e4eb309fba69a65049cb2c1ec05e2d (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/default.nix3
-rw-r--r--makefu/2configs/mqtt.nix9
-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
8 files changed, 47 insertions, 18 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 0865c3a31..6cc891047 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
{
imports = [
{
- users.extraUsers =
+ users.users =
mapAttrs (_: h: { hashedPassword = h; })
(import <secrets/hashedPasswords.nix>);
}
@@ -134,6 +134,7 @@ with import <stockholm/lib>;
};
environment.shellAliases = {
+ # TODO: see .aliases
lsl = "ls -lAtr";
psg = "ps -ef | grep";
nmap = "nmap -oN $HOME/loot/scan-`date +\%s`.nmap -oX $HOME/loot/scan-`date +%s`.xml";
diff --git a/makefu/2configs/mqtt.nix b/makefu/2configs/mqtt.nix
new file mode 100644
index 000000000..39c9fdfdd
--- /dev/null
+++ b/makefu/2configs/mqtt.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+ services.mosquitto = {
+ enable = true;
+ host = "0.0.0.0";
+ users = {};
+ allowAnonymous = true;
+ };
+}
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
];
}