diff options
author | lassulus <lassulus@lassul.us> | 2017-10-09 13:25:46 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-10-09 13:25:46 +0200 |
commit | a357a82f9e10c8b35465d1d3458d51e49e8e5676 (patch) | |
tree | 0a8da6542296e9743c81226c3b8fdb9b239fbb8b /makefu/2configs/tools | |
parent | 71e25af663f7b620a2adffa4ac5e0eeaef548a81 (diff) | |
parent | 903a1182b5c27cf0c07d267f136a0f2e5be3d89b (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r-- | makefu/2configs/tools/sec-gui.nix | 15 | ||||
-rw-r--r-- | makefu/2configs/tools/steam.nix | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/makefu/2configs/tools/sec-gui.nix b/makefu/2configs/tools/sec-gui.nix index 2db3e4391..95f130ae8 100644 --- a/makefu/2configs/tools/sec-gui.nix +++ b/makefu/2configs/tools/sec-gui.nix @@ -1,8 +1,15 @@ { pkgs, ... }: { - krebs.per-user.makefu.packages = with pkgs; [ - tpmmanager - wireshark - ]; + users.users.makefu = { + extraGroups = [ "wireshark" ]; + packages = with pkgs; [ + tpmmanager + ]; + }; + + programs.wireshark = { + enable = true; + package = pkgs.wireshark; + }; } diff --git a/makefu/2configs/tools/steam.nix b/makefu/2configs/tools/steam.nix index 200ea4719..048c1d1a3 100644 --- a/makefu/2configs/tools/steam.nix +++ b/makefu/2configs/tools/steam.nix @@ -1,9 +1,7 @@ {pkgs, ...}: { users.users.makefu.packages = [ - (pkgs.steam.override { - newStdcpp = true; - }) + pkgs.steam ]; hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; |