diff options
author | tv <tv@krebsco.de> | 2017-09-07 22:51:48 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-09-07 22:51:48 +0200 |
commit | e4969bf3e77a5d3bc39625ad784227438640d126 (patch) | |
tree | f6fbc14e2b675a512ec698cbdae33fa3fd8d25ca /makefu/2configs/tools | |
parent | 66738262eeb30e29f2743d0e0424d10722f5e2af (diff) | |
parent | 46a3f4c24315836c1d82711d98f4d69be67d883d (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r-- | makefu/2configs/tools/all.nix | 2 | ||||
-rw-r--r-- | makefu/2configs/tools/core-gui.nix | 1 | ||||
-rw-r--r-- | makefu/2configs/tools/sec-gui.nix | 8 | ||||
-rw-r--r-- | makefu/2configs/tools/sec.nix | 1 | ||||
-rw-r--r-- | makefu/2configs/tools/studio.nix | 10 |
5 files changed, 21 insertions, 1 deletions
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix index 31c959d47..c7a116918 100644 --- a/makefu/2configs/tools/all.nix +++ b/makefu/2configs/tools/all.nix @@ -8,5 +8,7 @@ ./games.nix ./media.nix ./sec.nix + ./sec-gui.nix + ./studio.nix ]; } diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix index f409b68a2..0538647ae 100644 --- a/makefu/2configs/tools/core-gui.nix +++ b/makefu/2configs/tools/core-gui.nix @@ -20,6 +20,5 @@ xdotool xorg.xbacklight scrot - wireshark ]; } diff --git a/makefu/2configs/tools/sec-gui.nix b/makefu/2configs/tools/sec-gui.nix new file mode 100644 index 000000000..2db3e4391 --- /dev/null +++ b/makefu/2configs/tools/sec-gui.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + krebs.per-user.makefu.packages = with pkgs; [ + tpmmanager + wireshark + ]; +} diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix index 5fb9a5fc8..817cd9ead 100644 --- a/makefu/2configs/tools/sec.nix +++ b/makefu/2configs/tools/sec.nix @@ -13,5 +13,6 @@ thc-hydra borgbackup ledger + u3_tool ]; } diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix new file mode 100644 index 000000000..add021acd --- /dev/null +++ b/makefu/2configs/tools/studio.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + users.users.makefu.packages = with pkgs; [ + obs-studio + studio-link + audacity + owncloudclient + ]; +} |