diff options
| author | tv <tv@krebsco.de> | 2015-12-20 19:37:46 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2015-12-20 19:37:46 +0100 |
| commit | c89907175546aa0c39bc6b2c4960f0ea6e6db8c9 (patch) | |
| tree | 158bf1a5938fc37efc466b00b3f0906ac2a50d9f /lass/2configs/browsers.nix | |
| parent | c09bc6a29f21f1c6bd21575e385b8b3bc5c89b8a (diff) | |
| parent | 5821d8438578db623a3e248c52fefa424fad0b51 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'lass/2configs/browsers.nix')
| -rw-r--r-- | lass/2configs/browsers.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index 5a1857973..d36801863 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: let - inherit (import ../4lib { inherit pkgs lib; }) simpleScript; - mainUser = config.users.extraUsers.mainUser; createChromiumUser = name: extraGroups: packages: { @@ -18,8 +16,8 @@ let ${mainUser.name} ALL=(${name}) NOPASSWD: ALL ''; environment.systemPackages = [ - (simpleScript name '' - sudo -u ${name} -i chromium $@ + (pkgs.writeScriptBin name '' + /var/setuid-wrappers/sudo -u ${name} -i chromium $@ '') ]; }; @@ -38,8 +36,8 @@ let ${mainUser.name} ALL=(${name}) NOPASSWD: ALL ''; environment.systemPackages = [ - (simpleScript name '' - sudo -u ${name} -i firefox $@ + (pkgs.writeScriptBin name '' + /var/setuid-wrappers/sudo -u ${name} -i firefox $@ '') ]; }; @@ -49,7 +47,7 @@ let in { environment.systemPackages = [ - (simpleScript "browser-select" '' + (pkgs.writeScriptBin "browser-select" '' BROWSER=$(echo -e "ff\ncr\nfb\ngm\nflash" | dmenu) $BROWSER $@ '') @@ -62,7 +60,7 @@ in { ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] ) ( createChromiumUser "fb" [ ] [ pkgs.chromium ] ) ( createChromiumUser "gm" [ ] [ pkgs.chromium ] ) - # ( createChromiumUser "flash" [ ] [ pkgs.flash ] ) + ( createChromiumUser "flash" [ ] [ pkgs.flash ] ) ]; nixpkgs.config.packageOverrides = pkgs : { |