From 95f1c098e34230ac987ebd398e7d7ffbf6bbb890 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 12 Apr 2015 20:00:46 +0200 Subject: browsers-lass.nix -> browsers.nix --- modules/lass/browsers-lass.nix | 68 ------------------------------------------ modules/lass/browsers.nix | 68 ++++++++++++++++++++++++++++++++++++++++++ modules/mors/default.nix | 2 +- modules/uriel/default.nix | 2 +- 4 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 modules/lass/browsers-lass.nix create mode 100644 modules/lass/browsers.nix diff --git a/modules/lass/browsers-lass.nix b/modules/lass/browsers-lass.nix deleted file mode 100644 index 6301f2897..000000000 --- a/modules/lass/browsers-lass.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, pkgs, ... }: - -let - mainUser = config.users.extraUsers.mainUser; - -in { - - nixpkgs.config.packageOverrides = pkgs : { - chromium = pkgs.chromium.override { - pulseSupport = true; - }; - }; - - environment.systemPackages = with pkgs; [ - firefox - chromium - ]; - - users.extraUsers = { - firefox = { - name = "firefox"; - description = "user for running firefox"; - home = "/home/firefox"; - useDefaultShell = true; - extraGroups = [ "audio" ]; - createHome = true; - }; - chromium = { - name = "chromium"; - description = "user for running chromium"; - home = "/home/chromium"; - useDefaultShell = true; - extraGroups = [ "audio" ]; - createHome = true; - }; - facebook = { - name = "facebook"; - description = "user for running facebook in chromium"; - home = "/home/facebook"; - useDefaultShell = true; - extraGroups = [ "audio" ]; - createHome = true; - }; - google = { - name = "google"; - description = "user for running google+/gmail in chromium"; - home = "/home/google"; - useDefaultShell = true; - createHome = true; - }; - flash = { - name = "flash"; - description = "user for running flash stuff"; - home = "/home/flash"; - useDefaultShell = true; - extraGroups = [ "audio" ]; - createHome = true; - }; - }; - - security.sudo.extraConfig = '' - ${mainUser.name} ALL=(firefox) NOPASSWD: ALL - ${mainUser.name} ALL=(chromium) NOPASSWD: ALL - ${mainUser.name} ALL=(facebook) NOPASSWD: ALL - ${mainUser.name} ALL=(google) NOPASSWD: ALL - ${mainUser.name} ALL=(flash) NOPASSWD: ALL - ''; -} diff --git a/modules/lass/browsers.nix b/modules/lass/browsers.nix new file mode 100644 index 000000000..6301f2897 --- /dev/null +++ b/modules/lass/browsers.nix @@ -0,0 +1,68 @@ +{ config, pkgs, ... }: + +let + mainUser = config.users.extraUsers.mainUser; + +in { + + nixpkgs.config.packageOverrides = pkgs : { + chromium = pkgs.chromium.override { + pulseSupport = true; + }; + }; + + environment.systemPackages = with pkgs; [ + firefox + chromium + ]; + + users.extraUsers = { + firefox = { + name = "firefox"; + description = "user for running firefox"; + home = "/home/firefox"; + useDefaultShell = true; + extraGroups = [ "audio" ]; + createHome = true; + }; + chromium = { + name = "chromium"; + description = "user for running chromium"; + home = "/home/chromium"; + useDefaultShell = true; + extraGroups = [ "audio" ]; + createHome = true; + }; + facebook = { + name = "facebook"; + description = "user for running facebook in chromium"; + home = "/home/facebook"; + useDefaultShell = true; + extraGroups = [ "audio" ]; + createHome = true; + }; + google = { + name = "google"; + description = "user for running google+/gmail in chromium"; + home = "/home/google"; + useDefaultShell = true; + createHome = true; + }; + flash = { + name = "flash"; + description = "user for running flash stuff"; + home = "/home/flash"; + useDefaultShell = true; + extraGroups = [ "audio" ]; + createHome = true; + }; + }; + + security.sudo.extraConfig = '' + ${mainUser.name} ALL=(firefox) NOPASSWD: ALL + ${mainUser.name} ALL=(chromium) NOPASSWD: ALL + ${mainUser.name} ALL=(facebook) NOPASSWD: ALL + ${mainUser.name} ALL=(google) NOPASSWD: ALL + ${mainUser.name} ALL=(flash) NOPASSWD: ALL + ''; +} diff --git a/modules/mors/default.nix b/modules/mors/default.nix index f86b23e76..3563c8d09 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -8,7 +8,7 @@ ../lass/xserver-lass.nix ../tv/synaptics.nix ../lass/bitcoin.nix - ../lass/browsers-lass.nix + ../lass/browsers.nix ../lass/games.nix ../tv/exim-retiolum.nix ../lass/pass.nix diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index f68d955ea..bd784c6a7 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -5,7 +5,7 @@ ../lass/desktop-base.nix ../lass/retiolum-uriel.nix ../lass/xserver-lass.nix - ../lass/browsers-lass.nix + ../lass/browsers.nix ../lass/programs.nix ../lass/games.nix ../tv/exim-retiolum.nix -- cgit v1.2.3