From 6baf8704a4ce643cc8bdab8d122d187225afb6ca Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 2 May 2017 14:04:01 +0200 Subject: m 2 tools: shuffle --- makefu/2configs/tools/core-gui.nix | 1 + makefu/2configs/tools/core.nix | 31 ++++++++++++++++++++----------- makefu/2configs/tools/dev.nix | 10 ++++++++-- makefu/2configs/tools/extra-gui.nix | 7 ++++--- makefu/2configs/tools/media.nix | 1 + makefu/2configs/tools/sec.nix | 3 ++- 6 files changed, 36 insertions(+), 17 deletions(-) (limited to 'makefu/2configs') 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 ]; } -- cgit v1.2.3 From 0fdb899e5de50cdaf9cb6e2297dd80ba8d04b1d2 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 2 May 2017 14:04:39 +0200 Subject: m 1 omo: add mqtt --- makefu/2configs/mqtt.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 makefu/2configs/mqtt.nix (limited to 'makefu/2configs') 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; + }; +} -- cgit v1.2.3 From 22188f14d3e4eb309fba69a65049cb2c1ec05e2d Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 2 May 2017 14:05:06 +0200 Subject: m 2 default: extraUsers -> users --- makefu/2configs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'makefu/2configs') 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 ; { imports = [ { - users.extraUsers = + users.users = mapAttrs (_: h: { hashedPassword = h; }) (import ); } @@ -134,6 +134,7 @@ with import ; }; 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"; -- cgit v1.2.3